Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	doc/src/platforms/windows.qdoc

Change-Id: Ieba4e6823fef1c7b8d36064110f2469895512941

9 files changed, 42 insertions, 65 deletions

diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index be121794..b354427b 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -32,9 +32,7 @@
     Deploying an Qt application does not require any C++
     programming. All you need to do is to build Qt and your
     application in release mode, following the procedures described in
-    this documentation. We will demonstrate the procedures in terms of
-    deploying the \l {tools/plugandpaint/app}{Plug & Paint} application
-    that is provided in Qt's examples directory.
+    this documentation.
 
     \section1 Static vs. Shared Libraries
 
@@ -69,42 +67,8 @@
 
     \section1 Deploying Qt's Libraries
 
-    \table
-    \header
-        \li {4,1} Qt Libraries
-    \row
-        \li \l{Qt Core}{QtCore}
-        \li \l{Qt Network}{QtNetwork}
-        \li \l{Qt GUI}{QtGui}
-        \li \l{Qt SQL}{QtSql}
-    \row
-        \li \l{Qt Test}{QtTest}
-        \li \l{Qt Widgets}{QtWidgets}
-        \li \l{Qt QML}{QtQml}
-        \li \l{Qt Quick}{QtQuick}
-    \row
-        \li \l{Qt Multimedia}{QtMultimedia}
-        \li \l{Qt WebEngine}{QtWebEngine}
-        \li \l{Qt WebEngine Widgets}{QtWebEngineWidgets}
-        \li \l{Qt XML}{QtXml}
-    \row
-        \li \l{Qt XML Patterns}{QtXmlPatterns}
-        \li \l{Qt SVG}{QtSvg}
-        \li \l{Qt Concurrent}{QtConcurrent}
-        \li \l{Qt Print Support}{QtPrintSupport}
-    \row
-        \li \l{Qt D-Bus}{QtDBus}
-        \li \l{Qt OpenGL}{QtOpenGL}
-        \li \l{ActiveQt}{QtActiveQt}
-        \li \l{Qt Graphical Effects}{QtGraphicalEffects}
-    \row
-        \li \l{Qt Script}{QtScript}
-        \li \l{Qt Quick 1}{QtDeclarative}
-        \li \l{Qt Image Formats}{QtImageFormats}
-    \endtable
-
-    Qt is not a system library, so it must be redistributed with your
-    application. The minimum is to redistribute the run-time
+    Unless Qt is part of the system libraries it must be redistributed
+    with your application. The minimum is to redistribute the run-time
     of the libraries used by the application.  However, with static linking,
     the Qt run-times can be compiled into the executable.
 
@@ -117,6 +81,9 @@
     require, including those for accessibility.
     For more information about plugins, see \l{How to Create Qt Plugins}.
 
+    Applications using \l{Qt QML} also need to ship the
+    \l{All QML Modules}{QML modules} they use.
+
     While deploying an application using the shared library approach,
     you must ensure that the Qt libraries use the correct path to
     find the Qt plugins, documentation, translation, and so on. To do this, you
@@ -158,6 +125,8 @@
 
     \endtable
 
+    For more information, see \l{Third-Party Licenses Used in Qt}.
+
     \section1 Platform-Specific Notes
 
     The procedure of deploying Qt applications is different for the
diff --git a/doc/src/images/qt-logo.png b/doc/src/images/qt-logo.png
index 14ddf2a0..b63f1384 100644
--- a/doc/src/images/qt-logo.png
+++ b/doc/src/images/qt-logo.png
diff --git a/doc/src/modules-qml.qdoc b/doc/src/modules-qml.qdoc
index 818b381d..3db05379 100644
--- a/doc/src/modules-qml.qdoc
+++ b/doc/src/modules-qml.qdoc
@@ -26,19 +26,14 @@
 ****************************************************************************/
 
 /*!
-    \group qmlmodules
-    \brief Overview of available QML Modules
-    \title All QML Modules
-*/
-
-/*!
     \page modules-qml.html
-    \title All QML APIs by Module
+    \keyword All QML APIs by Module
     \ingroup classlists
+    \title All QML Modules
 
-    \brief A list of all QML API in Qt 5
+    \brief A list of all QML modules in Qt 5.
 
-    These are the QML API pages for Qt 5's \l{All QML Modules}{QML modules}.
+    These are the QML API pages for Qt 5's QML modules.
 
-    \annotatedlist {qmlmodules}
+    \generatelist qml-modules
 */
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 9a1d4da0..bd03b987 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -146,10 +146,10 @@ In order to use \l{Qt for Android}, you need the following:
 \list
 \li \l{http://developer.android.com/sdk/index.html}{The Android SDK Tools}
 \li \l{http://developer.android.com/tools/sdk/ndk/index.html}{The Android NDK}
-\li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} v1.8 or later
 \li \l{http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html}{Java SE Development Kit} (JDK) v6 or later. You can also use \l{http://openjdk.java.net}{OpenJDK} on Linux.
 \li On Windows, you need the following additional installations:
   \list
+    \li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} v1.8 or later
     \li Android Debug Bridge (ADB) driver on the Windows platform to enable USB
         debugging. The default USB driver on Windows does not allow debugging.
         For details about how to get the USB driver, see
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index ea2b9158..3407eaf3 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -556,13 +556,18 @@
 
   \section2 eglfs with other backends
 
-  Other backends, that are typically based on targeting the framebuffer
-  directly via the vendor's EGL implementation, usually provides limited or
-  no support for multiple displays. In some cases the \c {QT_QPA_EGLFS_FB}
-  environment variable can be used to specify the framebuffer to target,
-  similarly to linuxfb. Alternatively, driver-specific environment variables or
-  kernel parameters may also be available to control the used framebuffer. Refer
-  to the embedded board's documentation.
+  Other backends, that are typically based on targeting the framebuffer or a
+  composition API directly via the vendor's EGL implementation, usually provide
+  limited or no support for multiple displays. On i.MX6-based boards with
+  Vivante GPUs the \c{QT_QPA_EGLFS_FB} environment variable can be used to
+  specify the framebuffer to target, similarly to linuxfb. On the Raspberry Pi
+  the \c{QT_QPA_EGLFS_DISPMANX_ID} environment variable can be used to specify
+  the screen to output to. The value corresponds to one of the \c{DISPMANX_ID_}
+  constants, refer to the Dispmanx documentation. Note that these approaches,
+  unlike KMS/DRM, will not typically allow to output to multiple screens from
+  the same application. Alternatively, driver-specific environment variables or
+  kernel parameters may also be available as well to control the used
+  framebuffer. Refer to the embedded board's documentation.
 
   \section2 Video Memory
 
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 70a161b7..eb66edf7 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -531,8 +531,18 @@
     plugins, and translations) that are required to run the application from
     that folder. It creates a sandbox for \l{Qt for WinRT}{Windows Runtime}
     or an installation tree for Windows desktop applications, which can be
-    easily bundled into an installation package. The tool can be found in
-    QTDIR/bin/windeployqt.
+    easily bundled into an installation package.
+
+    The tool can be found in \c{QTDIR/bin/windeployqt}. It takes an \c .exe file or
+    a directory that contains an \c .exe file as an argument, and scans the executable
+    for dependencies. If a directory is passed with the \c{--qmldir} argument,
+    \c windeployqt uses the \c qmlimportscanner tool to scan QML
+    files inside the directory for QML import dependencies.
+    Identified dependencies are then copied to the executable's
+    directory. The hardcoded local paths in Qt5Core.dll are furthermore replaced
+    with relative ones.
+
+    Additional arguments are described in the tools' help output:
 
     \badcode
     Usage: windeployqt [options] [files]
@@ -694,17 +704,15 @@
     is a subdirectory named \c {platforms}. \l{Qt Plugins} section has
     additional information about plugins and how Qt searches for them.
 
-    If Qt was configured to use the \l{ICU} library for unicode support, the ICU
-    DLLs located in the \c bin directory of your Qt installation must be included.
-    The ICU DLLs are version dependent and have to match the ones your Qt version
-    was linked against.
-
     If \l{ANGLE} (the default) is used, you additionally need to include both
     \c libEGL.dll and \c libGLESv2.dll from Qt's 'lib' directory as well as
     the HLSL compiler from DirectX. The HLSL compiler library,
     d3dcompiler_XX.dll, where XX is the version number that ANGLE (libGLESv2)
     was linked against.
 
+    If Qt was configured to link against ICU or OpenSSL, the respective DLL's
+    need to be added to the \c release folder, too.
+
     \note \l{Qt WebEngine} applications have additional requirements that are
     listed in \l{Deploying Qt WebEngine Applications}.
 
@@ -784,7 +792,7 @@
         \li \c msvcp140.dll
     \endtable
 
-    If ICU was used, the archive must contain:
+    If Qt was configured to use ICU, the archive must contain:
 
     \table 100%
     \header
diff --git a/doc/src/snippets/brushstyles/qt-logo.png b/doc/src/snippets/brushstyles/qt-logo.png
index 2dc67161..d609c1e1 100644
--- a/doc/src/snippets/brushstyles/qt-logo.png
+++ b/doc/src/snippets/brushstyles/qt-logo.png
diff --git a/doc/src/snippets/declarative/pathview/pics/qtlogo.png b/doc/src/snippets/declarative/pathview/pics/qtlogo.png
index 4f68e162..3bc03b7c 100644
--- a/doc/src/snippets/declarative/pathview/pics/qtlogo.png
+++ b/doc/src/snippets/declarative/pathview/pics/qtlogo.png
diff --git a/doc/src/snippets/declarative/pics/qtlogo.png b/doc/src/snippets/declarative/pics/qtlogo.png
index 4f68e162..3bc03b7c 100644
--- a/doc/src/snippets/declarative/pics/qtlogo.png
+++ b/doc/src/snippets/declarative/pics/qtlogo.png