Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"

6 files changed, 31 insertions, 26 deletions

diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc
index f0511eb8..6075c31c 100644
--- a/doc/src/development/cmake-manual.qdoc
+++ b/doc/src/development/cmake-manual.qdoc
@@ -54,7 +54,7 @@
 
     To build a helloworld GUI executable, typical usage would be:
 
-    \snippet snippets/cmake/CMakeLists.pro 0
+    \snippet snippets/cmake/examples.cmake 0
 
     In order for \c{find_package} to be successful, Qt 5 must be found below the CMAKE_PREFIX_PATH,
     or the \c{Qt5_DIR} must be set in the \c{CMake} cache to the location of the
@@ -70,7 +70,7 @@
     using a variable like Qt5<Module>_LIBRARIES in CMake commands such as \c{target_link_libraries}.
     The actual path to the library can be obtained using the \l{CMake LOCATION Documentation}{LOCATION property}:
 
-    \snippet snippets/cmake/CMakeLists.pro 1
+    \snippet snippets/cmake/examples.cmake 1
 
     Note however that it is rare to require the full location to the library in \c{CMake} code. Most
     \c{CMake} APIs are aware of imported targets and can automatically use them instead of the full path.
@@ -87,14 +87,14 @@
     If your project has custom CMake build configurations, it may be necessary to set a mapping from your
     custom configuration to either the debug or release Qt configuration.
 
-    \snippet snippets/cmake/CMakeLists.pro 2
+    \snippet snippets/cmake/examples.cmake 2
 
     Plugins are also available as \c IMPORTED targets in CMake. The \l{Qt
     Network}, \l{Qt SQL}, \l{Qt GUI}, and \l{Qt Widgets} modules have plugins
     associated. They provide a list of plugins in the
     \c{Qt5}\e{<Module>}\c{_PLUGINS} variable.
 
-    \snippet snippets/cmake/CMakeLists.pro 5
+    \snippet snippets/cmake/examples.cmake 5
 
     \section1 Variable Reference
 
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc
index 84f36260..365f46ce 100644
--- a/doc/src/legal/fdl.qdoc
+++ b/doc/src/legal/fdl.qdoc
@@ -30,10 +30,9 @@
     \title GNU Free Documentation License (FDL)
     \brief About the GPL license used for Qt documentation
 
-    Qt documentation is licensed under the terms of the GNU Free Documentation
+    Qt documentation is available under commercial licenses from The Qt Company.
+    In addition, is is available under the terms of the GNU Free Documentation
     License version 1.3, as published by the Free Software Foundation.
-    Alternatively, you may use the documentation in accordance with the terms
-    contained in a written agreement between you and The Qt Company.
 
     Example code embedded in the Qt documentation is also
     licensed under a \l{BSD 3-Clause "New" or "Revised" License}.
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 00ff4588..f6b2299d 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -55,10 +55,10 @@
     licensees, all modules are available under a single, commercial Qt
     license.
 
-    \e {Qt documentation} is licensed under the terms of the \l{GNU Free
+    \e {Qt documentation} is available under commercial licenses from
+    The Qt Company, and under the terms of the \l{GNU Free
     Documentation License (FDL)} version 1.3, as published by the Free Software
-    Foundation. Alternatively, you may use the documentation in accordance with
-    the terms contained in a written agreement between you and The Qt Company.
+    Foundation.
 
     \e {Qt examples} are available under commercial licenses from The Qt Company,
     and under a \l{License of Qt examples}{BSD-3-clause} license.
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index 91769877..ad857350 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -611,14 +611,17 @@
 
   When \c mode is not defined, the mode that is reported as preferred by the
   system is chosen. The accepted values for \c mode are: \c off, \c current,
-  \c preferred, width\c{x}height, width\c{x}height\c{@}vrefresh, or a modeline
-  string.
+  \c preferred, \c skip, width\c{x}height, width\c{x}height\c{@}vrefresh, or a
+  modeline string.
 
   Specifying \c current will choose a mode with a resolution matching the
   current one. Due to the fact that modesetting is done only when the desired
   mode is actually different from the active one (unless forced via the
   \c QT_QPA_EGLFS_ALWAYS_SET_MODE environment variable), this value is useful to
-  keep the current mode and any content in the planes not touched by Qt.
+  keep the current mode and any content in the planes not touched by Qt. \c skip
+  causes the connector for the output to be ignored, just as if it was
+  disconnected. \c off is similar, but it changes the mode as well to turn off
+  the display.
 
   All screens reported by the DRM layer will be treated as one big virtual
   desktop by default. The mouse cursor implementation will take this into
diff --git a/doc/src/platforms/qnx.qdoc b/doc/src/platforms/qnx.qdoc
index 33bed4f8..3648258e 100644
--- a/doc/src/platforms/qnx.qdoc
+++ b/doc/src/platforms/qnx.qdoc
@@ -337,14 +337,18 @@
     does not provide, you can modify an existing one or develop your own.
 
     When you develop a BSP for your board, you should include the following
-    utilities to enable Qt Creator to run, debug, and stop applications on QNX
-    devices:
+    utilities to enable Qt Creator to deploy, run, debug, and stop applications
+    on QNX devices:
 
     \list
         \li \c awk
         \li \c cat
+        \li \c cut
+        \li \c df
         \li \c grep
         \li \c kill
+        \li \c ln
+        \li \c mkdir
         \li \c netstat
         \li \c print
         \li \c printf
@@ -353,6 +357,7 @@
         \li \c sed
         \li \c sleep
         \li \c slog2info
+        \li \c tail
         \li \c tar
         \li \c zip
         \li \c uname
diff --git a/doc/src/snippets/cmake/CMakeLists.pro b/doc/src/snippets/cmake/examples.cmake
index 6f66cabf..264f3c05 100644
--- a/doc/src/snippets/cmake/CMakeLists.pro
+++ b/doc/src/snippets/cmake/examples.cmake
@@ -1,27 +1,25 @@
 #! [0]
 cmake_minimum_required(VERSION 3.1.0)
 
-project(testproject)
+project(helloworld)
 
-# Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-# Instruct CMake to run moc automatically when needed
 set(CMAKE_AUTOMOC ON)
-# Create code from a list of Qt designer ui files
+set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-# Find the QtWidgets library
+if(CMAKE_VERSION VERSION_LESS "3.7.0")
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+endif()
+
 find_package(Qt5 COMPONENTS Widgets REQUIRED)
 
-# Populate a CMake variable with the sources
-set(helloworld_SRCS
+add_executable(helloworld
     mainwindow.ui
     mainwindow.cpp
     main.cpp
+    resources.qrc
 )
-# Tell CMake to create the helloworld executable
-add_executable(helloworld WIN32 ${helloworld_SRCS})
-# Use the Widgets module from Qt 5
+
 target_link_libraries(helloworld Qt5::Widgets)
 #! [0]