Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I31a7333bc9a7a23b179b22de1e4afe4af443dead

7 files changed, 64 insertions, 53 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 09f9a807..3648258e 100644
--- a/doc/src/platforms/qnx.qdoc
+++ b/doc/src/platforms/qnx.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -70,10 +70,10 @@
 
     \section1 Supported Modules
 
-    Almost all Qt Essential \l{All Modules}{modules} and some add-ons are
-    supported on the QNX Neutrino RTOS. See the
-    \l{http://wiki.qt.io/Qt_Status_on_QNX}{status page on the Qt Project wiki}
-    for details.
+    All the \l{Qt Essentials} modules are supported in Qt for QNX.
+
+    See \l{Qt Add-Ons} for information about which Qt Add-Ons modules are supported
+    in Qt for QNX.
 
     If you build Qt from a released source code distribution archive, the
     \c{configure} tool ensures that the build will be made only for modules
@@ -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/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 553c33f2..913e9092 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -157,31 +157,31 @@
         \li All
         \li \l{Qt for Android}{Android},
             \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux}, \l{Qt for macOS}{\macos}, and
-            \l{Qt for WinRT}{WinRT}
+            \l{Qt for WinRT}{WinRT} (*)
         \li Provides access to Bluetooth hardware.
     \row
         \li \l[QtCanvas3D]{Qt Canvas 3D} (Deprecated)
         \li All
-        \li All
+        \li All (*)
         \li Enables OpenGL-like 3D drawing calls from Qt Quick applications
             using JavaScript.
     \row
         \li \l[QtConcurrent]{Qt Concurrent}
         \li All
-        \li All
+        \li All (*)
         \li Classes for writing multi-threaded programs without using low-level
             threading primitives.
     \row
         \li \l[QtDBus]{Qt D-Bus}
         \li All
-        \li All
+        \li All (*)
         \li Classes for inter-process communication over the D-Bus protocol.
     \row
         \li \l[QtGamepad]{Qt Gamepad}
         \li All
         \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for macOS}{\macos},
             tvOS (including the tvOS remote), \l{Qt for Linux/X11}{Linux},
-            \l{Qt for Windows}{Windows}
+            \l{Qt for Windows}{Windows}, and \l{Qt for QNX}{QNX}
         \li Enables Qt applications to support the use of gamepad hardware.
     \row
         \li \l[QtGraphicalEffects]{Qt Graphical Effects}
@@ -191,7 +191,7 @@
     \row
         \li \l{Qt Help}
         \li All
-        \li All
+        \li All (*)
         \li Classes for integrating documentation into applications, similar to Qt Assistant.
     \row
         \li \l[QtImageFormats]{Qt Image Formats}
@@ -211,18 +211,19 @@
     \row
         \li \l[QtNfc]{Qt NFC}
         \li All
-        \li \l{Qt for Android}{Android} and \l{Qt for Linux/X11}{Linux}
+        \li \l{Qt for Android}{Android} and \l{Qt for Linux/X11}{Linux} (*)
         \li Provides access to Near-Field communication (NFC) hardware.
     \row
         \li \l[QtOpenGL]{Qt OpenGL} (Deprecated)
         \li All
-        \li All
+        \li All (*)
         \li OpenGL support classes. Deprecated in favor of the \c{QOpenGL*}
             classes in the \l{Qt GUI} module.
     \row
         \li \l[QtPlatformHeaders]{Qt Platform Headers}
         \li \l{Qt for Windows}, \l{Qt for Linux/X11}{Linux}, \l{Qt for macOS}{\macos}
-        \li \l{Qt for Windows}, \l{Qt for Linux/X11}{Linux}, \l{Qt for macOS}{\macos}, \l{Qt for Android}{Android}
+        \li \l{Qt for Windows}, \l{Qt for Linux/X11}{Linux}, \l{Qt for macOS}{\macos}, \l{Qt for Android}{Android} (*)
+
         \li Provides classes that encapsulate platform-specific information,
             tied to a given runtime configuration of a \l {Qt Platform Abstraction}
             {platform plugin}.
@@ -230,12 +231,12 @@
         \li \l[QtPositioning]{Qt Positioning}
         \li All
         \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for macOS}{\macos},
-        \l{Qt for Linux/X11}{Linux}, \l{Qt for WinRT}{WinRT}.
+        \l{Qt for Linux/X11}{Linux}, \l{Qt for WinRT}{WinRT} (*).
         \li Provides access to position, satellite and area monitoring classes.
     \row
         \li \l[QtPrintSupport]{Qt Print Support}
         \li All
-        \li All
+        \li All (*)
         \li Classes to make printing easier and more portable.
     \row
         \li \l{Qt Purchasing}
@@ -246,20 +247,20 @@
     \row
         \li \l[QtQuickControls1]{Qt Quick Controls 1} (Deprecated)
         \li All
-        \li All
+        \li All (*)
         \li Reusable Qt Quick based UI controls to create classic desktop-style
             user interfaces. Deprecated in favor of \l{Qt Quick Controls} 2, which
             are better and easier to use.
     \row
         \li \l[QtQuickExtras]{Qt Quick Extras}
         \li All
-        \li All
+        \li All (*)
         \li Provides a specialized set of controls that can be used to build
             interfaces in Qt Quick.
     \row
         \li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets}
         \li All
-        \li All
+        \li All (*)
         \li Provides a C++ widget class for displaying a Qt Quick user interface.
     \row
         \li \l{Qt Remote Objects}
@@ -281,28 +282,31 @@
     \row
         \li \l[QtScriptTools]{Qt Script Tools} (Deprecated)
         \li All
-        \li All
+        \li All (*)
         \li Additional components for applications that use \l{Qt Script}.
     \row
         \li \l[QtSensors]{Qt Sensors}
         \li All
-        \li \l{Qt for Android}{Android}, \l{Qt for iOS}, \l{Qt for WinRT}{WinRT} and Mer.
+        \li \l{Qt for Android}{Android}, \l{Qt for iOS}, \l{Qt for WinRT}{WinRT}, Mer,
+            and \l{Qt for QNX}{QNX}.
         \li Provides access to sensor hardware and motion gesture recognition.
     \row
         \li \l[QtSerialBus]{Qt Serial Bus}
         \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux} and \l{Boot2Qt}{Boot to Qt} targets.
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux},
+            \l{Boot2Qt}{Boot to Qt} targets, and \l{Qt for QNX}{QNX}.
         \li Provides access to serial industrial bus interface. Currently the
             module supports the CAN bus and Modbus protocols.
     \row
         \li \l[QtSerialPort]{Qt Serial Port}
         \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for macOS}{\macos}.
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, \l{Qt for macOS}{\macos},
+            and \l{Qt for QNX}{QNX}.
         \li Provides access to hardware and virtual serial ports.
     \row
         \li \l[QtSpeech]{Qt Speech}
         \li All
-        \li All
+        \li All except \l{Qt for QNX}{QNX}.
         \li Provides support for accessibility features such as text-to-speech.
     \row
         \li \l[QtSvg]{Qt SVG}
@@ -313,7 +317,7 @@
     \row
         \li \l[QtUITools]{Qt UI Tools}
         \li All
-        \li All
+        \li All (*)
         \li Classes for loading QWidget based forms created in \QD dynamically, at runtime.
     \row
         \li \l[QtWebChannel]{Qt WebChannel}
@@ -350,7 +354,7 @@
     \row
         \li \l[QtXml]{Qt XML}
         \li All
-        \li All
+        \li All (*)
         \li C++ implementations of SAX and DOM.
             \note This module is not required to use QXmlStreamReader and
             QXmlStreamWriter. They are already part of \l{Qt Core}.
@@ -402,6 +406,8 @@
             WebGL™.
    \endtable
 
+   (*) The QNX status is not known.
+
     \section1 Value-Add Modules
 
     In addition to the modules released as part of Qt 5, the following modules
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]