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

Change-Id: Ib219236278de0ffb3ada87915f925aa66d1a3c89

55 files changed, 1058 insertions, 1266 deletions

diff --git a/dist/changes-5.6.2 b/dist/changes-5.6.2
new file mode 100644
index 000000000..02809ad6a
--- /dev/null
+++ b/dist/changes-5.6.2
@@ -0,0 +1,28 @@
+Qt 5.6.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  https://doc.qt.io/qt-5/
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file may include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+ - Fixed several instances of missing, incorrect or obsolete information.
+ - Updated documentation on supported platforms.
+ - Updated licensing documentation.
+ - Updated documentation on Windows deployment.
+ - Updated HiDPI documentation.
diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1
new file mode 100644
index 000000000..2cc63e5d4
--- /dev/null
+++ b/dist/changes-5.7.1
@@ -0,0 +1,27 @@
+Qt 5.7.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.7.0.
+
+For more details, refer to the documentation included in this distribution.
+The documentation is also available online:
+
+  https://doc.qt.io/qt-5/
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+This release contains all fixes included in the Qt 5.6.2 release.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+  - Updated information on installers, Qt account and license keys.
+  - Updated QML coding conventions to mention semicolon usage.
+  - Fixed incorrect information in supported platforms.
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index fb941c7cc..33f836480 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -65,11 +65,13 @@ depends += \
     qtcanvas3d \
     qtwebview \
     qtquickcontrols2 \
-    qtwaylandcompositor\
+    qtwaylandcompositor \
     qtcharts \
     qtdatavisualization \
     qtpurchasing \
-    qtvirtualkeyboard
+    qtvirtualkeyboard \
+    qtspeech \
+    qtnetworkauth
 
 headerdirs  += ../src
 imagedirs   += ../src/images \
diff --git a/doc/images/ok.png b/doc/images/ok.png
new file mode 100644
index 000000000..8f63851a1
--- /dev/null
+++ b/doc/images/ok.png
diff --git a/doc/snippets/qmlapp/codingconventions/javascript-semicolons.qml b/doc/snippets/qmlapp/codingconventions/javascript-semicolons.qml
new file mode 100644
index 000000000..5229f189e
--- /dev/null
+++ b/doc/snippets/qmlapp/codingconventions/javascript-semicolons.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.7
+
+//![0]
+MouseArea {
+    anchors.fill: parent
+    onClicked: {
+        var scenePos = mapToItem(null, mouseX, mouseY);
+        console.log("MouseArea was clicked at scene pos " + scenePos);
+    }
+}
+//![0]
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index 5e5f834ec..fedb59175 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -58,7 +58,7 @@
     \li \l{All Namespaces}
     \li \l{All Classes by Module}
     \li \l{Obsolete Classes}
-    \li \l{New Classes and Functions in Qt 5.7}
+    \li \l{New Classes and Functions in Qt 5.8}
     \endlist
 
     For more reference pages including QML types, visit \l{Qt Reference Pages}.
@@ -82,7 +82,7 @@
     \li \l{All QML Types}
     \li \l{All QML APIs by Module}
     \li \l{Obsolete QML Types}
-    \li \l{New Classes and Functions in Qt 5.7}
+    \li \l{New Classes and Functions in Qt 5.8}
     \endlist
 
     For more reference pages including C++ APIs, visit \l{Qt Reference Pages}.
@@ -105,7 +105,7 @@
     \li \l{All QML Basic Types}
     \li \l{All QML APIs by Module}
     \li \l{Obsolete QML Types}
-    \li \l{New Classes and Functions in Qt 5.7}
+    \li \l{New Classes and Functions in Qt 5.8}
     \endlist
 
     For more reference pages including C++ APIs, visit \l{Qt Reference Pages}.
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 6031e6b13..666826936 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -38,7 +38,7 @@
     should be run from the main Qt source directory.
 
     Unless stated otherwise, the commands in this page are for the Linux
-    platforms. On OS X and on Windows, the \c PATH and directory structure
+    platforms. On \macos and on Windows, the \c PATH and directory structure
     are different, therefore the commands will vary. Also, on Windows systems,
     the configure script is called \e configure.bat.
 
@@ -47,49 +47,47 @@
 
     \section1 Source, Build, and Install Directories
 
-    With configure, it is possible to configure Qt to install to a different
-    directory than the source directory or the build directory. The \e source
-    directory contains the source code and it is obtained from the source
-    package. The \e build directory is where the build related files such as
-    Makefiles, object files, and other intermediate files are stored. The \e
-    install directory is where the binaries and libraries are installed, for use
-    either by the system or by the application.
-
-    It is often convenient to use a \e{shadow build}, when the build directory
-    is not the same as the source directory. This method allows the source
-    directory to be free from intermediate or generated files, and allows for
-    multiple simultaneous builds with different configurations. To shadow-build,
-    run \c configure from a separate directory:
-
-   \code
+    The \e source directory contains the source code that is obtained from
+    the source package or git repository. The \e build directory is where the
+    build-related files such as Makefiles, object files, and other intermediate
+    files are stored. The \e install directory is where the binaries and
+    libraries are installed, for use either by the system or by the
+    application.
+
+    It is recommended to keep these directories separate by shadow-building and
+    using the \c -prefix option. This enables you to keep the Qt \e source tree
+    clean from the build artifacts and binaries, which are stored in a separate
+    directory. This method is very convenient if you want to have multiple
+    builds from the same source tree, but for different configurations. To
+    shadow-build, run \c configure from a separate directory:
+
+    \badcode
     mkdir ~/qt-build
     cd ~/qt-build
-    ~/qt-source/configure
+    ~/qt-source/configure -prefix /opt/Qt5.6
+    qmake
     \endcode
 
-    The Makefiles are at \e ~/qt-build and not in the source directory.
+    Configuring with the \c -prefix option means that the Qt binaries and
+    libraries are installed into another directory, which is \c /opt/Qt5.6 in
+    this case. Running \c qmake generates the Makefiles in the \e ~/qt-build
+    directory and not in the \e source directory. After the Makefiles are in
+    place, run the following commands to build the Qt binaries and libraries,
+    and install them:
 
-    After building, it may be necessary to install the libraries and binaries
-    into the install directory. The default for the installation directory
-    depends on the platform; \c configure's output mentions it. To modify the
-    installation directory, use the \c -prefix option:
-
-    \code
-    ./configure -prefix /opt/Qt-5.1
+    \badcode
+    make
+    make install
     \endcode
 
-    The installation directory serves as the parent directory of the \e bin, \e
-    lib, and other installed Qt subdirectories.
-
-    It is possible to set the install directory to the same directory as the
-    build directory (this is termed a \e non-prefix build). In this case, Qt can
-    be used straight out of the build directory, and \e must \e not be
-    installed. This is the default under Windows, and when Qt is configured with
-    the \c -developer-build option.
+    \note The 'make install' step is required only if Qt is configured with a
+    \e -prefix, which is the default on Unix-based platforms unless the
+    \e -developer-build configure option is used. On Windows, Qt is configured
+    as a non-prefix build by default.
 
-    \note When you are explicitly requesting a non-prefix configuration for a
-    top-level build of Qt (all modules at once), set the prefix to
-    \c{$builddir/qtbase}, not \c{$builddir}.
+    \note The \c -developer-build is meant for developing Qt and not for
+    shipping applications. Such a build contains more exported symbols than
+    a standard build and compiles with a higher warning level.
 
     \section1 Including and Excluding Qt Modules
 
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index fc5ac0824..67e59fa15 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -185,7 +185,7 @@ port emulators include virtual COM ports, com0com emulators, and the
 Bluetooth SPP.
 
 This module is designed to make serial port programming easier and portable.
-As of Qt 5.2, it is supported on \l{Qt for Windows}{Windows}, \l{Qt for OS X}{OS X},
+As of Qt 5.2, it is supported on \l{Qt for Windows}{Windows}, \l{Qt for macOS}{\macos},
 and \l{Qt for Linux/X11}{Linux}.
 
 Related topics:
diff --git a/doc/src/core.qdoc b/doc/src/core.qdoc
index 2cb142a57..985ceadf0 100644
--- a/doc/src/core.qdoc
+++ b/doc/src/core.qdoc
@@ -44,9 +44,16 @@ such as a meta-object system which allows run-time introspection, manipulation,
 and invocation of properties and methods in the object. It also serves as the
 basis for Qt's event system, which is a low-level way of communicating between
 QObject-based objects. Another high-level form of communication is provided in
-Qt's signals and slots mechanism. These features can also be used in combination
+Qt's signals and slots mechanism.
+
+These features can also be used in combination
 with the State Machine Framework which provides a formally defined and
-predictable way of managing the states of your application. In addition, QObject
+predictable way of managing the states of your application.
+An alternative way of implementing state machines is using the
+\l{Qt SCXML Overview}{Qt SCXML} add-on module to create them from State Chart
+XML (SCXML) files.
+
+In addition, QObject
 provides a simple timing mechanism with \l QObject::startTimer(). Alternatively,
 the QTimer class provides a high-level interface for timers.
 
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 55fdb43ed..5daa47994 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -84,7 +84,7 @@ Qt's SQL classes can be divided in 3 layers:
 \endtable
 
 With the MySQL driver, it is possible to connect to a MySQL server. In order to
-build the QMYSQL Plugin for Unix or OS X, you need the MySQL header files
+build the QMYSQL Plugin for Unix or \macos, you need the MySQL header files
 as well as the shared library, libmysqlclient.so. To compile the plugin
 for Windows, install MySQL.
 
@@ -236,7 +236,7 @@ The QSettings class provides persistent storage of application settings.
 An application usually remembers its settings from the previous session.
 
 Settings are stored differently on different platforms. For example,
-on Windows they are stored in the registry, whereas, on OS X they are
+on Windows they are stored in the registry, whereas on \macos they are
 stored in XML files.
 
 QSettings enable you to save and restore application settings in a portable
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index b354427b3..432bf831b 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -95,7 +95,7 @@
     platform-specific application dependencies for
     \l{Qt for Linux/X11 - Deployment#Application Dependencies}{X11},
     \l{Qt for Windows - Deployment#Application Dependencies}{Windows},
-    and \l{Qt for OS X}{OS X}.
+    and \l{Qt for macOS}{\macos}.
 
     \section1 Licensing
 
@@ -135,7 +135,7 @@
     \list
         \li \l{Qt for Linux/X11 - Deployment}{Qt for X11 Platforms}
         \li \l{Qt for Windows - Deployment}{Qt for Windows}
-        \li \l{Qt for OS X#Deploying Applications on OS X}{Qt for OS X}
+        \li \l{Qt for macOS#Deploying Applications on macOS}{Qt for macOS}
         \li \l{Deploying an Application on Android}{Qt for Android}
     \endlist
 
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc
index 569ea4fd2..8cc463a81 100644
--- a/doc/src/deployment/qt-conf.qdoc
+++ b/doc/src/deployment/qt-conf.qdoc
@@ -44,7 +44,7 @@
 
     \li \c :/qt/etc/qt.conf using the resource system
 
-    \li on OS X, in the Resource directory inside the application
+    \li on \macos, in the Resource directory inside the application
     bundle, for example \c assistant.app/Contents/Resources/qt.conf
 
     \li in the directory containing the application executable, i.e.
@@ -97,7 +97,7 @@
     Absolute paths are used as specified in the \c qt.conf file. All
     paths are relative to the \c Prefix. On Windows and X11, the \c
     Prefix is relative to the directory containing the application
-    executable (QCoreApplication::applicationDirPath()). On OS X,
+    executable (QCoreApplication::applicationDirPath()). On \macos,
     the \c Prefix is relative to the \c Contents in the application
     bundle. For example, \c application.app/Contents/plugins/ is the
     default location for loading Qt plugins. Note that the plugins
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc
index e062b9a76..32d09b541 100644
--- a/doc/src/development/debug.qdoc
+++ b/doc/src/development/debug.qdoc
@@ -42,7 +42,7 @@
     platforms, building Qt in debug mode will cause applications to be larger
     than desirable.
 
-    \section2 Debugging in OS X and Xcode
+    \section2 Debugging in \macos and Xcode
 
     \section3 Debugging With/Without Frameworks
 
@@ -142,7 +142,7 @@
     \snippet snippets/code/doc_src_debug.cpp 0
 
     The Qt implementation of these macros prints to the
-    \c stderr output under Unix/X11 and OS X. With Windows, if it
+    \c stderr output under Unix/X11 and \macos. With Windows, if it
     is a console application, the text is sent to console; otherwise, it
     is sent to the debugger.
 
diff --git a/doc/src/development/moc.qdoc b/doc/src/development/moc.qdoc
index 44806b381..246d4b73a 100644
--- a/doc/src/development/moc.qdoc
+++ b/doc/src/development/moc.qdoc
@@ -220,7 +220,7 @@
     \row
     \li \c{-Fdir}
 
-    \li OS X. Add the framework directory \c{dir} to the head of
+    \li \macos. Add the framework directory \c{dir} to the head of
        the list of directories to be searched for header files. These
        directories are interleaved with those specified by -I options
        and are scanned in a left-to-right order (see the manpage for
diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc
index 4ba53d599..fb6ba5507 100644
--- a/doc/src/developmenttools.qdoc
+++ b/doc/src/developmenttools.qdoc
@@ -96,7 +96,7 @@
     \row \li \l{Qt Quick Compiler}
          \li A compiler for QML that enables building Qt Quick applications
          without having to deploy the QML sources on to the target.
-    \row \li \l{Qt Visual Studio Add-in}
+    \row \li \l{Qt VS Tools}
          \li Intended for developers who wish to develop Qt applications using
          the Visual Studio IDE instead of Qt Creator.
     \endtable
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 0e4c22963..a84df26f2 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -88,7 +88,8 @@
         \list
         \li \l{First Steps with QML}
         \li \l{Qt Creator: Developing Qt Quick Applications}{Developing Qt Quick Applications}
-        \li \l{Qt Quick Controls - Gallery}{Controls Gallery}
+        \li \l{Qt Quick Controls - Gallery}
+        \li \l{Qt Quick Controls 2 - Gallery}
         \li \l{QML Advanced Tutorial}{SameGame}
         \li \l{Qt Quick Text Editor Guide}
         \endlist
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 159f29f03..0548c262c 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -66,6 +66,11 @@
 */
 
 /*!
+    \externalpage http://www.gnu.org/licenses/gpl-3.0.html
+    \title GNU General Public License, version 3
+*/
+
+/*!
     \externalpage http://www.gnu.org/licenses/lgpl-2.1.html
     \title GNU Lesser General Public License, version 2.1
 */
@@ -75,6 +80,12 @@
     \title GNU Lesser General Public License, version 3
 */
 
+
+/*!
+    \externalpage https://spdx.org/licenses/BSD-3-Clause.html
+    \title BSD 3-clause "New" or "Revised" License
+*/
+
 /*!
     \externalpage http://qt-project.org/faq/answer/how_to_compress_data_with_qt
     \title How to compress data with Qt?
@@ -222,10 +233,6 @@
     \title Qt for Device Creation
 */
 
-/*!
-    \externalpage http://doc.qt.io/QtQuick2DRenderer
-    \title Qt Quick 2D Renderer
-*/
 
 /*!
     \externalpage http://doc.qt.io/QtSupportedPlatforms/index.html
@@ -238,13 +245,13 @@
 */
 
 /*!
-    \externalpage http://www.qt.io/qt-account/
+    \externalpage https://account.qt.io/
     \title Qt Account
 */
 
 /*!
-    \externalpage http://doc.qt.io/vs-addin
-    \title Qt Visual Studio Add-in
+    \externalpage http://doc.qt.io/qtvstools/index.html
+    \title Qt VS Tools
 */
 /*!
     \externalpage http://doc.qt.io/emulator/index.html
@@ -278,3 +285,22 @@
     \externalpage http://doc.qt.io/QtForDeviceCreation/qtee-about-b2qt.html
     \title Boot2Qt
 */
+
+/*!
+    \externalpage https://qmlbook.github.io/
+    \title QML Book
+*/
+
+/*!
+    \externalpage https://doc.qt.io/qt-5/vxworks.html
+    \title ext: Qt for VxWorks
+*/
+
+/*
+    This prevents autolinking of each occurrence of 'macOS'
+*/
+/*!
+    \externalpage nolink
+    \title macOS
+    \internal
+*/
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index bb6d32e20..d8ff0769d 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -88,7 +88,7 @@
     Semantic information about user interface elements, such as
     buttons and scroll bars, is exposed to the assistive technologies.
     Qt supports Microsoft Active Accessibility (MSAA) and IAccessible2 on Windows,
-    OS X Accessibility on OS X, and AT-SPI via DBus on Unix/X11.
+    \macos Accessibility on \macos, and AT-SPI via DBus on Unix/X11.
     The platform specific technologies are abstracted by Qt,
     so that applications do not need any platform specific changes to work with the different
     native APIs. Qt tries to make adding accessibility support to your application as easy
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 9d1ade3bb..4b264f52a 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -763,7 +763,7 @@
 
     QPainter can be used in a thread to paint onto QImage, QPrinter, and
     QPicture paint devices. Painting onto QPixmaps and QWidgets is \e not
-    supported. On OS X the automatic progress dialog will not be
+    supported. On \macos the automatic progress dialog will not be
     displayed if you are printing from outside the GUI thread.
 
     Any number of threads can paint at any given time, however only
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 3b5724be4..75cfb4e79 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -44,7 +44,7 @@
     a consistent look and feel. Custom layouts provide more control over the
     positions and sizes of child widgets.
 
-    These \l{Qt Examples and Tutorials}{Qt Examples} demonstrate various
+    These \l{Qt Examples and Tutorials}{Qt Examples} demonstrate various
     ways of setting widgets in layouts.
 
     \list
@@ -248,6 +248,9 @@
     \li \l{statemachine/trafficlight}{Traffic Light}\raisedaster
     \li \l{statemachine/twowaybutton}{Two-way Button}\raisedaster
     \endlist
+
+    For more information about using the Qt SCXML module to to create state
+    charts from State Chart XML (SCXML) files, see \l {Qt SCXML Examples}.
 */
 
 /*!
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 30185a96b..9c989f178 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -30,14 +30,22 @@
     \title Getting Started with Qt
     \brief A quick guide for developers
 
+    \section1 Install Qt
+
     You can install the Qt Framework and tools by using an online or offline
-    installer or by building the source packages yourself. In the
-    \e{online installer}, you can select the Qt versions, tools, and Add-On
-    components to download and install depending on the license attached to your
-    \l{Qt Account}.
+    installer or by building the source packages yourself.
+
+    In the \e{online installer}, you can select commercial or open source
+    versions of Qt, tools, and Add-On components to install. Using the online
+    installer requires signing in to your \l{Qt Account}. The installer
+    retrieves the license attached to the account from a server and provides a
+    list of available components corresponding to the license.
 
     An \e{offline installer} is a single package that contains all of Qt and
-    Add-Ons relevant for a target platform.
+    Add-Ons relevant for a target platform. Users with a commercial license
+    can either sign in with their Qt account or with their Qt license key
+    during the installation process. The license key is available in the
+    \l {Qt Account} Web portal.
 
     You can download Qt 5 installers from the \l Downloads page.
 
@@ -77,13 +85,28 @@
     \li \l{Qt for iOS}{iOS}
     \li \l{Qt for Windows}{Windows}
     \li \l{Qt for Linux/X11}{Linux/X11}
-    \li \l{Qt for OS X}{OS X}
+    \li \l{Qt for macOS}{\macos}
     \li \l{Qt for WinRT}{Windows Runtime}
     \endlist
 
     For more information, visit the \l{Community Supported Platforms}
     {supported platforms} page.
 
+    \section1 Create Your First Applications
+
+    Learn the basics of Qt and Qt Quick development by following two tutorials
+    that illustrate how to create simple applications and build and run them on
+    target platforms:
+
+    \list
+    \li \l {Getting Started Programming with Qt Widgets}
+    \li \l {Getting Started Programming with Qt Quick}
+    \endlist
+
+    For a more thorough walkthrough of the different aspects of developing
+    applications with Qt 5, see the \l {QML Book}. It focuses on Qt Quick,
+    but also provides the information needed to use QML together with C++.
+
     \section1 Explore Qt
 
     We invite you to explore the rest of Qt. We prepared overviews which help
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 14d0db073..cd6cedf16 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -168,6 +168,7 @@
             }
 
             MouseArea{
+                id: buttonMouseArea
                 onClicked: buttonClick()
                 hoverEnabled: true
                 onEntered: parent.border.color = onHoverColor
@@ -231,9 +232,9 @@
     \c FileMenu.qml.
 
     \code
-        import QtQuick 2.3             \\ Import the main Qt QML module
-        import "folderName"            \\ import the contents of a folder
-        import "script.js" as Script   \\ Import a Javascript file and name it as Script
+        import QtQuick 2.3             // Import the main Qt QML module
+        import "folderName"            // import the contents of a folder
+        import "script.js" as Script   // Import a Javascript file and name it as Script
     \endcode
 
     The syntax shown above shows how to use the \c import keyword. This is required to
@@ -366,14 +367,14 @@
     Additionally, \c ListView inherits from \l Flickable, making the list respond
     to mouse drags and other gestures. The last portion of the code above sets
     \c Flickable properties to create the desired flicking movement to our view.
-    In particular,the property \c highlightMoveDuration changes the duration of
+    In particular, the property \c highlightMoveDuration changes the duration of
     the flick transition. A higher \c highlightMoveDuration value results in
     slower menu switching.
 
     The \c ListView maintains the model items through an \c index and each visual
     item in the model is accessible through the \c index, in the order of the
     declaration. Changing the \c currentIndex effectively changes the highlighted
-    item in the \c ListView. The header of our menu bar exemplify this effect.
+    item in the \c ListView. The header of our menu bar exemplifies this effect.
     There are two buttons in a row, both changing the current menu when clicked.
     The \c fileButton changes the current menu to the file menu when clicked,
     the \c index being \c 0 because \c FileMenu is declared first in the
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 0fd0c5246..73e3a2a20 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -508,7 +508,7 @@
     the name of the file to open. Qt comes with QFileDialog, which is a dialog
     from which the user can select a file. The appearance of the dialog depends
     on the desktop platform that you run the application on. The following
-    image shows the dialog on OS X:
+    image shows the dialog on \macos:
 
     \image gs4.png
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 505280026..214627243 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -61,11 +61,11 @@ visit the following page:
 \li \l{Qt for Windows - Building from Source}
 \endlist
 
-\section1 OS X
+\section1 \macos
 
 \list
-\li \l{Qt for OS X - Requirements}
-\li \l{Qt for OS X - Building from Source}
+\li \l{Qt for macOS - Requirements}
+\li \l{Qt for macOS - Building from Source}
 \endlist
 
 \section1 Linux/X11
diff --git a/doc/src/highdpi.qdoc b/doc/src/highdpi.qdoc
index 4e32aedd8..dc1261a03 100644
--- a/doc/src/highdpi.qdoc
+++ b/doc/src/highdpi.qdoc
@@ -70,7 +70,7 @@
 
     Qt supports a high DPI mode where the main coordinate system is virtualized and
     made independent of the display pixel density. This mode is implemented by some
-    operating systems (OS X, iOS). In addition, Qt contains an implementation which
+    operating systems (\macos, iOS). In addition, Qt contains an implementation which
     may be used where operating system support is missing.
 
     Geometry is now specified in device independent pixels. This includes widget and
@@ -86,12 +86,12 @@
 
     The operating systems supported by Qt offer the following support for high DPI displays:
 
-    \section3 OS X and iOS
+    \section3 \macos and iOS
 
     The Apple platforms implement scaling and coordinate system virtualization in the
     in the operating system. Normally, no special configuration is required.
 
-    \note On OS X, high-DPI support is enabled by settings in the Info.plist file.
+    \note On \macos, high-DPI support is enabled by settings in the Info.plist file.
     Make sure they are present.
     \code
         <key>NSPrincipalClass</key>
@@ -102,8 +102,8 @@
     Never versions of qmake will generate Info.plist's with the NSPrincipalClass key,
     which is sufficient since NSHighResolutionCapable is true by default.
 
-    \note OS X and iOS may apply further virtualization such that device pixels do not
-    correspond 1:1 to display pixels. This happens on the iPhone 6+ and on OS X configured
+    \note \macos and iOS may apply further virtualization such that device pixels do not
+    correspond 1:1 to display pixels. This happens on the iPhone 6+ and on \macos configured
     with 'display scaling' enabled.
 
     \section3 Microsoft Windows
@@ -160,7 +160,7 @@
             see \l{Drawing High Resolution Versions of Pixmaps and Images}.
 
         \li Qt 5.6 supports cross-platform high-DPI scaling for legacy applications,
-            similar to the scaling done natively by OS X. This allows applications written
+            similar to the scaling done natively by \macos. This allows applications written
             for low-DPI screens to run unchanged on high-DPI devices. This feature is
             opt-in, and can be enabled by the following environment variables:
             \list
@@ -187,7 +187,10 @@
 
                 \endlist
 
-            It is recommended to use the \c Fusion style.
+            While the macOS style fully supports high-DPI, the Windows desktop style
+            currently has some limitations with certain scale factors. In these cases,
+            consider using the Fusion style instead, which aims to support high-DPI in
+            all cases.
 
             \note Non-integer scale factors may cause significant
             scaling/painting artifacts.
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 74a895e59..115293532 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -77,7 +77,7 @@
     \c .rc file and run the \c rc or \c windres program on the \c .rc file,
     then link your application with the resulting \c .res file.
 
-    \section1 Setting the Application Icon on OS X
+    \section1 Setting the Application Icon on \macos
 
     The application icon, typically displayed in the application dock
     area, is set by calling QWindow::setWindowIcon() on a window. It is
diff --git a/doc/src/howtos/plugins-howto.qdoc b/doc/src/howtos/plugins-howto.qdoc
index 0279b7924..111b213fd 100644
--- a/doc/src/howtos/plugins-howto.qdoc
+++ b/doc/src/howtos/plugins-howto.qdoc
@@ -92,7 +92,7 @@
         \li \l{Qt GUI}
         \li Case Sensitive
     \row
-        \li QPictureFormatPlugin
+        \li QPictureFormatPlugin (obsolete)
         \li \c pictureformats
         \li \l{Qt GUI}
         \li Case Sensitive
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index 6a812b89b..e1a4bbcf6 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -62,8 +62,8 @@
     To implement scalable applications using \l{Qt Quick}:
 
     \list
-        \li Design UIs using \e {Qt Quick Controls} that provide a set of UI
-            controls.
+        \li Design UIs using \e {Qt Quick Controls} or \e {Qt Quick Controls 2}
+            that provide sets of UI controls.
         \li Define layouts using \e {Qt Quick Layouts}, which can resize their
             items.
         \li Use \e {property binding} to implement use cases
@@ -228,7 +228,7 @@
     evaluating JavaScript expressions comes with a performance cost.
 
     You can use bindings to handle low and high pixel density on platforms that
-    do not have automatic support for it (like OS X and iOS do).
+    do not have automatic support for it (like \macos and iOS do).
     The following code snippet uses the \l{Screen}{Screen.PixelDensity}
     attached property to specify different images to display on screens with
     low, high, or normal pixel density:
@@ -246,7 +246,7 @@
         }
     \endcode
 
-    On OS X and iOS, you can provide alternative resources with double the size
+    On \macos and iOS, you can provide alternative resources with double the size
     and the \e @2x identifier for icons and images and place them in the
     resource file. On Retina displays, the @2x versions are used automatically.
 
@@ -291,9 +291,9 @@
     For more information about high DPI support in Qt and the supported
     platforms, see \l{High DPI Displays}.
 
-    \section2 High DPI Scaling on OS X and iOS
+    \section2 High DPI Scaling on \macos and iOS
 
-    On OS X and iOS, applications use high DPI scaling that is an alternative to
+    On \macos and iOS, applications use high DPI scaling that is an alternative to
     the traditional DPI scaling. In the traditional approach, the application is
     presented with an DPI value used to multiply font sizes, layouts, and so on.
     In the new approach, the operating system provides Qt with a scaling ratio
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index dc1c99036..8d788c70c 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -62,7 +62,7 @@
 
     \section1 Protocols and Support on Different Platforms
 
-    On OS X, and Microsoft Windows versions prior to Windows 2000,
+    On \macos, and Microsoft Windows versions prior to Windows 2000,
     there is nothing like complete session management for applications
     yet, i.e. no restoring of previous sessions. (Windows 2000 and XP
     provide "hibernation" where the entire memory is saved to disk and
@@ -112,7 +112,7 @@
 
     \section1 Testing and Debugging Session Management
 
-    Session management support on OS X and Windows is fairly limited
+    Session management support on \macos and Windows is fairly limited
     due to the lack of this functionality in the operating system
     itself. Simply shut the session down and verify that your application
     behaves as expected. It may be useful to launch another application,
diff --git a/doc/src/images/qtquickcontrols-example-gallery-android.png b/doc/src/images/qtquickcontrols-example-gallery-android.png
deleted file mode 100644
index 11ba2cc0c..000000000
--- a/doc/src/images/qtquickcontrols-example-gallery-android.png
+++ /dev/null
diff --git a/doc/src/images/qtquickcontrols-example-gallery-osx.png b/doc/src/images/qtquickcontrols-example-gallery-osx.png
deleted file mode 100644
index 492dc36e5..000000000
--- a/doc/src/images/qtquickcontrols-example-gallery-osx.png
+++ /dev/null
diff --git a/doc/src/images/qtquickcontrols2-material.png b/doc/src/images/qtquickcontrols2-material.png
new file mode 100644
index 000000000..2841c159c
--- /dev/null
+++ b/doc/src/images/qtquickcontrols2-material.png
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 19d0ad1d0..a56eabeab 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -112,7 +112,7 @@
     \li N'Ko
     \endlist
 
-    On OS X, the following languages are also supported:
+    On \macos, the following languages are also supported:
     \list
     \li Oriya
     \li Sinhala
@@ -354,10 +354,10 @@
         the Unicode Standard in the absence of higher-level protocols.
     \endlist
 
-    \section2 OS X
+    \section2 \macos
 
-    For details on OS X-specific translation, refer to the Qt for OS X issues
-    document \l{Qt for OS X - Specific Issues#Translating the Application Menu and Native Dialogs}{here}.
+    For details on \macos-specific translation, refer to the Qt for macOS issues
+    document \l{Qt for macOS - Specific Issues#Translating the Application Menu and Native Dialogs}{here}.
 
     \section1 Related Pages
 */
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 2159be833..f8ae37936 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -235,6 +235,48 @@
     See \c {qtbase/src/3rdparty/freebsd/strtoll.c} and
     \c {qtbase/src/3rdparty/freebsd/strtoull.c}
 
+    \section1 Google Type Traits
+
+    Changes to the original implementation:
+    \list
+    \li Move base types from template_util.h directly into qtypetraits.h
+    \li Use Qt macros for long long type differences on Windows.
+    \li Enclose in QtPrivate namespace.
+    \endlist
+
+    \badcode
+    Copyright (c) 2006, Google Inc.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+        * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following disclaimer
+    in the documentation and/or other materials provided with the
+    distribution.
+        * Neither the name of Google Inc. nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    \endcode
+
+    See \c {qtbase/src/corelib/global/qtypetraits.h}
+
     \section1 FreeType 2 (freetype) version 2.3.12
 
     \e{The FreeType project is a team of volunteers who develop free, portable
@@ -2181,21 +2223,6 @@
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     \hr
-    \section1 Drag and Drop
-
-    Copyright 1996 Daniel Dardailler.
-    Permission to use, copy, modify, distribute, and sell this software for any
-    purpose is hereby granted without fee, provided that the above copyright
-    notice appear in all copies and that both that copyright notice and this
-    permission notice appear in supporting documentation, and that the name of
-    Daniel Dardailler not be used in advertising or publicity pertaining to
-    distribution of the software without specific, written prior permission.
-    Daniel Dardailler makes no representations about the suitability of this
-    software for any purpose. It is provided "as is" without express or implied
-    warranty.
-    Modifications Copyright 1999 Matt Koss, under the same license as above.
-
-    \hr
     \section1 Valgrind:
 
     Copyright (C) 2000-2007 Julian Seward.  All rights reserved.
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index c15043954..323f14795 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \group licensing
+    \page licensing.html
     \title Qt Licensing
     \brief Information about licenses and licensing issues.
 
@@ -34,7 +34,7 @@
     the needs of our various users:
 
     \list
-      \li Qt licensed under \e commercial licenses are appropriate for
+      \li Qt licensed under \e commercial licenses is appropriate for
           development of proprietary/commercial software where you do not want
           to share any source code with third parties or otherwise cannot
           comply with the terms of the GNU LGPL version 3.
@@ -47,8 +47,8 @@
 
     \note Some specific parts (modules) of the Qt framework are not available
     under the GNU LGPL version 3, but under the
-    \l {GNU General Public License (GPL)} instead. See \l {Licenses Used in Qt}
-    for details.
+    \l {GNU General Public License (GPL)} instead. See
+    \l {All Modules#Qt Add-Ons}{Qt Modules} for details.
 
     \e {Qt documentation} is licensed under the terms of the \l{GNU Free
     Documentation License (FDL)} version 1.3, as published by the Free Software
@@ -64,748 +64,76 @@
     For further information and assistance about Qt licensing, contact our
     sales; see \l{http://www.qt.io/locations/} for contact details.
 
-    \section1 Licenses Used in Qt
-
-    The following table lists parts of Qt that incorporate code licensed under
-    licenses other than \l{GNU Lesser General Public License (LGPL)} or the
-    commercial license, as well as Qt modules that are only available under a
-    specific license or a version of a license.
-
-    \l{Third-Party Licenses Used in Qt}{Third-party licenses} used in libraries that
-    are supplied alongside Qt modules are also listed.
-
-    \note Cross-module dependencies are also described on a general level. All Qt
-    modules depend on \l{Qt Core}.
-
-    \table
-    \header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes
-
-    \row \li {1,30} Qt Core
-
-    \row \li \l{QSegfaultHandler Class}{QSegfaultHandler}
-         \li Parts of implementation of QSegfaultHandler class. \li BSD-style \li
-    \row \li \l{QUrl::fromUserInput}{QUrl} \li Implementation of QUrl::fromUserInput(). \li Modified BSD \li
-    \row \li \l{Contributions to the Cocoa Platform Plugin Files}{Cocoa Platform Plugin}
-         \li Specific parts of the Qt for OS X Cocoa port. \li BSD-style \li \l{Qt for OS X}
-    \row \li \l{The qtmain Library}{qtmain library}
-         \li A helper library for writing a cross-platform main() function on Windows. \li Modified BSD \li \l{Qt for Windows}
-    \row \li \l{Shift-JIS Text Codec}
-         \li A character encoding for Japanese. \li BSD-style\li
-    \row \li \l{ISO-2022-JP (JIS) Text Codec}
-         \li A widely used encoding for Japanese. \li BSD-style  \li
-    \row \li \l{EUC-JP Text Codec}
-         \li EUC-JP is a variable-width encoding used to represent the elements of three Japanese character set standards. \li BSD-style \li
-    \row \li \l{EUC-KR TextCodec}
-         \li Extended Unix Code (EUC) is a multibyte character encoding system used primarily for Japanese, Korean, and simplified Chinese. \li BSD-style \li
-    \row \li \l{GBK Text Codec}
-         \li GBK is an extension of the GB2312 character set for simplified Chinese characters, used mainland China. \li BSD-style \li
-    \row \li \l{Big5 Text Codec}
-         \li Big5, or BIG-5, is a Chinese character encoding method used for Traditional Chinese characters. \li BSD-style \li
-    \row \li \l{Big5-HKSCS Text Codec}
-         \li Big5-HKSCS is a Chinese character set with more than 4700 characters. \li BSD-style \li
-    \row \li \l{TSCII Text Codec}
-         \li The TSCII codec provides conversion to and from the Tamil TSCII encoding. \li BSD-style \li
-    \row \li \l{Stack-less Just-In-Time compiler}
-         \li A platform-independent JIT compiler. \li BSD \li
-    \row \li \l{Parts of the codecs implemented by Qt}
-         \li \li BSD \li
-    \row \li \l {Unicode}
-         \li Unicode character data. \li Permissive, GPL-compatible \li
-    \row \li \l {Macros for building Qt files}
-         \li Macros used in CMake files for building Qt. \li BSD \li
-    \row \li \l{The PCRE library}
-         \li The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5.
-         \li BSD-style \li
-
-    \row \li {4,1} \b{Third-party Licenses}
-
-    \row \li \l{Android GNU C++ Run-time Licensing}{Android C++ Run-time}
-         \li GNU C++ run-time library (libstdc++) for Android. \li GPLv3 with exception \li \l{Qt for Android}
-    \row \li \l{forkfd}
-         \li A tool to facilitate spawning sub-processes. \li MIT \li Unix systems
-    \row \li \l{FreeBSD strtoll and strtoull}
-         \li Functions for converting a string to long long integer. \li BSD \li
-    \row \li \l{V8 double/string conversion library}
-         \li Functions for converting between strings and doubles. \li BSD \li
-    \row \li \l {MD4 (md4.cpp and md4.h)}{MD4}
-         \li implements the MD4 message-digest algorithm. \li BSD \li
-    \row \li \l{MD5 (md5.cpp and md5.h)}{MD5}
-         \li implements the MD5 message-digest algorithm. \li BSD \li
-    \row \li \l {Mesa 3D Graphics Library}{Mesa llvmpipe}
-         \li Mesa llvmpipe software rasterizer backend (\c opengl32sw.dll) for Windows builds. \li MIT \li \l {Qt for Windows}
-    \row \li \l{SHA-1 (sha1.cpp)}{SHA-1}
-         \li implements the SHA-1 encryption algorithm. \li BSD \li
-    \row \li \l{SHA-3, originally known as Keccak}{SHA-3}
-         \li implements the SHA-3 encryption algorithm. \li BSD \li
-    \row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib}
-         \li zlib is a general purpose data compression library. \li BSD-style \li
-    \row \li \l{The Public Suffix List}
-         \li A list of all known public Internet suffixes. \li Mozilla Public License \li
-
-    \row \li {1,12} Qt Gui
-    \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
-         \li Internal class for key mapping. \li Custom, BSD-style \li \l {Qt for Linux/X11}
-    \row \li \l{qimage-legalese}{QImage}
-         \li Code used for smooth scaling in QImage::transformed(). \li BSD \li
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Other Licenses Used in Qt#FreeType}{FreeType}
-         \li Parts of FreeType project used in font rendering. \li GPLv2, FreeType Project License \li
-    \row \li \l{HarfBuzz (harfbuzz)}{HarfBuzz} \li OpenType layout engine. \li BSD-style \li
-    \row \li \l{FreeType 2 (freetype) version 2.3.12}{FreeType 2}
-         \li Parts of FreeType project used in font rendering. \li GPLv2, FreeType Project License \li
-    \row \li \l{PNG Reference Library (libpng) version 1.6.17}{PNG Reference Library}
-         \li A library for reducing the time and effort it takes to support the PNG format. \li BSD-style \li
-    \row \li \l{Pixman (pixman) version 0.17.11}{Pixman}
-         \li Pixman is a library that provides low-level pixel manipulation features such as image compositing and trapezoid rasterization. \li BSD-style \li
-    \row \li \l{Drag and Drop}
-         \li Allows users to transfer information between and within applications. \li BSD-style \li
-    \row \li \l{ANGLE (angle)}{ANGLE}
-         \li Opensource project to map OpenGL ES API calls to DirectX API. \li BSD-style \li \l {Qt for Windows}
-    \row \li \li \li \li
-
-    \row \li {1,6} Qt Location
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Poly2Tri}
-         \li Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library. \li BSD-style \li
-    \row \li \l{Clipper}
-         \li Clipper is a freeware library for clipping and offsetting lines and polygons. \li BSD-style \li
-    \row \li \l{Clip2Tri}
-         \li Clip2Tri is an open source polygon triangulation library based on Poly2Tri. \li MIT  \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Bluetooth
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{BlueZ}{BlueZ}
-         \li BlueZ is a Bluetooth stack for Linux based operating systems
-         \li GPL v2
-         \li Used by sdpscanner tool which is called by \l {Qt Bluetooth} on BlueZ 5 systems.
-             Qt applications do \e not link to GPL code.
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Multimedia
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{FFTReal version 2.11}{FFTReal}
-         \li Fast Fourier transform of real-valued arrays. \li LGPL \li (Used in example code).
-    \row \li \li \li \li
-
-    \row \li {1,6} Qt Canvas 3D
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{three.js} \li JavaScript 3D library \li MIT \li (Used in example code)
-    \row \li \l{Three.js Loader}
-         \li A parser for loading 3D models from JSON data structures.
-         \li MIT \li (Used in example code).
-    \row \li \l{gl-matrix.js version 2.2.2}{gl-matrix.js}
-         \li High performance matrix and vector operations
-         \li MIT \li (Used in example code).
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt SVG
-
-    \row \li \l{Qt SVG License Information}
-         \li Parts of code for arc handling in Qt SVG module. \li BSD-style \li Depends on Qt Gui, Qt Widgets
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt QML
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{JavaScriptCore Macro Assembler}
-         \li The assembly code generated use by the JIT.
-         \li BSD-style \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Quick
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Easing Equations}
-         \li Easing Equations is a collection of swappable functions that add flavor to motion. \li BSD-style \li Depends on Qt QML, Qt Gui, Qt Network
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Quick Controls
-    \row \li \l {Native Style for Android} \li \li Apache License 2.0 \li \l {Qt for Android}
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,6} Qt Script
-         \li \li \li \li (Provided for Qt 4 compatibility)
-
-    \row \li \l{V8 benchmark tests}
-         \li V8 benchmark tests used in Qt Script. \li BSD-style \li
-    \row \li \l{Sunspider benchmark tests}
-         \li Sunspider benchmark tests used in Qt Script. \li BSD-style \li
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{JavaScriptCore}
-         \li \li LGPL v2 \li
-    \row \li \li \li \li
-
-    \row \li {1,8} Qt Test
-
-    \row \li \l{Other Licenses Used in Qt#Testlib}{Testlib}
-         \li Parts of implementation of Qt Test library. \li BSD, MIT \li
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Valgrind}
-         \li A code analysis tool for detecting memory leaks. \li GPL v2 \li
-    \row \li \l {valgrind.h specific license}
-         \li \li BSD-style \li
-    \row \li \l{Callgrind}
-         \li A performance profiling tool. \li GPL v2 \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Print Support
-         \li \li \li \li Depends on Qt Gui and Qt Widgets
-
-    \row \li \l{Notes about PDF Licensing}{PDF Licensing}
-         \li Notes about PDF Licensing. \li \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Wayland
-
-    \row \li \l {Wayland Protocol} \li \li MIT \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt WebEngine
-
-    \row \li \l[QtWebEngineCore]{Qt WebEngine Core}
-         \li \li LGPL v3 or\br GPL v2 + Qt commercial license \li
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l {Qt WebEngine Licensing}{Chromium} \li Third-party licenses in Chromium
-         \li LGPLv2.1, BSD, BSL, Apache, APSL, MIT, MPL, others
-         \li See \l {Qt WebEngine Licensing} for details.
-
-    \row \li {1,4} Qt Designer
-
-    \row \li \l{Qt Designer License Information}
-         \li Implementation of the recursive shadow casting algorithm in Qt Designer. \li BSD (MIT) \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt Creator
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Botan version 1.8.8}{Botan}
-         \li A C++ crypto library used in Qt Creator. \li BSD \li
-    \row \li \li \li \li
-
-    \row \li {1,6} Qt Image Formats
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{JasPer (libjasper) version 2.0}{JasPer}
-         \li A collection of software for the coding and manipulation of images. \li BSD-style \li
-    \row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF}
-         \li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li
-    \row \li \l{MNG Library (libmng) version 1.0.10}{MNG}
-         \li Support decoding and displaying of MNG format image files. \li BSD-style \li
-    \row \li \l{WebP (libwebp) version 0.4.3}{WebP}
-         \li Support decoding and displaying of WebP format image files. \li BSD-style \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt SQL
-
-    \row \li \l{SQLite (sqlite) version 3.8.5.0}{SQLite}
-         \li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine. \li BSD-style \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt XML Patterns
-
-    \row \li \l {Bison Parser 2.3a}{Bison Parser}
-         \li Bison is a parser generator. \li GPL with exception \li Depends on Qt Network
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,4} Qt 3D
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l {assimp 3.1.1}{assimp}
-         \li Open Asset Import Library \li BSD \li
-    \row \li \li \li \li
-
-    \row \li {1,10} Plugins
-
-    \row \li \l{JPEG Software (libjpeg) version 8c}{JPEG}
-         \li C software to implement JPEG image compression and decompression. \li BSD-style \li
-    \row \li \l{IAccessible2 IDL Specification}{IAccessible2}
-         \li An accessibility API for Microsoft Windows applications. \li BSD \li \l {Qt for Windows}
-    \row \li \l{Cycle}
-         \li A CPU tick counter. \li MIT \li
-    \row \li \l{callgrind.h specific license}
-         \li \li BSD-style \li
-    \row \li \l{Third-Party Licenses Used in Qt#xcb}{xcb}
-         \li A C language binding for the X Window System. \li BSD-style \li \l {Qt for Linux/X11}
-    \row \li \l{at-spi and at-spi2}
-         \li A toolkit-neutral way of providing accessibility facilities in application. \li LGPL \li \l {Qt for Linux/X11}
-    \row \li \l{Third-Party Licenses Used in Qt#xkbcommon}{xkbcommon}
-         \li Keymap handling library for toolkits and window systems. \li BSD-style \li \l {Qt for Linux/X11}
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,3} Qt Tools
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Clucene Core Library}
-         \li A high-performance, full-featured text search engine written in C++. \li LGPL/Apache \li
-
-    \endtable
-
-    The following modules are available under the GNU GPL version 3 and commercial licenses:
-
-    \table
-    \header \li Qt Module/Tool \li Component \li Description \li License Type
-
-    \row \li {1,2} Qt Charts \li \li \li GPLv3 or commercial license
-    \row \li \li \li
-
-    \row \li {1,2} Qt Data Visualization \li \li \li GPLv3 or commercial license
-    \row \li \li \li
-
-    \row \li {1,2} Qt Purchasing \li \li \li GPLv3 or commercial license
-    \row \li \li \li
-
-    \row \li {1,6} Qt Virtual Keyboard \li \li \li GPLv3 or commercial license
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{Lipi Toolkit (LipiTk)}{Lipi Toolkit}
-         \li An open source toolkit for online Handwriting  Recognition (HWR).
-         \li MIT-Style License
-
-    \row \li \l{OpenWnn}
-         \li A Japanese IME
-         \li Apache License
-
-    \row \li \l{Pinyin}
-         \li An IME for Standard Chinese input.
-         \li Apache License
-
-    \row \li \l{Traditional Chinese IME (tcime)}{tcime}
-         \li A traditional Chinese IME.
-         \li Apache License
-
-    \row \li {1,6} Qt Quick 2D Renderer \li \li \li GPLv3 or commercial license
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{EGL 1.5 Headers}
-         \li These headers are based on EGL 1.5 specification.
-         \li MIT License
-
-    \row \li \l{OpenGL ES 2.0 Headers}
-         \li These headers are based on OpenGL ES 2.0 specification.
-         \li MIT and SGI License
-
-    \row \li \l{OpenGL ES 3.1 Headers}
-         \li These headers are based on OpenGL ES 3.1 specification.
-         \li MIT and SGI License
-
-    \row \li \l{OpenKODE Core 1.0 Header}
-         \li The header is based on OpenKODE Core 1.0 specification.
-         \li MIT License
-
-    \row \li \l{V8 double/string conversion library}
-         \li String conversion routines for IEEE doubles.
-         \li BSD-style \li
-
-    \endtable
-    \section1 Additional information
-
-    The documents below list related documents, such as information about Trademark and other
-    licenses used in parts of Qt.
-*/
-
-
-/*!
-    \page licenses.html
-    \title Other Licenses Used in Qt
-    \brief Information about other licenses used for Qt components and third-party code.
-
-    Qt contains some code that is not provided under the
-    \l{GNU Lesser General Public License (LGPL)} or the
-    \l{Qt Commercial License}, but rather under
-    specific licenses from the original authors.
-    This page lists the licenses used, names the authors, and links
-    to the places where it is used.
-
-    For an overview of Qt licensing and a list of all third-party code in Qt,
-    see \l {Qt Licensing}.
-
-    The Qt Company gratefully acknowledges these and other contributions
-    to Qt. We recommend that programs that use Qt also acknowledge
-    these contributions, and quote these license statements in an
-    appendix to the documentation.
-
-    See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
-
-    \section1 Native Style for Android
-
-    \legalese
-    Copyright (C) 2005 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    \endlegalese
-
-    \list
-        \li \c {src/3rdparty/android/extract.h}
-    \endlist
-
-    \section1 QSegfaultHandler Class
-
-    Copyright (c) 1998 by Bjorn Reese <breese@imada.ou.dk>
-
-    Permission to use, copy, modify, and distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
-    CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
-
-    \list
-    \li Parts of the QSegfaultHandler class in
-        \c {qtbase/src/corelib/kernel/qcrashhandler.cpp}.
-    \endlist
-
-    \section1 FreeType
-
-    Parts of the FreeType projects have been modified and put into Qt
-    for use in the painting subsystem. These files are ftraster.h,
-    ftraster.c, ftgrays.h and ftgrays.c. The following modifications
-    has been made to these files:
-
-    \list
-    \li Renamed FT_ and ft_ symbols to QT_FT_ and qt_ft_ to avoid name
-    conflicts in \c{qrasterdefs_p.h}.
-    \li Removed parts of code not relevant when compiled with
-    _STANDALONE_ defined.
-    \li Changed behavior in \c{ftraster.c} to follow X polygon filling
-    rules.
-    \li Implemented support in \c{ftraster.c} for winding / odd even
-    polygon fill rules.
-    \li Replaced bitmap generation with span generation in \c{ftraster.c}.
-    \li Renamed \c{ftraster.h} as \c{qblackraster_p.h}.
-    \li Renamed \c{ftraster.c} as \c{qblackraster.c}.
-    \li Renamed \c{ftgrays.h} as \c{qgrayraster_p.h}.
-    \li Renamed \c{ftgrays.c} as \c{qgrayraster.c}.
-    \endlist
-
-    See \c qtbase/src/3rdparty/freetype/docs/FTL.txt and \c
-    qtbase/src/3rdparty/freetype/docs/GPL.txt for license details.
-
-    \section1 QKeyMapper class on X11 platforms
-
-    Copyright 1985, 1987, 1998  The Open Group
-
-    Permission to use, copy, modify, distribute, and sell this software and its
-    documentation for any purpose is hereby granted without fee, provided that
-    the above copyright notice appear in all copies and that both that
-    copyright notice and this permission notice appear in supporting
-    documentation.
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-    OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Except as contained in this notice, the name of The Open Group shall not be
-    used in advertising or otherwise to promote the sale, use or other dealings
-    in this Software without prior written authorization from The Open Group.
-
-    \list
-    \li Parts of the internal QKeyMapper class on X11 platforms
-    \endlist
-
-    \section1 QUrl::fromUserInput
-
-    Copyright (C) Research In Motion Limited 2009. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:\br
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.\br
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.\br
-      * Neither the name of Research In Motion Limited nor the
-        contributors may be used to endorse or promote products derived
-        derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY Research In Motion Limited ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL Research In Motion Limited BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li qtbase/src/corelib/io/qurl.cpp
-    \endlist
-
-    \section1 Parts of the codecs implemented by Qt
-
-    Copyright (C) 1999 Serika Kurusugawa, All rights reserved.\br
-    Copyright (C) 1999-2000 Mizi Research Inc. All rights reserved.\br
-    Copyright (C) 2004, 2005 Daniel M. Duley\br
-    Copyright (C) 2000  Ming-Che Chuang\br
-    Copyright (C) 2001, 2002  James Su, Turbolinux Inc.\br
-    Copyright (C) 2002  WU Yi, HancomLinux Inc.\br
-    Copyright (C) 2001, 2002  Anthony Fok, ThizLinux Laboratory Ltd.\br
-    Copyright (c) 2000 Hans Petter Bieker.  All rights reserved.\br
-    Copyright (C) 2001, 2002 ThizLinux Laboratory Ltd.\br
-    Copyright (C) 2001, 2002 Turbolinux, Inc.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-    \list
-    \li Parts of the codecs implemented by Qt
-    \endlist
-
-    \section1 Testlib
-
-    This file is part of Valgrind, a dynamic binary instrumentation
-    framework.
-
-    Copyright (C) 2000-2007 Julian Seward.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-
-    2. The origin of this software must not be misrepresented; you must
-       not claim that you wrote the original software.  If you use this
-       software in a product, an acknowledgment in the product
-       documentation would be appreciated but is not required.
-
-    3. Altered source versions must be plainly marked as such, and must
-       not be misrepresented as being the original software.
-
-    4. The name of the author may not be used to endorse or promote
-       products derived from this software without specific prior written
-       permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-    OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li valgrind_p.h in qtbase/src/testlib/3rdparty
-    \endlist
-
-    \hr
-
-    Copyright (c) 2003, 2006 Matteo Frigo
-    Copyright (c) 2003, 2006 Massachusetts Institute of Technology
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
+    \section1 Third-party Licenses Used in Qt
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    The following page documents the third-party open-source licenses used
+    in different parts of Qt:
 
     \list
-    \li cycle_p.h in qtbase/src/testlib/3rdparty
+        \li \l {Licenses Used in Qt}
     \endlist
+*/
 
-    \hr
-
-    This file is part of callgrind, a valgrind tool for cache simulation
-    and call tree tracing.
-
-    Copyright (C) 2003-2007 Josef Weidendorfer.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-
-    2. The origin of this software must not be misrepresented; you must
-       not claim that you wrote the original software.  If you use this
-       software in a product, an acknowledgment in the product
-       documentation would be appreciated but is not required.
-
-    3. Altered source versions must be plainly marked as such, and must
-       not be misrepresented as being the original software.
-
-    4. The name of the author may not be used to endorse or promote
-       products derived from this software without specific prior written
-       permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-    OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*!
+    \page licenses-used-in-qt.html
+    \title Licenses Used in Qt
+    \brief Information about other licenses and third-party code used in Qt.
 
-    \list
-    \li callgrind_p.h in qtbase/src/testlib/3rdparty
-    \endlist
+    Qt contains some code that is not provided under the
+    \l{GNU Lesser General Public License (LGPL)} or the
+    \l{Qt Commercial License}, but rather under specific licenses from the
+    original authors.
 
-    \section1 ANGLE
+    The Qt Company gratefully acknowledges these and other contributions to Qt.
+    We recommend that programs that use Qt also acknowledge these contributions,
+    and quote these license statements in an appendix to the documentation.
 
-    Copyright (C) 2002-2013 The ANGLE Project Authors.
-    All rights reserved.
+    \note You only need to comply with (and acknowledge) the licenses of the
+          third-party components that you are using with your application.
+          Click the name of the component to see the licensing details.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
+    The following table lists parts (modules) of Qt that incorporate code licensed
+    under third-party open-source licenses:
 
-        Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
+    \div {class="fixed"}
+    \generatelist annotatedattributions
 
-        Redistributions in binary form must reproduce the above
-        copyright notice, this list of conditions and the following
-        disclaimer in the documentation and/or other materials provided
-        with the distribution.
+    \raw HTML
+    <h2 id="additional-information">Additional Information</h2>
+    \endraw
 
-        Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-        Ltd., nor the names of their contributors may be used to endorse
-        or promote products derived from this software without specific
-        prior written permission.
+    The following table lists related documents, such as information about Trademarks
+    and other licenses used in parts of Qt.
 
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
+    \annotatedlist licensing
+    \enddiv
+*/
 
-    \list
-    \li ANGLE library in qtbase/src/3rdparty/angle
-    \endlist
+/*!
+    \page qt-attribution-cmake-macros.html
+    \title Macros for Building with CMake
+    \ingroup licensing
+    \brief BSD 3-clause "New" or "Revised" License
 
-    \section1 Unicode
-
-    Copyright (c) 1991-2009 Unicode, Inc. All rights reserved.
-    Distributed under the Terms of Use in
-    http://www.unicode.org/copyright.html.
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of the Unicode data files and any associated
-    documentation (the "Data Files") or Unicode software and any
-    associated documentation (the "Software") to deal in the Data
-    Files or Software without restriction, including without
-    limitation the rights to use, copy, modify, merge, publish,
-    distribute, and/or sell copies of the Data Files or Software,
-    and to permit persons to whom the Data Files or Software are
-    furnished to do so, provided that (a) the above copyright
-    notice(s) and this permission notice appear with all copies
-    of the Data Files or Software, (b) both the above copyright
-    notice(s) and this permission notice appear in associated
-    documentation, and (c) there is clear notice in each modified
-    Data File or in the Software as well as in the documentation
-    associated with the Data File(s) or Software that the data or
-    software has been modified.
-
-    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT
-    WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-    LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-    PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED
-    IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
-    OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-    FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-    CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES
-    OR SOFTWARE.
-
-    Except as contained in this notice, the name of a copyright
-    holder shall not be used in advertising or otherwise to promote
-    the sale, use or other dealings in these Data Files or Software
-    without prior written authorization of the copyright holder.
+    The following files contain macros that enable users to build Qt-based
+    projects using CMake.
 
     \list
-    \li Included in \c{util/unicode/data},
-    \c{tests/auto/qtextboundaryfinder/data} and
-    \c{tests/auto/qchar}
-    \li Parts of the \l makeqpf tool
+        \li \c qtbase/src/corelib/Qt5CoreMacros.cmake
+        \li \c qtbase/src/dbus/Qt5DBusMacros.cmake
+        \li \c qtbase/src/widgets/Qt5WidgetsMacros.cmake
+        \li \c qttools/src/linguist/Qt5LinguistToolsMacros.cmake
     \endlist
 
-    \section1 Macros for building Qt files
-
+    \badcode
     Copyright 2005-2011 Kitware, Inc.
     All rights reserved.
+    \endcode
 
+    \l {https://spdx.org/licenses/BSD-3-Clause.html}
+       {BSD 3-clause "New" or "Revised" License}
+
+    \badcode
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
@@ -832,152 +160,46 @@
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    \endcode
+*/
 
+/*!
+    \page qt-attribution-llvmpipe.html
+    \title Mesa llvmpipe
+    \ingroup licensing
+    \brief MIT License
 
-    \list
-    \li qtbase/src/corelib/Qt5CoreMacros.cmake
-    \li qtbase/src/dbus/Qt5DBusMacros.cmake
-    \li qtbase/src/widgets/Qt5WidgetsMacros.cmake
-    \li qttools/src/linguist/Qt5LinguistToolsMacros.cmake
-    \endlist
-
-    \section1 The PCRE library
-
-    Copyright (c) 1997-2015 University of Cambridge\br
-    All rights reserved.
-
-    Copyright(c) 2009-2015 Zoltan Herczeg\br
-    All rights reserved.
-
-    Copyright (c) 2007-2012, Google Inc.
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-
-        * Neither the name of the University of Cambridge nor the name of Google
-          Inc. nor the names of their contributors may be used to endorse or
-          promote products derived from this software without specific prior
-          written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li The PCRE library in \c{qtbase/src/3rdparty/pcre}
-    \endlist
-
-    \hr
-    \b Licenses that apply to tests.
-    \hr
-
-    The following licenses apply to some tests.
-    These are not by default shipped with Qt but part of the tests directory of a source checkout.
-
-    \section1 V8 benchmark tests
-
-    Copyright 2000 World Wide Web Consortium, (Massachusetts
-    Institute of Technology, Institut National de Recherche en
-    Informatique et en Automatique, Keio University). All Rights
-    Reserved.
-    Copyright 2008 Google Inc. All Rights Reserved.
-    Copyright 2006-2008 the V8 project authors. All rights reserved.
-    JavaScript MD5 Copyright (c) 1998 - 2009, Paul Johnston & Contributors
-
-    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    - Redistributions of works must retain the original copyright notice, this list of
-    conditions and the following disclaimer.
-    - Redistributions in binary form must reproduce the original copyright notice, this
-    list of conditions and the following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-    - Neither the name of the copyright holder nor the names of the contributors may be used to
-    endorse or promote products derived from this work without specific prior written
-    permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li \c{tests/benchmarks/script/v8/tests/richards.js}
-    \endlist
-
-    \section1 Sunspider benchmark tests
-
-    Copyright (C) 2007 Apple Inc.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li \c{tests/benchmarks/script/sunspider/tests/3d-morph.js},
-       \c{tests/benchmarks/script/sunspider/tests/3d-raytrace.js},
-       \c{tests/benchmarks/script/sunspider/tests/bitops-bitwise-and.js} and
-       \c{tests/benchmarks/script/sunspider/tests/string-tagcloud.js}
-    \endlist
-
-    \hr
+    Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.
+    The llvmpipe software renderer allows running of OpenGL applications without any
+    hardware / driver support.
 
-    Copyright (C) Rich Moore.  All rights reserved.
+    Shipped as part of the binary packages for Windows (opengl32sw.dll).
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+    \badcode
+    Copyright (C) 1999-2007  Brian Paul.
+    \endcode
 
-    THIS SOFTWARE IS PROVIDED BY CONTRIBUTORS ``AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    \l {https://spdx.org/licenses/MIT.html}
+       {MIT License}
 
+    \badcode
+    Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
 
-    \list
-    \li \c{benchmarks/script/sunspider/tests/math-cordic.js}
-    \endlist
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
 
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    \endcode
 */
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 979833929..485385b7b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -38,25 +38,34 @@
     \page qtmain.html
     \title The qtmain Library
     \ingroup licensing
-    \brief Describes the use and license of the qtmain helper library.
+    \brief Commercial and \l{BSD 3-clause "New" or "Revised" License}.
 
     qtmain is a helper library that enables the developer to write a
     cross-platform main() function on Windows.
-    If you do not use \l qmake or other build tools such as \l{CMake Manual}{CMake}, then you
-    need to link against the \c qtmain library.
+    If you do not use \l qmake or other build tools such as
+    \l{CMake Manual}{CMake}, then you need to link against the
+    \c qtmain library.
 
-    \section1 License Information
+    The qtmain library is statically linked with the application.
+    To avoid issues with static linking and the
+    \l{GNU Lesser General Public License (LGPL)},
+    it is licensed both under the commercial licenses,
+    and the \l{BSD 3-clause "New" or "Revised" License}.
 
-    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
-    the \l{GNU Lesser General Public License (LGPL)}, or the
-    \l{Qt Commercial License}. Instead, it is distributed under
-    the following license.
+    \section1 License Information
 
-    \legalese
-    Copyright (C) 2015 The Qt Company Ltd.\br
-    Contact: http://www.qt.io/licensing/
+    \badcode
+    Commercial License Usage
+    Licensees holding valid commercial Qt licenses may use this file in
+    accordance with the commercial license agreement provided with the
+    Software or, alternatively, in accordance with the terms contained in
+    a written agreement between you and The Qt Company. For licensing terms
+    and conditions see https://www.qt.io/terms-conditions. For further
+    information use the contact form at https://www.qt.io/contact-us.
 
-    You may use this file under the terms of the BSD license as follows:
+    BSD License Usage
+    Alternatively, you may use this file under the terms of the BSD license
+    as follows:
 
     "Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -83,5 +92,5 @@
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-    \endlegalese
+    \endcode
 */
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index 645533224..3c9559c0f 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -187,6 +187,23 @@
   application type. The special cursor implementations, such as the KMS/DRM
   backend's hardware cursor, may not support rotation.
 
+  \li \c {QT_QPA_EGLFS_FORCEVSYNC} - When set, \c eglfs requests
+  \c FBIO_WAITFORVSYNC on the framebuffer device after each call to
+  eglSwapBuffers(). This is only relevant for backends relying on the legacy
+  \c fbdev subsystem of Linux. Normally, with a default swap interval of 1, Qt
+  assumes that calling eglSwapBuffers() takes care of vsync; if it doesn't (for
+  example, due to driver bugs), try setting \c QT_QPA_EGLFS_FORCEVSYNC to a
+  non-zero value.
+
+  \li \c {QT_QPA_EGLFS_FORCE888} - When set, the red, green, and blue color
+  channel sizes are ignored whenever creating a new context, window or offscreen
+  surface. Instead, the plugin requests a configuration with 8 bits per
+  channel. This can be helpful on devices where configurations with less than 32
+  or 24 bits per pixel (for example, 5-6-5 or 4-4-4) are chosen by default but
+  are known not to be ideal, for example, due to banding effects. Instead of
+  changing application code, this variable provides an easier shortcut to force
+  24 or 32 bpp configurations.
+
   \endlist
 
   In addition, the following - less commonly used - variables are
@@ -219,18 +236,6 @@
   0 will disable blocking on swap, resulting in running as fast as possible
   without any synchronization.
 
-  \li \c {QT_QPA_EGLFS_FORCEVSYNC} - When set, \c eglfs requests
-  \c FBIO_WAITFORVSYNC on the framebuffer device.
-
-  \li \c {QT_QPA_EGLFS_FORCE888} - When set, the red, green, and blue color
-  channel sizes are ignored whenever creating a new context, window or offscreen
-  surface. Instead, the plugin requests a configuration with 8 bits per
-  channel. This can be helpful on devices where configurations with less than 32
-  or 24 bits per pixel are chosen by default but are known to be not suitable,
-  for example, due to banding effects. Instead of changing all the applications,
-  this variable provides an easier shortcut to force 24/32 bpp configurations
-  for a given device.
-
   \li \c {QT_QPA_EGLFS_DEBUG} - When set, some debugging information is printed
   on the debug output. For example, the input QSurfaceFormat and the properties
   of the chosen EGL configuration are printed while creating a new
@@ -360,11 +365,14 @@
 
   Parameters like the device node name can be set in the environment variables
   \c QT_QPA_EVDEV_MOUSE_PARAMETERS, \c QT_QPA_EVDEV_KEYBOARD_PARAMETERS and
-  \c QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS. Additionally, the built-in input handlers
-  can be disabled by setting \c QT_QPA_EGLFS_DISABLE_INPUT or
-  \c QT_QPA_FB_DISABLE_INPUT to \c 1. On some touch screens the coordinates must
-  be rotated, which is done by setting
-  \c QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS to \c {rotate=180}.
+  \c QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS. Separate the entries with colons.  These
+  parameters act as an alternative to passing the settings in the \c{-plugin}
+  command-line argument, and with some backends they are essential: eglfs and
+  linuxfb use built-in input handlers so there is no separate \c {-plugin}
+  argument in use.
+
+  Additionally, the built-in input handlers can be disabled by setting
+  \c QT_QPA_EGLFS_DISABLE_INPUT or \c QT_QPA_FB_DISABLE_INPUT to \c 1.
 
   \section2 Mouse
 
@@ -379,6 +387,29 @@
   configure time). This allows connecting or disconnecting an input device while
   the application is running.
 
+  The \e evdev mouse handler supports the following extra parameters:
+
+  \list
+
+  \li \c {/dev/input/...} - Specifies the name of the input device. When not
+  given, Qt looks for a suitable device either via \e libudev or by walking
+  through the available nodes.
+
+  \li \c nocompress - By default, input events that do not lead to changing the
+  position compared to the last Qt mouse event are compressed; a new Qt mouse
+  event is sent only after a change in the position or button state.  This can
+  be disabled by setting the \c nocompress parameter.
+
+  \li \c dejitter - Specifies a jitter limit. By default dejittering is disabled.
+
+  \li \c grab - When 1, Qt will grab the device for exclusive use.
+
+  \li \c abs - Some touchscreens report absolute coordinates and cannot be
+  differentiated from touchpads.  In this special situation pass \c abs to
+  indicate that the device is using absolute events.
+
+  \endlist
+
   \section2 Keyboard
 
   The \e evdev keyboard handler supports the following extra parameters:
@@ -474,6 +505,28 @@
   supports single touch only, as opposed to \c evdevtouch which generates true
   multi-touch QTouchEvent events too.
 
+  The \e evdev touch handler supports the following extra parameters:
+
+  \list
+
+  \li \c {/dev/input/...} - Specifies the name of the input device. When not
+  given, Qt looks for a suitable device either via \e libudev or by walking
+  through the available nodes.
+
+  \li \c rotate - On some touch screens the coordinates must be rotated, which
+  is done by setting \c rotate to 90, 180, or 270.
+
+  \li \c invertx and \c inverty - To invert the X or Y coordinates in the input
+  events, pass \c invertx or \c inverty.
+
+  \endlist
+
+  For example, doing \c{export
+  QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event5:rotate=180} before
+  launching applications results in an explicitly specified touch device and
+  flipping the coordinates - useful when the orientation of the actual
+  screen and the touch screen do not match.
+
   \section2 Pen-based tablets
 
   The \c evdevtablet plugin provides basic support for Wacom and similar,
@@ -631,6 +684,28 @@
   resolution, otherwise elements like the mouse cursor may behave in unexpected
   ways when entering areas that only exist on one given screen.
 
+  When \c virtualIndex is not sufficient, the property \c virtualPos can be used
+  to explicitly specify the top-left position of the screen in question. Taking
+  the previous example and assuming a resolution of 1080p for HDMI1, the
+  following places a second HDMI-based screen below the first one:
+
+  \badcode
+    {
+       ...
+      "outputs": [
+        ...
+        {
+          "name": "HDMI2",
+          "virtualPos": "0, 1080"
+        }
+      ]
+    }
+  \endcode
+
+  \note Avoid such configurations when mouse support is desired. The mouse
+  cursor's behavior may be unexpected with non-linear layouts. Touch should
+  present no issues however.
+
   In some cases the automatic querying of the physical screen size via DRM may
   fail. Normally the \c QT_QPA_EGLFS_PHYSICAL_WIDTH and
   \c QT_QPA_EGLFS_PHYSICAL_HEIGHT environment variable would be used to provide the
@@ -720,8 +795,7 @@
   \c QT_QPA_EGLFS_KMS_CONFIG and described in the previous sections. When a
   \c touchDevice property is present in an element of the \c outputs array, the
   value is treated as a device node and the touch device is associated with the
-  display output in question. Note that this can only function when all elements
-  in the \c outputs array have an explicit \c virtualIndex.
+  display output in question.
 
   For example, assuming our touchscreen has a device node of /dev/input/event5
   and is a touchscreen integrated into the monitor connected via HDMI as the
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index bbb20561a..aa460c89a 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -42,15 +42,14 @@
     using either Xcode or Qt Creator. We will look at that in more
     detail in the next section.
 
-    The minimum deployment target for Qt applications is iOS 5.0. Qt
-    then supports the following devices (iOS might need to be upgraded
-    on some devices).
+    The minimum deployment target for Qt applications is specified in
+    \l {Supported Platforms}. Qt then supports the following device types
+    (iOS might need to be upgraded on some devices).
 
     \list
-        \li iPhone 3GS and later
-        \li iPod Touch third and later generations
-        \li iPad 2 and later
-        \li iPad Mini
+        \li iPhone
+        \li iPod Touch
+        \li iPad
     \endlist
 
     \section2 Setting Up the Development Environment
@@ -63,7 +62,7 @@
 
     \note As \l{Xcode5Req}{required by Apple}, you should always use the latest
     Xcode version when building your applications for the App Store.
-    In practice this means you also need the latest version of OS X to develop
+    In practice this means you also need the latest version of \macos to develop
     iOS apps with Qt, due to Xcode's system requirements.
 
     For running Qt applications in the simulator that comes with Xcode,
@@ -268,7 +267,7 @@
     \section1 Deployment
 
     Developing, building, running, and debugging a Qt for iOS application can all be done
-    with Qt Creator on OS X. The toolchain is provided by Apple's Xcode,
+    with Qt Creator on \macos. The toolchain is provided by Apple's Xcode,
     and running qmake on a project targeted for iOS will also generate an
     Xcode project file (.xcodeproj), with initial application settings. As Qt
     Creator does not provide an interface for managing all of the settings specific
@@ -279,7 +278,7 @@
     \target Info.plist
     \section2 Information Property List Files
 
-    Information property list file (Info.plist) on iOS and OS X is used for configuring
+    Information property list file (Info.plist) on iOS and \macos is used for configuring
     an application bundle. These configuration settings include:
 
     \list
@@ -338,8 +337,8 @@
     To support all resolutions and devices, several images should be created.
     A detailed list of what is required is available at \l {https://developer.apple.com/library/ios/qa/qa1686/_index.html}{Icon files}.
     The filename is not important, but the actual pixel size is.
-    Just a few icons are required, especially if one does not support iOS 6.1 or earlier.
-    However, to support both iPhone and iPad, and iOS 6.1 or earlier, the following images
+    Just a few icons are required.
+    However, to support both iPhone and iPad, the following images
     are required:
 
     \list
@@ -562,7 +561,7 @@
     Qt Creator does not provide an interface for managing all of the settings in an Xcode project configuration.
 
     The application should be tested on a variety of iOS versions and devices, depending on what
-    it's targeted to support. The minimum deployment target for Qt applications is iOS 5.0.
+    it's targeted to support. The minimum deployment target for Qt applications is iOS 7.0.
 
     The actual publishing process involves creating a distribution certificate and a provision profile,
     creating a signed archive of your application, and running a set of validation tests on it.
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 86d49d824..fdd9f3c9e 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -316,17 +316,13 @@
 
     \section1 OpenGL Dependencies
 
-    The configure script will autodetect if OpenGL headers and libraries are
-    installed on your system, and if so, it will include the \l{Qt OpenGL} module
-    in the Qt library.
+    Configure attempts to automatically detect OpenGL ES 2.0, or later, or
+    regular desktop OpenGL. You can disable OpenGL support by using the
+    \c -no-opengl option.
 
-    If your OpenGL headers or libraries are placed in a non-standard directory,
-    you may need to change the \c QMAKE_INCDIR_OPENGL and/or
-    \c QMAKE_LIBDIR_OPENGL in the config file for your system.
-
-    The QGL documentation assumes that you are familiar with OpenGL
-    programming. If you're new to the subject a good starting point is
-    \l{http://www.opengl.org/}.
+    \note The Qt OpenGL module (which contains classes that start with \e QGL)
+    has been deprecated in favor of the \l{Qt GUI} module (which contains
+    classes that start with \e QOpenGL).
 
     \section1 Multimedia Dependencies
 
@@ -359,11 +355,11 @@
     Qt for X11 has some requirements that are given in more detail
     in the \l{Qt for X11 Requirements} document.
 
-    \section1 Step 1: Installing the License File (Commercial Editions Only)
-        If you have the commercial edition of Qt, install your license
-        file as \c{$HOME/.qt-license}.
+    \section1 Step 1: Installing the License File (Commercially Licensed Qt Only)
 
-        For the open source version you do not need a license file.
+        If you have a commercial Qt license, download the license file
+        from your \l {Qt Account} Web portal and save it as
+        \c{$HOME/.qt-license}.
 
     \section1 Step 2: Unpacking the Archive
         Unpack the archive if you have not done so already. For example,
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index 234939510..f57b300ab 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -27,15 +27,17 @@
 
 /*!
     \page osx.html
-    \title Qt for OS X
-    \brief Platform support for OS X.
+    \title Qt for macOS
+    \brief Platform support for \macos.
     \ingroup supportedplatform
+    \keyword Qt for OS X
 
-    OS X is a UNIX platform and behaves similarly to other Unix-like
-    platforms. The main difference is that X11 is not used as the windowing
-    system. Instead, OS X uses its own native windowing system that is
-    accessible through the Cocoa API. Application development on OS X is
-    done using Xcode, which is available from \l{https://developer.apple.com/xcode/}.
+    \macos (previously known as OS X or Mac OS X) is a UNIX platform and
+    behaves similarly to other Unix-like platforms. The main difference is
+    that X11 is not used as the windowing system. Instead, \macos uses its own
+    native windowing system that is accessible through the Cocoa API.
+    Application development on \macos is done using Xcode, which is available
+    from \l{https://developer.apple.com/xcode/}.
 
     \section1 Downloading and Installing Qt
 
@@ -52,14 +54,14 @@
 
     Below, you will find more information about building Qt from source.
     \list
-        \li \l{Qt for OS X - Building from Source} - building and installing from source
+        \li \l{Qt for macOS - Building from Source} - building and installing from source
     \endlist
 
     \note Qt 5 uses Cocoa, therefore, building for Carbon is not possible.
 
-    \section1 OS X Versions
+    \section1 \macos Versions
 
-    See \l{Supported Platforms} for the list of OS X versions supported by Qt.
+    See \l{Supported Platforms} for the list of \macos versions supported by Qt.
 
     Qt can be built for either x86 or x86_64. 64-bit is used by default.
     To select a 32-bit build, use the \c QMAKE_APPLE_DEVICE_ARCHS \c qmake variable.
@@ -110,13 +112,13 @@
     CONFIG -= app_bundle
     \endcode
 
-    \section1 Deploying Applications on OS X
+    \section1 Deploying Applications on \macos
 
-    In general, Qt supports building on one OS X version and deploying to
-    earlier or later OS X versions. The recommended way is to build on the
-    latest version and deploy to an earlier OS X version.
+    In general, Qt supports building on one \macos version and deploying to
+    earlier or later \macos versions. The recommended way is to build on the
+    latest version and deploy to an earlier \macos version.
 
-    OS X applications are typically deployed as self-contained application
+    \macos applications are typically deployed as self-contained application
     bundles. The application bundle contains the application executable as well
     as dependencies such as the Qt libraries, plugins, translations and other
     resources you may need. Third party libraries like Qt are normally not
@@ -124,22 +126,22 @@
 
     A common way to distribute applications is to provide a compressed disk
     image (.dmg file) that the user can mount in Finder. The deployment tool, \c
-    macdeployqt (available from the OS X installers), can be used to create
+    macdeployqt (available from the \macos installers), can be used to create
     the self-contained bundles, and optionally also create a .dmg archive.
     Applications can also be distributed through the Mac App Store. Qt 5 aims
     to stay within the app store sandbox rules. macdeployqt (bin/macdeployqt)
     can be used as a starting point for app store deployment.
 
     \list
-    \li \l{Qt for OS X - Deployment}
+    \li \l{Qt for macOS - Deployment}
     \endlist
 
-    \section1 OS X Issues
+    \section1 \macos Issues
 
     The page below covers specific issues and recommendations for creating
-    OS X applications.
+    \macos applications.
     \list
-    \li \l{Qt for OS X - Specific Issues}
+    \li \l{Qt for macOS - Specific Issues}
     \endlist
 
     \section1 Where to Go from Here
@@ -161,8 +163,8 @@
 
 /*!
     \page osx-requirements.html
-    \title Qt for OS X - Requirements
-    \brief Setting up the OS X environment for Qt.
+    \title Qt for macOS - Requirements
+    \brief Setting up the \macos environment for Qt.
 
     Qt requires Xcode to be installed on the system. You can get it from:
 
@@ -170,7 +172,7 @@
 
     \section1 Required Compiler Versions
 
-    Qt for OS X is tested and compatible with several versions of GCC (GNU
+    Qt for macOS is tested and compatible with several versions of GCC (GNU
     Compiler Collection) and Clang (as available from Xcode). For a list of
     tested configurations, refer to the \e{Reference Configuration} section of
     the \l{Community Supported Platforms#Reference Configurations}{supported platforms}
@@ -184,21 +186,21 @@
 
 /*!
     \page osx-building.html
-    \title Qt for OS X - Building from Source
-    \brief How to install Qt on OS X.
+    \title Qt for macOS - Building from Source
+    \brief How to install Qt on \macos.
 
-    Qt for OS X has some requirements that are given in more detail
-    in the \l{Qt for OS X Requirements} document.
+    Qt for macOS has some requirements that are given in more detail
+    in the \l{Qt for macOS Requirements} document.
 
     The following instructions describe how to install Qt from the source package.
     You can download the Qt 5 sources from the \l{Downloads} page. For
     more information, visit the \l{Getting Started with Qt} page.
 
-    \section1 Step 1: Install the License File (Commercial Editions Only)
-        If you have the commercial edition of Qt, install your license
-        file as \c{$HOME/.qt-license}.
+    \section1 Step 1: Install the License File (Commercially Licensed Qt Only)
 
-        For the open source version you do not need a license file.
+        If you have a commercial Qt license, download the license file
+        from your \l {Qt Account} Web portal and save it as
+        \c{$HOME/.qt-license}.
 
         Unpack the archive if you have not done so already. For example,
         if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz}
@@ -273,30 +275,30 @@
 
 /*!
     \page osx-issues.html
-    \title Qt for OS X - Specific Issues
-    \brief A description of issues with Qt that are specific to OS X.
+    \title Qt for macOS - Specific Issues
+    \brief A description of issues with Qt that are specific to \macos.
 
-    This page outlines the main issues regarding OS X support in Qt.
-    OS X terminologies and specific processes are found at
+    This page outlines the main issues regarding \macos support in Qt.
+    \macos terminologies and specific processes are found at
     \l{https://developer.apple.com/}.
 
     \section1 Aqua
 
-    Aqua is an essential part of the OS X platform. As with Cocoa and
+    Aqua is an essential part of the \macos platform. As with Cocoa and
     Carbon, Qt provides widgets that look like those described in the Human
     Interface Descriptions. Qt's widgets use HIThemes to implement the look and
     feel. In other words, we use Apple's own APIs for doing the rendering. More
     documentation about Aqua is found at the
      \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html#//apple_ref/doc/uid/20000957}
-     {OS X Human Interface Guidelines}.
+     {\macos Human Interface Guidelines}.
 
     The \l{Macintosh Style Widget Gallery} page
-    contains sample images of widgets using the OS X platform theme.
+    contains sample images of widgets using the \macos platform theme.
 
-    \section2 Qt Attributes for OS X
+    \section2 Qt Attributes for \macos
 
     The following lists a set of useful attributes that can be used to tweak
-    applications on OS X:
+    applications on \macos:
 
     \list
     \li Qt::AA_MacPluginApplication
@@ -319,17 +321,17 @@
     \li QMainWindow::unifiedTitleAndToolBarOnMac
     \endlist
 
-    OS X always double buffers the screen, therefore, the
+    \macos always double buffers the screen, therefore, the
     Qt::WA_PaintOnScreen attribute has no effect. Also it is impossible to paint
     outside of a paint event so Qt::WA_PaintOutsidePaintEvent has no effect
     either.
 
     \section2 Right Mouse Clicks
 
-    The QContextMenuEvent class provides right mouse click support for OS X
+    The QContextMenuEvent class provides right mouse click support for \macos
     applications. This will map to a context menu event, for example, a menu
     that will display a pop-up selection. This is the most common use of right
-    mouse clicks, and maps to a control-click with the OS X one-button mouse
+    mouse clicks, and maps to a control-click with the \macos one-button mouse
     support.
 
     \section2 Menu Bar
@@ -361,7 +363,7 @@
     section with the \l{#Limitations}{list of limitations} below has more
     information.
 
-    Qt provides support for the Global Menu Bar with QMenuBar. OS X users
+    Qt provides support for the Global Menu Bar with QMenuBar. \macos users
     expect to have a menu bar at the top of the screen and Qt honors this.
 
     Additionally, users expect certain conventions to be respected, for example
@@ -385,7 +387,7 @@
 
     \section2 Special Keys
 
-    To provide the expected behavior for Qt applications on OS X,
+    To provide the expected behavior for Qt applications on \macos,
     the Qt::Key_Meta, Qt::MetaModifier, and Qt::META enum values
     correspond to the Control keys on the standard Apple keyboard,
     and the Qt::Key_Control, Qt::ControlModifier, and Qt::CTRL enum values
@@ -400,25 +402,25 @@
 
     \section2 Accessiblity
 
-    Many users interact with OS X with assistive devices. With Qt the aim is
+    Many users interact with \macos with assistive devices. With Qt the aim is
     to make this automatic in your application so that it conforms to accepted
     practice on its platform. Qt uses Apple's accessibility framework to provide
     access to users with disabilities.
 
     \section1 Library and Deployment Support
 
-    Qt provides support for OS X structures such as Frameworks and bundles.
+    Qt provides support for \macos structures such as Frameworks and bundles.
     It is important to be aware of these structure as they directly affect the
     deployment of applications.
 
     Qt provides a deploy tool, \l{The Mac Deployment Tool}{macdeployqt}, to
-    simplify the deployment process. The \l{Qt for OS X - Deployment}
+    simplify the deployment process. The \l{Qt for macOS - Deployment}
     article covers the deployment process in more detail.
 
     \section2 Qt Libraries as Frameworks
 
     By default, Qt is built as a set of frameworks. Frameworks are the
-    OS X preferred way of distributing libraries. The
+    \macos preferred way of distributing libraries. The
     \l{http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/index.html}
     {Apple's Framework Programming Guide} site has far more information about
     Frameworks.
@@ -446,7 +448,7 @@
 
     \section2 Bundle-Based Libraries
 
-    If you want to use some dynamic libraries in the OS X
+    If you want to use some dynamic libraries in the \macos
     application bundle (the application directory), create a
     subdirectory named \e Frameworks in the application bundle
     directory and place your dynamic libraries there. The application
@@ -489,36 +491,34 @@
 
     \section1 Compile-Time Flags
 
-    The following flags are helpful when you want to define OS X specific
+    The following flags are helpful when you want to define \macos specific
     code:
 
     \list
     \li \c Q_OS_DARWIN is defined when Qt detects you are on a
-    Darwin-based system (including the Open Source version)
-    \li \c Q_OS_MAC is defined when you are on an Apple Darwin-based system such OS X
-    or iOS.
-    \li \c Q_OS_OSX is defined when you are on an OS X system.
+    Darwin-based system such as \macos or iOS.
+    \li \c Q_OS_MACOS is defined when you are on an \macos system.
     \endlist
 
     \note \c Q_WS_MAC is no longer defined in Qt 5.
 
-    If you want to define code for specific versions of OS X, use
+    If you want to define code for specific versions of \macos, use
     the availability macros defined in \e{/usr/include/AvailabilityMacros.h}.
 
     The QSysInfo documentation has information about runtime version checking.
 
-    \section1 OS X Native API Access
+    \section1 \macos Native API Access
 
     \section2 Accessing the Bundle Path
 
-    OS X applications are structured as a directory (ending with \e .app).
+    \macos applications are structured as a directory (ending with \e .app).
     This directory contains sub-directories and files. It may be useful to place
     items, such as plugins and online documentation, inside this bundle. The
     following code returns the path of the application bundle:
 
     \snippet snippets/code/doc_src_mac-differences.cpp 1
 
-    \note When OS X is set to use Japanese, a bug causes this sequence
+    \note When \macos is set to use Japanese, a bug causes this sequence
     to fail and return an empty string. Therefore, always test the
     returned string.
 
@@ -603,11 +603,11 @@
 
     If you have installed the Qt for X11 package from \l{Fink}, it will set the
     \c QMAKESPEC environment variable to \c darwin-g++. This will cause problems when
-    you build the Qt for OS X package. To fix this, simply unset your \c
+    you build the Qt for macOS package. To fix this, simply unset your \c
     QMAKESPEC or set it to \c macx-g++ before you run \c configure. To get a
     fresh Qt distribution, run \c{make confclean} in the command-line.
 
-    \section2 MySQL and OS X
+    \section2 MySQL and \macos
 
     There seems to be a issue when both \c -prebind and \c -multi_module are
     defined when linking static C libraries into dynamic libraries. If you
@@ -618,18 +618,18 @@
     re-link Qt using -single_module. This is only a problem when building the
     MySQL driver into Qt. It does not affect plugins or static builds.
 
-    \section2 D-Bus and OS X
+    \section2 D-Bus and \macos
 
     The QtDBus module defaults to dynamically loading the libdbus-1 library on
-    OS X. That means applications linking against the QtDBus module will
-    load even on OS X systems that do not have the libraries, but they
+    \macos. That means applications linking against the QtDBus module will
+    load even on \macos systems that do not have the libraries, but they
     will fail to connect to any D-Bus server and they will fail to open a
     server using QDBusServer.
 
     To use D-Bus functionality, you need to install the libdbus-1 library, for
     example through Homebrew, Fink or MacPorts. You may want to include those
     libraries in your application's bundle if you're deploying to other
-    systems. Additionally, note that there is no system bus on OS X and
+    systems. Additionally, note that there is no system bus on \macos and
     that the session bus will only be started after launchd is configured to
     manage it.
 
@@ -655,7 +655,7 @@
 
     Qt has support for sheets, represented by the window flag, Qt::Sheet.
 
-    Usually, when referring to a native OS X application, \e native means an
+    Usually, when referring to a native \macos application, \e native means an
     application that interfaces directly to the underlying window system, rather
     than one that uses some intermediary layer. Qt applications run as first
     class citizens, just like Cocoa and Carbon applications. We use Cocoa
@@ -665,21 +665,21 @@
 
 /*!
     \page osx-deployment.html
-    \title Qt for OS X - Deployment
-    \brief Describes the deployment process for OS X.
+    \title Qt for macOS - Deployment
+    \brief Describes the deployment process for \macos.
 
-    This document describes how to create a \l{Qt for OS X}{OS X} bundle
+    This document describes how to create a \l{Qt for macOS}{\macos} bundle
     and make sure that the application finds the resources it needs at run-time.
     We demonstrate the procedures in terms of deploying the
     \l{tools/plugandpaint/app}{Plug & Paint} example application that comes with the
     Qt installation package.
 
-    The Qt installers for OS X include a \l
+    The Qt installers for \macos include a \l
     {macdeploy}{deployment tool} that automates the procedures described here.
 
     \section1 The Bundle
 
-    On OS X, a GUI application must be built and run from a bundle, which is a
+    On \macos, a GUI application must be built and run from a bundle, which is a
     directory structure that appears as a single  entity when viewed in the
     Finder. A bundle for an application typically contains the executable and
     all the resources it needs. Here is the snapshot of an application bundle
@@ -692,7 +692,7 @@
      \li It is easily installable as it is identified as a single entity.
      \li Information about a bundle is accessible from code.
     \endlist
-    This is specific to OS X and beyond the scope of this document. For
+    This is specific to \macos and beyond the scope of this document. For
     more information about bundles, see
     \l {http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/index.html}{Apple's Developer Website}.
 
@@ -739,7 +739,7 @@
 
     Now, provided that everything compiled and linked without any
     errors, we should have a \c plugandpaint.app bundle ready
-    for deployment. Try installing the bundle on a machine running OS X
+    for deployment. Try installing the bundle on a machine running \macos
     that does not have Qt or any Qt applications installed.
 
     You can check what other libraries your application links to using
@@ -780,7 +780,7 @@
     approach, the bundle we have prepared so far is incomplete. The
     application will run, but the functionality will be disabled due
     to the missing plugins. To deploy plugin-based applications we
-    should use the framework approach, which is specific to OS X.
+    should use the framework approach, which is specific to \macos.
 
     \section1 Frameworks
 
@@ -808,7 +808,7 @@
     We assume that you already have installed Qt as frameworks, which
     is the default when installing Qt, in the /path/to/Qt
     directory. For more information on how to build Qt without Frameworks,
-    visit the \l{Qt for OS X - Specific Issues} documentation.
+    visit the \l{Qt for macOS - Specific Issues} documentation.
 
     When installing, the identification name of the frameworks is set. This
     name is used by the dynamic linker (\c dyld) to find the libraries for your
@@ -868,7 +868,7 @@
     \snippet snippets/code/doc_src_deployment.qdoc 39
 
     First we create a \c Frameworks directory inside the bundle. This
-    follows the OS X application convention. We then copy the
+    follows the \macos application convention. We then copy the
     frameworks into the new directory. As frameworks contain
     symbolic links, we use the \c -R option.
 
@@ -981,7 +981,7 @@
     making your application link to the correct Qt frameworks in the bundle
     using \c install_name_tool.
 
-    Now you should be able to move the application to another OS X
+    Now you should be able to move the application to another \macos
     machine and run it without Qt installed. Alternatively, you can
     move your frameworks that live outside of the bundle to another
     directory and see if the application still runs.
@@ -1000,14 +1000,14 @@
 
     Although the process of deploying an application do have some
     pitfalls, once you know the various issues you can easily create
-    packages that all your OS X users will enjoy.
+    packages that all your \macos users will enjoy.
 
     \section1 Application Dependencies
 
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt
-    Platform Abstraction} (QPA) layer in Qt 5. For OS X, the name of the
+    Platform Abstraction} (QPA) layer in Qt 5. For \macos, the name of the
     platform plugin is \c {libqcocoa.dylib}. This file must be located within a
     specific subdirectory (by default, \c platforms) under your distribution
     directory. Alternatively, it is possible to adjust the search path Qt
@@ -1052,25 +1052,25 @@
 
     Compiler-specific libraries rarely have to be redistributed with your
     application. But there are several ways to deploy applications, as Qt can be
-    configured, built, and installed in several ways on OS X. Typically your
+    configured, built, and installed in several ways on \macos. Typically your
     goals help determine how you are going to deploy the application. The last
     sections describe a few things that you must be aware of while deploying
     your application.
 
-    \section2 OS X Version Dependencies
+    \section2 \macos Version Dependencies
 
-    Qt 5 applications can be built on the latest OS X version and deployed to
+    Qt 5 applications can be built on the latest \macos version and deployed to
     previous versions. This is achieved using \e{weak linking}. In
     \e{weak linking}, Qt tests whether a function added in a newer
-    version of OS X is available on the computer it is running
+    version of \macos is available on the computer it is running
     on. This allows Qt to use newer features when it runs on a newer
-    version of OS X, while remaining compatible on the older versions.
+    version of \macos, while remaining compatible on the older versions.
 
-    For more information about cross development issues on OS X,
+    For more information about cross development issues on \macos,
     see \l
     {https://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/cross_development/Introduction/Introduction.html}{Apple's Developer Website}.
 
-    The linker is set to be compatible with all OS X versions,
+    The linker is set to be compatible with all \macos versions,
     so you must change the \c MACOSX_DEPLOYMENT_TARGET environment
     variable to get \e{weak linking} to work for your application. You
     can add the following:
@@ -1142,7 +1142,7 @@
     \title Contributions to the Cocoa Platform Plugin Files
     \contentspage {Other Licenses Used in Qt}{Contents}
     \ingroup licensing
-    \brief License information for contributions by Apple, Inc. to specific parts of the Qt for OS X Cocoa port.
+    \brief License information for contributions by Apple, Inc. to specific parts of the Qt for macOS Cocoa port.
 
     This page is about the contributions to the following files
     \list
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index c8f982044..c1ef19f8c 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -27,15 +27,17 @@
 
 /*!
     \page platform-notes-vxworks.html
-    \title Platform and Compiler Notes - VxWorks
+    \title Qt for VxWorks
     \contentspage Platform and Compiler Notes
     \keyword VxWorks
+    \ingroup supportedplatform
+    \brief Platform support for VxWorks (under a commercial license).
 
-    Qt for VxWorks is available only under a commercial license.
+    \l {ext: Qt for VxWorks}{Qt for VxWorks} is available only under a
+    commercial license.
 
     Please contact Qt sales to find out more:
     \l http://www.qt.io/contact-us/
-
 */
 
 /*!
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 8f80b1e9a..4de548b80 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -105,7 +105,7 @@
             \li \l{Platform and Compiler Notes - Android#Deployment}{Android}
             \li \l{Qt for iOS}{iOS}
             \li \l{Qt for Linux/X11 - Deployment}{Linux/X11}
-            \li \l{Qt for OS X - Deployment}{OS X}
+            \li \l{Qt for macOS - Deployment}{\macos}
             \li \l{Qt for Windows - Deployment}{Windows}
         \endlist
     \endlist
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index b34b8d1e1..a276de3ce 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -54,19 +54,19 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li MSVC 2015
          \li
     \row \li Windows 8.1 (64-bit)
-         \li MSVC 2015, \b {MSVC 2013}, MinGW 4.9,
+         \li MSVC 2015, \b {MSVC 2013}, MinGW 5.3, MinGW 4.9,
              MinGW 4.8
          \li
     \row \li Windows 8.1 (32-bit)
-         \li MSVC 2015, MSVC 2013, MinGW 4.9, MinGW 4.8
+         \li MSVC 2015, MSVC 2013, MinGW 5.3, MinGW 4.9, MinGW 4.8
          \li
     \row \li Windows 7 (64-bit)
-         \li MSVC 2015, MSVC 2013, MinGW 4.9, MinGW 4.8
+         \li MSVC 2015, MSVC 2013, MinGW 5.3, MinGW 4.9, MinGW 4.8
          \li
     \row \li Windows 7 (32-bit)
-         \li MSVC 2015, MSVC 2013, \b {MinGW 4.9},
+         \li MSVC 2015, MSVC 2013, \b {MinGW 5.3}, MinGW 4.9,
              MinGW 4.8
-         \li \l{http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.1/threads-posix/dwarf/i686-4.9.1-release-posix-dwarf-rt_v3-rev2.7z/download}{MinGW-builds gcc 4.9.1 (32-bit)}
+         \li \l{https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.3.0/threads-posix/dwarf/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z/download}{MinGW-builds gcc 5.3.0 (32-bit)}
 
     \row \li {3,1} \header \li {3,1} \l {Qt for Linux/X11}{Linux/X11}
     \row \li openSUSE 13.1 (64-bit)
@@ -82,8 +82,8 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1, GCC 4.9.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X \b 10.8, \b 10.9, \b 10.10, \b 10.11
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos \b 10.8, \b 10.9, \b 10.10, \b 10.11
          \li \b {Clang as provided by Apple}
          \li
 
@@ -101,14 +101,17 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li \b {MSVC 2013}
          \li Hosts: \b {Windows 8.1}, Windows 10
     \row \li Windows Runtime (x86, \b x86_64, arm)
-         \li MSVC 2015, \b {MSVC 2013}
+         \li \b {MSVC 2013}
          \li Hosts: \b {Windows 8.1}, Windows 10
+    \row \li Universal Windows Platform (x86, \b x86_64, arm)
+         \li \b {MSVC 2015}
+         \li Hosts: \b {Windows 10}
     \row \li iOS 6 and above
          \li \b {Clang as provided by Apple}
-         \li \b {OS X host}
+         \li \b {\macos host}
     \row \li Android (API Level: 16)
          \li \b {GCC as provided by Google}
-         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, OS X, Windows
+         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, \macos, Windows
     \endtable
 
 //! [5.7] //! [latest]
@@ -122,10 +125,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
     \header \li Platform \li Compiler \li Notes
     \header \li {3,1} \l {Qt for Windows}{Windows}
     \row \li Windows 10 (64-bit)
-         \li \b {MSVC 2015}
+         \li \b {MSVC 2015}, MSVC 2013, MSVC 2012, MSVC 2010, MinGW 4.9,
+             MinGW 4.8
          \li
     \row \li Windows 10 (32-bit)
-         \li MSVC 2015
+         \li MSVC 2015, MSVC 2013, MSVC 2012, MSVC 2010, MinGW 4.9, MinGW 4.8
          \li
     \row \li Windows 8.1 (64-bit)
          \li MSVC 2015, \b {MSVC 2013}, \b {MSVC 2012}, MSVC 2010, MinGW 4.9,
@@ -161,11 +165,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1, GCC 4.9.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X \b 10.8, \b 10.9, \b 10.10, \b 10.11
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos \b 10.8, \b 10.9, \b 10.10, 10.11
          \li \b {Clang as provided by Apple}
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li \li Deployment only
 
     \row \li {3,1} \header \li {3,1}
@@ -189,10 +193,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li Hosts: \b {Windows 8.1}, Windows 10
     \row \li iOS 6 and above
          \li \b {Clang as provided by Apple}
-         \li \b {OS X host}
+         \li \b {\macos host}
     \row \li Android (API Level: 9)
          \li \b {GCC as provided by Google}
-         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, OS X, Windows
+         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, \macos, Windows
     \endtable
 
 //! [5.6]
@@ -237,11 +241,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1, GCC 4.9.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X 10.8, \b 10.9, \b 10.10
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos 10.8, \b 10.9, \b 10.10
          \li \b clang-600.0.54
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li i686-apple-darwin11-llvm-gcc-4.2
          \li
 
@@ -271,10 +275,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li Hosts: \b {Windows 8.1}, Windows 10
     \row \li iOS 5.1.1 and above
          \li \b {Clang as provided by Apple}
-         \li \b {OS X host}
+         \li \b {\macos host}
     \row \li Android
          \li \b {GCC as provided by Google}
-         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, OS X, Windows
+         \li Hosts: \b {Ubuntu 14.04 (64-bit)}, \macos, Windows
     \endtable
 
 //! [5.5]
@@ -322,11 +326,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.8.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X 10.8, \b 10.9, \b 10.10
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos 10.8, \b 10.9, \b 10.10
          \li \b clang-600.0.54
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li \b i686-apple-darwin11-llvm-gcc-4.2
          \li
 
@@ -355,10 +359,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li \b {Windows 8.1 host}
     \row \li iOS 5.1.1 and above
          \li \b {Clang as provided by Apple}
-         \li \b {OS X host}
+         \li \b {\macos host}
     \row \li Android
          \li \b {GCC as provided by Google}
-         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, OS X, Windows
+         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, \macos, Windows
     \endtable
 
 //! [5.4]
@@ -406,14 +410,14 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li GCC 4.6.1, GCC 4.6.3, GCC 4.8.1
          \li
 
-    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
-    \row \li OS X \b 10.8, \b 10.9, 10.10
+    \row \li {3,1} \header \li {3,1} \l {Qt for macOS}{\macos}
+    \row \li \macos \b 10.8, \b 10.9, 10.10
          \li \b clang-600.0.54
          \li
-    \row \li OS X 10.7
+    \row \li \macos 10.7
          \li \b i686-apple-darwin11-llvm-gcc-4.2
          \li
-    \row \li OS X 10.6
+    \row \li \macos 10.6
          \li \li Deployment only
 
     \row \li {3,1} \header \li {3,1}
@@ -441,10 +445,10 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li \b {Windows 8.1 host}
     \row \li iOS 5.0 and above
          \li \b {Clang as provided by Apple}
-         \li \b {OS X host}
+         \li \b {\macos host}
     \row \li Android
          \li \b {GCC as provided by Google}
-         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, OS X, Windows
+         \li Hosts: \b {Ubuntu 12.04 (64-bit)}, \macos, Windows
     \endtable
 
 //! [5.3]
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index eb66edf70..ba320aef0 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -520,16 +520,17 @@
     \title Qt for Windows - Deployment
 
     This documentation describes deployment process for \l{Qt for
-    Windows}{Windows}. We refer to the \{Plug & Paint Example}{plug & paint}
+    Windows}{Windows}. We refer to the \l{Plug & Paint Example}{plug & paint}
     example application through out the document to demonstrate the deployment
     process.
 
     \section1 The Windows Deployment Tool
     \target windeployqt
     The Windows deployment tool is designed to automate the process of creating
-    a deployable folder containing the dependencies (libraries, QML imports,
-    plugins, and translations) that are required to run the application from
-    that folder. It creates a sandbox for \l{Qt for WinRT}{Windows Runtime}
+    a deployable folder containing the \l{Qt}-related dependencies
+    (libraries, QML imports, plugins, and translations) 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.
 
@@ -542,6 +543,16 @@
     directory. The hardcoded local paths in Qt5Core.dll are furthermore replaced
     with relative ones.
 
+    For Windows desktop applications, the required runtime files for the compiler
+    are also copied to the deployable folder by default (unless the option
+    \c --no-compiler-runtime is specified). In the case of release builds using
+    Microsoft Visual C++, these consist of the Visual C++ Redistributable Packages,
+    which are intended for recursive installation by the application's installer on
+    the target machine. Otherwise, the shared libraries of the compiler runtime are used.
+
+    The application may require additional 3rd-party libraries (for example,
+    database libraries), which are not taken into account by windeployqt.
+
     Additional arguments are described in the tools' help output:
 
     \badcode
@@ -1023,17 +1034,11 @@
     more information, visit the \l{Getting Started with Qt} page.
 
 
-    \section1 Step 1: Install the License File (Commercial Editions Only)
-
-        If you have the commercial edition of Qt, copy the license file
-        from your account on the distribution server into your home directory
-        (this may be known as the \c userprofile environment variable) and
-        rename it to \c{.qt-license}. This renaming process must be done
-        using a \e{command prompt} on Windows, \b{not} with Windows Explorer.
-        For example on Windows 2000, \c{%USERPROFILE%} should be something
-        like \c{C:\Documents and Settings\username}
+    \section1 Step 1: Install the License File (Commercially Licensed Qt Only)
 
-        For the open source version you do not need a license file.
+        If you have a commercial Qt license, download the license file
+        from your \l {Qt Account} Web portal and save it to your home directory
+        as \c{.qt-license}.
 
     \section1 Step 2: Unpack the Archive
 
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index bf98d5d08..01b5d410d 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -95,7 +95,7 @@ version 2.7 and onwards.
 
 For a set of basic UI controls, the \l{Qt Quick Controls} module implements
 several controls such as buttons, menus, and views. These controls mimic the
-native behavior found in different platforms such as Windows, OS X, and Linux.
+native behavior found in different platforms such as Windows, \macos, and Linux.
 
 \list
 \li \l{Qt Quick Controls Overview}
@@ -105,6 +105,15 @@ native behavior found in different platforms such as Windows, OS X, and Linux.
 \li \l{Qt Quick Extras}{Extras}
 \endlist
 
+A second set of UI controls, \e {Qt Quick Controls 2}, was designed for use
+on embedded systems, where the hardware has limited resources. For a comparison
+of the two sets of controls, see \l {Differences between Qt Quick Controls}.
+
+\list
+\li \l{Qt Quick Controls 2 Guidelines}
+\li \l{Qt Quick Templates 2}
+\endlist
+
 \section2 Special Effects
 
 Several Qt modules provide types for creating special effects in applications.
diff --git a/doc/src/qmlapp/codingconventions.qdoc b/doc/src/qmlapp/codingconventions.qdoc
index 501ebfad5..029bf4027 100644
--- a/doc/src/qmlapp/codingconventions.qdoc
+++ b/doc/src/qmlapp/codingconventions.qdoc
@@ -103,4 +103,9 @@ For long scripts, we will put the functions in their own JavaScript file and imp
 
 \snippet qmlapp/codingconventions/javascript-imports.qml 0
 
+If the code is longer than one line and hence within a block,
+we use semicolons to indicate the end of each statement:
+
+\snippet qmlapp/codingconventions/javascript-semicolons.qml 0
+
 */
diff --git a/doc/src/qmlapp/performance.qdoc b/doc/src/qmlapp/performance.qdoc
index db2e6967d..7e10b1239 100644
--- a/doc/src/qmlapp/performance.qdoc
+++ b/doc/src/qmlapp/performance.qdoc
@@ -828,6 +828,7 @@ interfaces to be rendered fluidly at 60 FPS. There are some things which can
 dramatically decrease rendering performance, however, and developers should be careful
 to avoid these pitfalls wherever possible.
 
+\target clipping-performance
 \section2 Clipping
 
 Clipping is disabled by default, and should only be enabled when required.
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index 722016eb5..d1941e435 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -214,30 +214,26 @@
     \raw HTML
     <div class="table">
      <table style="background:transparent; border: none">
-      <tr><td style="width:25%; border: none; vertical-align: top">
-    \endraw
-    \image qtquickcontrols-example-gallery-android.png
-    \caption Controls gallery example on Android
-    \raw HTML
-      </td><td style="width:30%; border: none; vertical-align: top">
+      <tr><td style="width:50%; border: none; vertical-align: top">
     \endraw
-    \image qtquickcontrols-example-gallery-osx.png
-    \caption Controls gallery example on OS X
+    \image qtquickcontrols2-material.png
+    \caption Qt Quick Controls 2 Material style
     \raw HTML
-      </td><td style="width:45%; border: none; vertical-align: top">
+      </td><td style="width:50%; border: none; vertical-align: top">
     \endraw
     UI designing can be time consuming if there are not enough tools to help.
-    Qt Quick does reduce the effort considerably compared to the traditional
-    native (C or C++) approach, but the new \l{Qt Quick Controls} and
-    \l{Qt Quick Layouts} take it a step further. These new modules provide
-    ready-to-use UI controls and layouts to enable faster application
-    development and with less code.
+    Qt Quick reduces the effort considerably compared to the traditional
+    native (C or C++) approach, especially if the \l{Qt Quick Controls} or
+    \l{Qt Quick Controls 2} and \l{Qt Quick Layouts} modules are used. These
+    modules provide ready-to-use UI controls and layouts to enable faster
+    application development with less code. For a comparison of the two sets of
+    controls, see \l {Differences between Qt Quick Controls}.
     \raw HTML
       <br>
     \endraw
     Qt Quick Controls and Qt Quick Layouts provide a vast set of UI controls
-    ranging from the most basic TextField and Button to the more complex
-    TableView and TabView. These controls are also made available in
+    ranging from the most basic text field and button to the more complex
+    stack view and tumbler. The controls are also made available in
     \l{Qt Creator: Using Qt Quick Designer}{Qt Quick Designer}.
     \raw HTML
       </td></tr>
@@ -337,7 +333,7 @@
     \li \l{Qt Android Extras} enables you to integrate Java code into your Qt
     application.
 
-    \li \l{Qt Mac Extras} enables you to access specific features on OS X and
+    \li \l{Qt Mac Extras} enables you to access specific features on \macos and
     iOS.
 
     \li \l{Qt Windows Extras} enables you to use Windows-specific features
@@ -512,6 +508,7 @@
 
     \section1 Related Topics
     \list
+    \li \l{What's New in Qt 5.8}
     \li \l{What's New in Qt 5.7}
     \li \l{What's New in Qt 5.6}
     \li \l{What's New in Qt 5.5}
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 86f6f34da..16fee5eb4 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -153,7 +153,7 @@
         \li \l[QtBluetooth]{Qt Bluetooth}
         \li All
         \li \l{Qt for Android}{Android},
-        \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} and \l{Qt for OS X}{OS X}
+        \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} and \l{Qt for macOS}{\macos}
         \li Provides access to Bluetooth hardware.
     \row
         \li \l[QtCanvas3D]{Qt Canvas 3D}
@@ -190,8 +190,8 @@
     \row
         \li \l[QtMacExtras]{Qt Mac Extras}
         \li All
-        \li \l{Qt for OS X}{OS X}
-        \li Provides platform-specific APIs for OS X.
+        \li \l{Qt for macOS}{\macos}
+        \li Provides platform-specific APIs for \macos.
     \row
         \li \l[QtNfc]{Qt NFC}
         \li All
@@ -213,7 +213,7 @@
     \row
         \li \l[QtPositioning]{Qt Positioning}
         \li All
-        \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for OS X}{OS X},
+        \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}.
         \li Provides access to position, satellite and area monitoring classes.
     \row
@@ -252,6 +252,11 @@
         \li
         \li Classes for making Qt applications scriptable. Deprecated in favor
             of the \c{QJS*} classes in the \l{Qt QML} module.
+    \row \li \l[QtScxml]{Qt SCXML}
+         \li All
+         \li All
+         \li Provides classes and tools for creating state machines from SCXML
+             files and embedding them in applications.
     \row
         \li \l[QtScriptTools]{Qt Script Tools} (Deprecated)
         \li All
@@ -265,7 +270,7 @@
     \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 OS X}{OS X}.
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for macOS}{\macos}.
         \li Provides access to hardware and virtual serial ports.
     \row
         \li \l[QtSvg]{Qt SVG}
@@ -282,7 +287,7 @@
     \row
         \li \l[QtWebEngine]{Qt WebEngine}
         \li All
-        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for macOS}{\macos}.
         \li Classes and functions for embedding web content in applications using the
             \l{http://www.chromium.org/Home}{Chromium browser project}.
     \row
@@ -328,23 +333,28 @@
             driven by static or dynamic data models.
     \row
         \li \l{Qt Data Visualization}
-        \li
-        \li
+        \li All
+        \li All
         \li UI Components for creating stunning 3D data visualizations.
     \row
+        \li \l[QtSerialBus]{Qt Serial Bus}
+        \li \l{Qt for Linux/X11}{Linux}
+        \li \l{Qt for Linux/X11}{Linux} and \l{Boot2Qt}{Boot to Qt} targets.
+        \li Provides access to serial industrial bus interface. Currently the
+            module supports the CAN bus and Modbus protocols.
+    \row
         \li \l{Qt Virtual Keyboard}
+        \li All
         \li \l{Qt for Linux/X11}{Linux} and \l{Qt for Windows}{Windows}
             desktop, and \l{Boot2Qt}{Boot to Qt} targets.
-        \li
         \li A framework for implementing different input methods as
             well as a QML virtual keyboard. Supports localized keyboard
             layouts and custom visual themes.
     \row
-        \li \l{Qt Quick 2D Renderer}
-        \li All
-        \li
-        \li Enables the use of Qt Quick UI on devices without OpenGL
-            capability.
+        \li \l{Qt Wayland Compositor}
+        \li \l{Qt for Linux/X11}{Linux}
+        \li \l{Qt for Linux/X11}{Linux} and \l{Boot2Qt}{Boot to Qt} targets.
+        \li Provides a framework to develop a Wayland compositor.
     \endtable
 
     \section1 Value-Add Modules
@@ -376,13 +386,11 @@
         \li Description
     \row \li \l{Qt Gamepad}
          \li Enables Qt applications to support the use of gamepad hardware.
-    \row \li \l[QtSerialBus]{Qt Serial Bus}
-         \li Provides access to serial industrial bus interface. Currently the module supports
-             the CAN bus and Modbus protocols.
-    \row \li \l{Qt Wayland Compositor}
-         \li Provides a framework to develop a Wayland compositor.
-    \row \li \l{Qt SCXML}
-         \li Provides functionality to create state machines from SCXML files.
+    \row \li \l{Qt Network Authorization}
+         \li Provides support for OAuth-based authorization to online services.
+    \row \li \l{Qt Speech}
+         \li Provides support for accessibility features such as text-to-speech.
+
     \endtable
 
     \section1 Qt Tools
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index 1bb8575ca..eb84c4c92 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -787,7 +787,7 @@ recommendations for handling those changes.
     \list
      \li The \c {qttest_p4.prf} file is removed. Use \c{CONFIG+=testcase} and
          other flags instead.
-     \li The \c{-dwarf2} configure argument is removed. DWARF2 is always used on OS X now.
+     \li The \c{-dwarf2} configure argument is removed. DWARF2 is always used on \macos now.
      \li Configure no longer calls \c{qmake -recursive} by default, because the
          subsequent build invokes qmake as needed. Use \c{-fully-process} to
          restore the old behavior.
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 4a052d62b..aa99c28d0 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -33,11 +33,10 @@
 Qt features multiple technologies for creating user interfaces. While it is
 possible to mix and match these different technologies as needed, one approach
 is often better suitable for a certain type of user interface than the others.
-\l {Qt Creator Manual}{Qt Creator} is a good example of an application that mixes different user
-interface technologies. In fact, it uses the two different approaches
-described below. \l {Qt Creator Manual}{Qt Creator} uses the traditional \l {Qt Widgets} such as
-menus and dialogs as a basis of the user interface, \l {Qt Quick} amongst others
-for the welcome screen. The following sections provide brief introductions to the
+\l {Qt Creator Manual}{Qt Creator} is a good example of an application that
+combines traditional \l {Qt Widgets} with \l {Qt Quick}. Widgets form the basis
+of the user interface, whereas Qt Quick is used to implement the Welcome mode,
+for example. The following sections provide brief introductions to the
 available technologies for creating user interfaces, and a comparison table
 to help choosing the best suitable technology.
 
@@ -74,8 +73,13 @@ and shader effects.
 
 \section2 Graphical Controls
 
-The \l{Qt Quick Controls} module is new in Qt 5.1 and provides a
-set of UI elements to create user interfaces using \l{Qt Quick} 2.
+The \l{Qt Quick Controls} module (since Qt 5.1) provides a set of UI elements to
+create user interfaces for desktop and mobile platforms using \l{Qt Quick} 2.
+The \l{Qt Quick Controls 2} module (since Qt 5.7) provides lightweight QML types
+for creating performant user interfaces for embedded and mobile devices. These
+controls achieve improved efficiency by employing a simplified styling
+architecture when compared to the first set of controls. For a comparison
+of the two sets of controls, see \l {Differences between Qt Quick Controls}.
 
 For more about how to create application user interfaces with QML, visit the
 \l{QML User Interfaces} page.
@@ -107,13 +111,13 @@ type applications.
 
 Qt provides ready-made C++ classes and QML types for visualizing data in the
 form of charts and graphs, which are known to be best ways of analyzing data.
-\l{Qt Charts} and \{Qt Data Visualization} are the two Qt add-ons that make
+\l{Qt Charts} and \l{Qt Data Visualization} are the two Qt add-ons that make
 data visualization using 2D and 3D models a reality.
 
 \section1 Displaying Web Content
 
 Qt provides the Chromium-based
-\l{Qt WebEngine}{WebEngine} layout engine, which enable you to embed web content
+\l{Qt WebEngine}{WebEngine} layout engine, which enables you to embed web content
 into the Qt application. The engine can be integrated into both Qt Widget-based
 and Qt Quick-based applications.
 
@@ -122,12 +126,12 @@ For more information about support for web content in Qt, see
 
 \section1 Comparison
 
-Notice that choosing the appropriate technology for building an user interface
-is not always black and white. It depends on several criteria, such as other
-existing technologies used in a project or even target platform constraints. To
+Choosing the appropriate technology for building a user interface
+is not always easy. It depends on several variables, such as other
+technologies used in a project or target platform constraints. To
 some extent, many items in the following table can be implemented using any of
 the three available technologies. The following table aims to help you
-choose the best suited tool for the job.
+choose the tool best suited for the job.
 
 \table
     \header
@@ -144,32 +148,32 @@ choose the best suited tool for the job.
         \li
     \row
         \li Native look'n'feel
-        \li X
-        \li X
+        \li \inlineimage ok
+        \li \inlineimage ok
         \li
         \li Qt Widgets and Qt Quick Controls integrate well to the underlying
-            platform, providing a native look'n'feel on Windows, Linux, and OS X.
+            platform, providing a native look'n'feel on Windows, Linux, and \macos.
     \row
         \li Custom look'n'feel
-        \li X
-        \li (X)
-        \li (X)
+        \li \inlineimage ok
+        \li \inlineimage ok
+        \li \inlineimage ok
         \li Qt Widgets provide means for customization via style sheets,
             but Qt Quick is a better performing choice for user interfaces
             that do not aim to look native.
     \row
         \li Fluid animated UIs
-        \li X
+        \li \inlineimage ok
         \li
-        \li X
+        \li \inlineimage ok
         \li Qt Widgets do not scale well for animations. Qt Quick
             offers a convenient and natural way to implement animations in a
             declarative manner.
     \row
         \li Touch screen
-        \li X
+        \li \inlineimage ok
         \li
-        \li X
+        \li \inlineimage ok
         \li Qt Widgets often require a mouse cursor for good interaction, whereas
             Qt Quick only provides primitive building blocks that were designed
             with touch interaction in mind.
@@ -178,7 +182,7 @@ choose the best suited tool for the job.
     \row
         \li Standard industry widgets
         \li
-        \li X
+        \li \inlineimage ok
         \li
         \li Qt Widgets provide all the bells and whistles, developed over two
             decades, needed for building standard industry type applications.
@@ -186,38 +190,38 @@ choose the best suited tool for the job.
             and interact with web content.
     \row
         \li Model/View programming
-        \li (X)
-        \li X
+        \li \inlineimage ok
+        \li \inlineimage ok
         \li
         \li Qt Quick provides convenient views, but Qt Widgets provide more
             convenient and complete framework. In addition to Qt Quick views,
             Qt Quick Controls provide a TableView.
     \row
         \li Rapid UI development
-        \li X
-        \li (X)
-        \li (X)
+        \li \inlineimage ok
+        \li \inlineimage ok
+        \li \inlineimage ok
         \li Qt Quick is an excellent choice for rapid UI prototyping and development.
     \row
         \li HW accelerated graphics
-        \li X
-        \li (X)
-        \li X
+        \li \inlineimage ok
+        \li \inlineimage ok
+        \li \inlineimage ok
         \li Qt Widgets provide QGLWidget for rendering OpenGL graphics,
             and Qt WebEngine supports WebGL, but the OpenGL ES 2.0 or OpenGL 2.0
             based \l {Qt Quick Scene Graph} has proven to provide the best
             performance for UIs and for integrating with OpenGL content.
     \row
         \li Graphical effects
-        \li X
+        \li \inlineimage ok
         \li
         \li
         \li The particle system and shader effects available in Qt Quick
             are more flexible. Qt Widgets offer very little in this area.
     \row
         \li Rich text processing
-        \li (X)
-        \li X
+        \li \inlineimage ok
+        \li \inlineimage ok
         \li
         \li Qt Widgets currently provide the most comprehensive base for implementing
             text editors. Qt's rich text document classes can also be utilized in
@@ -227,10 +231,10 @@ choose the best suited tool for the job.
         \li Existing web content
         \li
         \li
-        \li X
+        \li \inlineimage ok
         \li Both Qt Quick and Qt Widgets provide components for presenting
             \l {richtext-html-subset.html}{simple rich text}, but Qt WebEngine
-            is the right choice for presenting full-blown web content.
+            is the best choice for presenting full-blown web content.
 
 \endtable
 
diff --git a/doc/src/whatsnew/whatsnew55.qdoc b/doc/src/whatsnew/whatsnew55.qdoc
index c2ba87aba..f50440afa 100644
--- a/doc/src/whatsnew/whatsnew55.qdoc
+++ b/doc/src/whatsnew/whatsnew55.qdoc
@@ -61,9 +61,9 @@
 
     \section2 Qt Bluetooth Module
     \list
-    \li Classic Bluetooth support added for \l{Qt for OS X}{OS X}.
+    \li Classic Bluetooth support added for \l{Qt for macOS}{\macos}.
     \li Bluetooth Low Energy support added for \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}
-    and \l{Qt for OS X}{OS X}
+    and \l{Qt for MacOS}{\macos}
     \endlist
 
     \section2 Qt Core Module
diff --git a/doc/src/whatsnew/whatsnew56.qdoc b/doc/src/whatsnew/whatsnew56.qdoc
index 42b6ccbe9..ed176b392 100644
--- a/doc/src/whatsnew/whatsnew56.qdoc
+++ b/doc/src/whatsnew/whatsnew56.qdoc
@@ -131,7 +131,7 @@
 
     \section2 Qt Platform Abstraction (QPA)
     \list
-        \li Optional support for using FreeType on OS X.
+        \li Optional support for using FreeType on \macos.
         \li Added support for NVIDIA Jetson TK1 Pro boards running Vibrante
             Linux via a new eglfs backend utilizing DRM, EGLDevice, and
             EGLStream.
@@ -146,7 +146,7 @@
 
     \section2 Qt Positioning Module
     \list
-        \li Added support for OS X.
+        \li Added support for \macos.
         \li Added support for GPS receivers exposed as a serial port on Windows
             desktop (all versions).
         \li Removed libgeoclue dependency for the GeoClue backend.
diff --git a/doc/src/whatsnew/whatsnew58.qdoc b/doc/src/whatsnew/whatsnew58.qdoc
new file mode 100644
index 000000000..361a482a7
--- /dev/null
+++ b/doc/src/whatsnew/whatsnew58.qdoc
@@ -0,0 +1,258 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page whatsnew58.html
+    \title What's New in Qt 5.8
+    \brief Lists the new features in Qt 5.8.
+
+    \section1 New Features in Qt 5.8
+
+    \section2 Qt Core Module
+    \list
+        \li Added at(), operator[], mid(), right(), and left() functions to
+            QLatin1String.
+    \endlist
+
+    \section2 Qt GUI Module
+    \list
+        \li Added \l {QTouchEvent::TouchPoint::}{uniqueId()} and
+            \l {QTouchEvent::TouchPoint::}{rotation()} to QTouchEvent.
+        \li Added support for dithering when converting to all QImage formats.
+        \li Made the QOpenGLTextureBlitter API public; used particularly in Qt
+            Wayland.
+        \li Added \l {QFontMetrics::}{capHeight()} to QFontMetrics,
+            QFontMetricsF, and QRawFont.
+        \li Added selection handles on Android, with an edit menu for copy and
+            paste.
+    \endlist
+
+    \section2 Qt Quick Module
+    \list
+        \li Refactored the Qt Quick scene graph to remove its OpenGL
+            dependency, enabling backends based on other graphics APIs such as
+            Vulkan or Direct3D.
+        \li Integrated the software renderer (previously known as the Qt Quick
+            2D Renderer) for Qt Quick as a proper scene graph backend.
+        \li Implemented support for partial updates in the software renderer.
+        \li Added an experimental Direct3D 12 backend.
+        \li Implemented caching of code and data structures generated from
+            \c .qml and \c .js files to disk, reducing start-up time and memory
+            consumption. The resulting \c .qmlc and \c .jsc cache files are
+            memory mapped.
+        \li Cleaned up touch and mouse event delivery, and added a new internal
+            class \c QQuickPointerEvent for this purpose.
+    \endlist
+
+    \section2 Qt Quick Controls 2 Module
+    \list
+        \li Added new QML types: \l [QtQuickControls2] {Dialog},
+            \l [QtQuickControls2] {DialogButtonBox},
+            \l [QtQuickControls2] {MenuSeparator},
+            \l [QtQuickControls2] {RoundButton}, and
+            \l [QtQuickControls2] {ToolSeparator}.
+        \li Added ripple effects to the Material style.
+        \li Added hover effects to Material and Universal styles
+        \li Added a \e System theme to Material and Universal styles
+        \li Added new experimental \e platform QML types:
+            \c MenuBar, \c Menu, \c SystemTrayIcon,
+            \c ColorDialog, \c FontDialog, \c MessageDialog,
+            \c FileDialog, and \c FolderDialog.
+    \endlist
+
+    \section2 Qt WebEngine Module
+    \list
+        \li Based on Chromium 53.
+        \li Updated requirements to MSVC 2015 Update 2 or later on Windows.
+        \li Added \l {Qt WebEngine Features#View Source}{view-source} scheme
+            support.
+        \li Added support for spellchecking with custom .bdic files.
+        \li Made tooltips (HTML5 global tile attribute) visible.
+        \li Added support for metadata (\c @include, \c @exclude, \c @match,
+            \c @name, and \c @run-at) in user scripts.
+        \li QML: Enabled the use of custom dialogs and context menus.
+        \li QML: on eglfs, took the built-in dialogs based on Qt Quick Controls
+            2 into use.
+        \li Added support for printing.
+        \li Added a setting to enable printing of CSS backgrounds.
+    \endlist
+
+    \section2 Qt Bluetooth Module
+    \list
+        \li Added Bluetooth Low Energy Peripheral support on macOS, iOS, and
+            WinRT.
+    \endlist
+
+    \section2 Qt Multimedia Module
+    \list
+        \li Added QAudio::convertVolume() and a matching QML method to convert
+            audio volumes from one scale to another; for example, from
+            logarithmic to linear scale.
+        \li Added support for rendering YUV 4:2:2 (YUYV, UYVY) video frames to
+            VideoOutput QML type.
+    \endlist
+
+    \section2 Qt Network Module
+    \list
+        \li Added support for TLS-PSK ciphersuites on server side.
+        \li Added support for configurable Diffie-Hellman parameters.
+        \li Added support for HTTP/2 in Network Access Manager.
+    \endlist
+
+    \section2 Qt WebSockets Module
+    \list
+        \li Added support for TLS-PSK ciphersuites on client and server side.
+    \endlist
+
+    \section2 Qt Charts Module
+    \list
+        \li Added a candlestick chart type.
+    \endlist
+
+    \section2 Qt 3D Module
+    \list
+        \li Focused on maturation: Bug fixes, improving performance and test
+            coverage.
+        \li Added a \e {paint to texture} feature using QPainter.
+        \li Added optional support for issuing commands to Qt3D aspects (for
+            example, from a profiler).
+    \endlist
+
+    \section2 Embedded Platforms
+    \list
+        \li Enhanced multi-screen capabilities and configurability with eglfs
+            when running on KMS/DRM, both with GBM and EGLDevice/Stream.
+        \li Added support for 90 and 180 degrees rotation of software-rendered
+            content (QWidget) in eglfs.
+    \endlist
+
+    \section2 Configurability (Qt Lite Project)
+    \list
+        \li Qt 5.8 comes with a rewritten configuration system that allows for
+            easy customization of Qt builds. The main focus of this feature is
+            for the Device Creation, but it can also be used to tailor a Qt
+            build for mobile or desktop platforms. The new configuration system
+            allows removing individual pieces of functionality and APIs from
+            Qt, creating a more lightweight set of libraries for deployment.
+    \endlist
+
+    \section1 New Modules
+    \list
+        \li \l {Qt Wayland Compositor}
+        \list \li Provides a framework to develop a Wayland compositor.
+        \endlist
+        \li \l {Qt SCXML}
+        \list \li Enables static and runtime integration of SCXML models into
+                  Qt code.
+        \endlist
+        \li \l {Qt Serial Bus}
+        \list \li Provides access to various industrial serial buses and
+                  protocols, such as CAN and ModBus.
+        \endlist
+    \endlist
+
+    These modules were previously released as technology previews, and are
+    now fully supported Qt add-on modules.
+
+    \section1 Technology Preview Modules
+    \list
+        \li \l {Qt Gamepad}
+        \list \li Enables Qt gaming applications to respond to gamepad input.
+        \endlist
+        \li \l {Qt Speech}
+        \list \li Text to speech and speech recognition functionality.
+                  Currently only the text to speech features are released.
+                  Includes backends for several speech synthesizers on
+                  Windows, Linux, macOS, and Android.
+        \endlist
+        \li \l {Qt Network Authorization}
+        \list \li Online authorization support with OAuth protocol,
+                  versions 1 and 2.
+        \endlist
+    \endlist
+
+    \section1 Deprecated Functionality
+    \list
+        \li Qt Script
+    \endlist
+
+    Deprecated modules are still included in Qt 5.8, but are considered for removal
+    in future releases.
+
+    \section1 Removed Functionality
+    \list
+        \li Qt Quick 2D Renderer (functionality has been merged into Qt Quick).
+    \endlist
+
+    \section1 List of API Changes
+
+    The pages below contain a list of API changes in Qt 5.8:
+    \list
+    \li \l{New Classes and Functions in Qt 5.8}
+    \li \l{Obsolete Classes}
+    \endlist
+
+    \section1 Additions to Other Qt 5 Releases
+
+    \list
+        \li \l{What's New in Qt 5.7}
+        \li \l{What's New in Qt 5.6}
+        \li \l{What's New in Qt 5.5}
+        \li \l{What's New in Qt 5.4}
+        \li \l{What's New in Qt 5.3}
+        \li \l{What's New in Qt 5.2}
+        \li \l{What's New in Qt 5.1}
+        \li \l{What's New in Qt 5.0}
+    \endlist
+
+*/
+
+/*!
+    \page newclasses58.html
+    \title New Classes and Functions in Qt 5.8
+    \brief A list of new APIs in Qt 5.8.
+
+    This page contains a comprehensive list of all new classes and functions
+    introduced in Qt 5.8. Links to new APIs in previous Qt 5 releases are found
+    at the bottom of this page.
+
+    \sincelist 5.8
+
+    \section1 Additions to Other Qt 5 Releases
+
+    \list
+        \li \l{What's New in Qt 5.7}
+        \li \l{What's New in Qt 5.6}
+        \li \l{What's New in Qt 5.5}
+        \li \l{What's New in Qt 5.4}
+        \li \l{What's New in Qt 5.3}
+        \li \l{What's New in Qt 5.2}
+        \li \l{What's New in Qt 5.1}
+        \li \l{What's New in Qt 5.0}
+    \endlist
+*/
+
diff --git a/sync.profile b/sync.profile
index 736ba2713..6d035bc53 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,10 +1,2 @@
-# Module dependencies.
-# Every module that is required to build this module should have one entry.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
-#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
-#
-%dependencies = (
-    "qtbase" => "",
+%modules = ( # path to module name map
 );