Merge remote-tracking branch 'origin/5.11.0' into 5.11

Change-Id: Ia89ba486cc268967a59147236bc7bb91a492b325

17 files changed, 468 insertions, 38 deletions

diff --git a/dist/changes-5.11.0 b/dist/changes-5.11.0
new file mode 100644
index 00000000..14f6f0e6
--- /dev/null
+++ b/dist/changes-5.11.0
@@ -0,0 +1,40 @@
+Qt 5.11 introduces many new features and improvements as well as bugfixes
+over the 5.10.x series. 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.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+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.
+
+****************************************************************************
+*                            Qt 5.11.0 Changes                             *
+****************************************************************************
+
+ - Updated documentation throughout Qt 5 modules to work with the new
+   Clang-based C++ documentation parser in QDoc.
+
+ - Clarified the documentation related to QML Caching.
+
+ - Listed Qt Quick Test as an essential module.
+
+ - Updated the documentation for QML Ahead-of-Time compilation.
+
+ - Windows: Updated deployment documentation and build instructions to
+   cover MSVC 2017.
+
+ - Updated CMake documentation.
+
+ - Embedded Linux: Documented advanced eglfs_kms features.
+
+ - Updated qtcluster demo with new graphical design.
+
+ - Fixed multiple instances of missing, incorrect, or obsolete information.
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 40e327a3..8e3cc151 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -20,9 +20,6 @@ depends += \
     qtcore \
     qtdbus \
     qtdesigner \
-    qtenginio \
-    qtenginiooverview \
-    qtenginioqml \
     qtgamepad \
     qtgraphicaleffects \
     qthelp \
@@ -39,11 +36,11 @@ depends += \
     qtpositioning \
     qtprintsupport \
     qtqml \
+    qtqmltest \
     qtquick \
     qtquickcontrols \
     qtquickdialogs \
     qtquickextras \
-    qtquicklayouts \
     qtscript \
     qtscripttools \
     qtscxml \
@@ -59,8 +56,6 @@ depends += \
     qtwebsockets \
     qtwidgets \
     qtwinextras \
-    qtwebkit \
-    qtwebkitexamples \
     qtx11extras \
     qtxml \
     qtxmlpatterns \
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 4b264f52..2ba3e03c 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -183,10 +183,12 @@
     thread.
 
     Each WorkerScript instance can have one \c{.js} script attached to it. When
-    WorkerScript::sendMessage() is called, the script will run in a separate thread
-    (and a separate \l{QQmlContext}{QML context}). When the script finishes
-    running, it can send a reply back to the GUI thread which will invoke the
-    WorkerScript::onMessage() signal handler.
+    \l {QtQml::WorkerScript::sendMessage()}{WorkerScript.sendMessage}() is
+    called, the script will run in a separate thread (and a separate
+    \l{QQmlContext}{QML context}). When the script finishes running, it can
+    send a reply back to the GUI thread which will invoke the
+    \l {QtQml::WorkerScript::message()}{WorkerScript.onMessage}() signal
+    handler.
 
     Using a WorkerScript is similar to using a worker QObject that has been moved
     to another thread. Data is transferred between threads via signals.
@@ -306,10 +308,11 @@
         \li Perfrom a long computation in a pure QML application, and update the GUI
             when the results are ready.
         \li Place the computation code in a \c{.js} script and attach it to a
-            WorkerScript instance. Call \l{WorkerScript::}{sendMessage()} to start the
-            computation in a new thread. Let the script call WorkerScript::sendMessage()
-            too, to pass the result back to the GUI thread. Handle the result in
-            \c onMessage and update the GUI there.
+            WorkerScript instance. Call
+            \l{QtQml::WorkerScript::sendMessage()}{WorkerScript.sendMessage}()
+            to start the computation in a new thread. Let the script call
+            sendMessage() too, to pass the result back to the GUI thread.
+            Handle the result in \c onMessage and update the GUI there.
     \row
         \li Permanent
         \li Have an object living in another thread that can perform different
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 6f49d566..8d81ad5a 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -313,7 +313,6 @@
     \li \l{activeqt/opengl}{OpenGL}\raisedaster
     \li \l{activeqt/qutlook}{Qutlook}\raisedaster
     \li \l{activeqt/simple}{Simple}\raisedaster
-    \li \l{activeqt/webbrowser}{Web Browser}\raisedaster
     \li \l{activeqt/wrapper}{Wrapper}\raisedaster
     \endlist
 */
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
new file mode 100644
index 00000000..01aee02e
--- /dev/null
+++ b/doc/src/legal/licensechanges.qdoc
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 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 license-changes.html
+    \title License Changes
+    \brief Information about changes of licenses in Qt and Third Party Modules
+    \ingroup licensing
+
+    Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
+    released with Qt that are relevant to licensing.
+
+    \section1 Qt 5.11
+
+    \section2 Qt 3D Module
+
+    \list
+        \li The \l{Open Asset Import Library} got updated to upstream version
+            4.1.0.
+        \li Examples use some assets from \l{Substance Share} that are available
+            under the \e {Creative Commons Attribution 4.0} license. This is now
+            documented.
+    \endlist
+
+
+    \section2 Qt Core Module
+    \list
+        \li \e{Parts of QTemporaryFile} got removed from documentation.
+            The corresponding code got removed already in Qt 5.10.0.
+
+        \li The copy of the \l{The Public Suffix List} got updated on
+            2018-01-04.
+
+        \li The concluded license for the
+            \l{Unicode Common Locale Data Repository (CLDR)} changed to
+            \e{Unicode License Agreement - Data Files and Software (2016)}.
+            In Qt 5.10 documentation, the component was labelled as
+            \e{Unicode CLDR (Unicode Common Locale Data Repository)}.
+
+        \li The use of the \l{Unicode Character Database (UCD)} under the
+            \e{Unicode License Agreement - Data Files and Software (2016)}.
+            is now documented.
+    \endlist
+
+    \section2 Qt D-Bus Module
+
+    Qt D-Bus uses code from \l{libdbus-1 headers} that are available under the
+    \e{Academic Free License v2.1, or GNU General Public License v2.0 or later}.
+    This is now documented.
+
+    \section2 Qt GUI Module
+
+    \list
+        \li \l{HarfBuzz-NG} got updated to upstream version 1.7.4.
+        \li \l{LibJPEG-turbo} got updated to upstream version 1.5.3.
+    \endlist
+
+    \section2 Qt Image Formats
+
+    \list
+        \li \l{TIFF Software Distribution (libtiff)} got updated to upstream
+            version 4.0.9.
+        \li \l{WebP (libwebp)} got updated to upstream version 0.6.1.
+    \endlist
+
+    \section2 Qt Quick Controls 2 Module
+
+    Use of \l{Shadow values from Angular Material} under \e{MIT License}
+    in the Material Style is now documented.
+
+    \section2 Qt SQL Module
+
+    \l{SQLite} got updated to upstream version 3.23.1.
+
+    \section2 Qt Test Module
+
+    The concluded license of \l{Linux Performance Events} changed to
+    \e{GNU General Public License v2.0 only with Linux Syscall Note}.
+
+    \section2 Qt WebEngine Module
+
+    \list
+        \li \l{(Components of) Bazel} got added under the
+            \e {Apache License 2.0}.
+        \li \l{Breakpad, An open-source multi-platform crash reporting system}
+            got added under a \e{New BSD, Apple PSL 2.0 and Apache 2.0} license.
+        \li \l{BoringSSL} got updated.
+        \li \l{CRC32C} got added under a \e{New BSD} license.
+        \li \e{Error Prone} got removed.
+        \li \l{Fiat-Crypto: Synthesizing Correct-by-Construction Code for
+            Cryptographic Primitives} got added under a \e{MIT} license.
+        \li \l{OpenVR SDK} got added under a \e{BSD 3-Clause} license.
+        \li \l{Perfetto} got added under a \e{Apache 2} license.
+        \li \e{The library to input, validate, and display addresses} got
+            removed.
+        \li \l{content_shell_fonts} got added under
+            \e{SIL OPEN FONT LICENSE, GPL v2, Bitstream Vera Fonts Copyright}.
+        \li \e{libcxx} got removed.
+        \li \e{libcxxabi} got removed.
+        \li \e{libunwind} got removed.
+        \li \e{libva} got removed.
+        \li \e{libxslt} got added under a \e{MIT} license.
+        \li \e{open-vcdiff} got removed.
+    \endlist
+
+    \section2 Qt XML Patterns Module
+
+    Use of \l{XML Schema}
+    under \e{W3C Software Notice and Document License (2015-05-13)}
+    is now documented.
+*/
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 1bc21c0e..add022a4 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -211,3 +211,154 @@
     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     \endcode
 */
+
+/*!
+    \page qt-attribution-llvm.html
+    \title LLVM Attribution
+    \ingroup licensing
+    \brief University of Illinois/NCSA Open Source License, BSD licenses
+
+    The provided binaries of Qt include a static copy of LLVM inside the \c qdoc binary.
+
+    Most of LLVM is under the \e{University of Illinois/NCSA Open Source License}:
+
+    \badcode
+    University of Illinois/NCSA
+    Open Source License
+
+    Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign.
+    All rights reserved.
+
+    Developed by:
+
+        LLVM Team
+
+        University of Illinois at Urbana-Champaign
+
+        http://llvm.org
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal with
+    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:
+
+        * Redistributions of source code must retain the above copyright notice,
+          this list of conditions and the following disclaimers.
+
+        * Redistributions in binary form must reproduce the above copyright notice,
+          this list of conditions and the following disclaimers in the
+          documentation and/or other materials provided with the distribution.
+
+        * Neither the names of the LLVM Team, University of Illinois at
+          Urbana-Champaign, nor the names of its contributors may be used to
+          endorse or promote products derived from this Software without specific
+          prior written permission.
+
+    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
+    CONTRIBUTORS 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 WITH THE
+    SOFTWARE.
+    \endcode
+
+    Furthermore, LLVM contains code from OpenBSD regex :
+
+    \badcode
+    $OpenBSD: COPYRIGHT,v 1.3 2003/06/02 20:18:36 millert Exp $
+
+    Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
+    This software is not subject to any license of the American Telephone
+    and Telegraph Company or of the Regents of the University of California.
+
+    Permission is granted to anyone to use this software for any purpose on
+    any computer system, and to alter it and redistribute it, subject
+    to the following restrictions:
+
+    1. The author is not responsible for the consequences of use of this
+       software, no matter how awful, even if they arise from flaws in it.
+
+    2. The origin of this software must not be misrepresented, either by
+       explicit claim or by omission.  Since few users ever read sources,
+       credits must appear in the documentation.
+
+    3. Altered versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.  Since few users
+       ever read sources, credits must appear in the documentation.
+
+    4. This notice may not be removed or altered.
+    \endcode
+
+    \badcode
+    Copyright (c) 1994
+    The Regents of the University of California.  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.
+    3. Neither the name of the University 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 REGENTS 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.
+
+    @(#)COPYRIGHT    8.1 (Berkeley) 3/16/94
+    \endcode
+
+    Furthermore, LLVM contains code from md5:
+
+    \badcode
+    This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
+    MD5 Message-Digest Algorithm (RFC 1321).
+
+    Homepage:
+    http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
+
+    Author:
+    Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
+
+    This software was written by Alexander Peslyak in 2001.  No copyright is
+    claimed, and the software is hereby placed in the public domain.
+    In case this attempt to disclaim copyright and place the software in the
+    public domain is deemed null and void, then the software is
+    Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+    general public under the following terms:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted.
+
+    There's ABSOLUTELY NO WARRANTY, express or implied.
+
+    (This is a heavily cut-down "BSD license".)
+
+    This differs from Colin Plumb's older public domain implementation in that
+    no exactly 32-bit integer data type is required (any 32-bit or wider
+    unsigned integer data type will do), there's no compile-time endianness
+    configuration, and the function prototypes match OpenSSL's.  No code from
+    Colin Plumb's implementation has been reused; this comment merely compares
+    the properties of the two independent implementations.
+
+    The primary goals of this implementation are portability and ease of use.
+    It is meant to be fast, but not as fast as possible.  Some known
+    optimizations are not included to reduce source code size and avoid
+    compile-time configuration.
+    \endcode
+*/
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index c234eb28..dd6b6fe7 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -1062,6 +1062,9 @@
   Refer to the \l{https://wiki.qt.io/WestonTouchScreenIssues}{Qt Wiki} for
   further information.
 
+  //! Qt Quick WebGL QPA Plugin
+  \include webgl.qdocinc webgl
+
   \section1 Related Topics
 
   \list
@@ -1069,4 +1072,5 @@
    \li \l Emulator
    \li \l{Qt Virtual Keyboard}
   \endlist
+
 */
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index 2ca9d651..c8f36653 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -26,21 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \page platform-notes-vxworks.html
-    \title Qt for VxWorks
-    \contentspage Platform and Compiler Notes
-    \keyword VxWorks
-    \ingroup supportedplatform
-    \brief Platform support for VxWorks (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/
-*/
-
-/*!
     \page platform-notes-qnx.html
     \title Platform and Compiler Notes - QNX
     \contentspage Platform and Compiler Notes
diff --git a/doc/src/platforms/qpa.qdoc b/doc/src/platforms/qpa.qdoc
index 80794bdb..61832895 100644
--- a/doc/src/platforms/qpa.qdoc
+++ b/doc/src/platforms/qpa.qdoc
@@ -183,5 +183,9 @@ The following table summarizes the platform plugins available for QPA:
     \li \c qxcb
     \li QXcbIntegrationPlugin
     \li \l{Qt for Linux/X11}{X Window System (X11) support}
+\row
+    \li \c webgl
+    \li QWebGLIntegrationPlugin
+    \li \l{Qt Quick WebGL}{WebGL} support for Qt Quick applications
 \endtable
 */
diff --git a/doc/src/platforms/vxworks.qdoc b/doc/src/platforms/vxworks.qdoc
index 2cea90e3..e7fc75de 100644
--- a/doc/src/platforms/vxworks.qdoc
+++ b/doc/src/platforms/vxworks.qdoc
@@ -28,6 +28,8 @@
 /*!
   \page vxworks.html
   \title Qt for VxWorks
+  \keyword VxWorks
+  \ingroup supportedplatform
 
   Qt for VxWorks is available only under a commercial license.
 
diff --git a/doc/src/platforms/webgl.qdocinc b/doc/src/platforms/webgl.qdocinc
new file mode 100644
index 00000000..fbff33e1
--- /dev/null
+++ b/doc/src/platforms/webgl.qdocinc
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 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$
+**
+****************************************************************************/
+/*!
+//! [webgl]
+
+\section1 Qt Quick WebGL
+
+The \e {Qt Quick WebGL} platform plugin allows for remote access by streaming
+Qt Quick user interfaces over the network. The UI is rendered in a
+WebGL™-enabled client browser.
+
+\note The Qt Quick WebGL plugin is currently provided as a
+      \e {Technology Preview}.
+
+\section2 Configuration and Use
+
+In order to use the Qt Quick WebGL plugin, Qt must be configured with
+OpenGL ES 2 support:
+
+\badcode
+./configure [...] -opengl es2
+\endcode
+
+The plugin depends on \l {Qt WebSockets}.
+
+You launch a Qt Quick application with the \e webgl platform plugin as
+follows:
+
+\badcode
+./qmlapplication -platform webgl
+\endcode
+
+This starts a lightweight web server on port 8080, that the client
+can connect to with a web browser that supports WebGL. The listening
+port can be configured as follows:
+
+\badcode
+./qmlapplication -platform webgl:port=80
+\endcode
+
+Keyboard, mouse, touch, and multi-touch events from the client are supported.
+
+\section2 Limitations
+
+\list
+    \li Streaming OpenGL® commands over the network imposes an amount of
+        delay compared to running the application locally.
+
+    \li Desktop applications that use \l {Qt Widgets} are not supported by the
+        plugin.
+
+    \li Text elements may not display correctly when the
+        \l {QtQuick::Text::renderType}{Text.NativeRendering} render type option
+        is set.
+
+    \li Only one active client per process is permitted. Subsequent clients
+        attempting to connect to the server will see a loading indicator until
+        the previous client disconnects.
+
+    \li Streaming audio is not supported.
+\endlist
+
+\note The \c webgl plugin requires a \l {Scene Graph and Rendering}
+      {threaded render loop}. On Windows and other platforms that use a
+      different render loop by default, set the \c QSG_RENDER_LOOP environment
+      variable accordingly:
+
+\badcode
+set QSG_RENDER_LOOP=threaded
+\endcode
+
+//! [webgl]
+*/
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 148b68e9..7a97e532 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -200,7 +200,7 @@ QML code is used in applications.
     \list
     \li \l{qtquick-qmlscene.html}{Prototyping with qmlscene}
     \li \l{qtquick-debugging.html}{Debugging QML Applications}
-    \li \l{qtquick-qtquicktest.html}{Qt Quick Test: QML Unit Testing Framework}
+    \li \l{Qt Quick Test}{Qt Quick Test: QML Unit Testing Framework}
     \endlist
 \endlist
 
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index dd54bad2..e230d42f 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -209,6 +209,11 @@
         \li \l{Qt for macOS}{\macos}
         \li Provides platform-specific APIs for \macos.
     \row
+        \li \l[QtNetworkAuth]{Qt Network Authorization}
+        \li All
+        \li All
+        \li Provides support for OAuth-based authorization to online services.
+    \row
         \li \l[QtNfc]{Qt NFC}
         \li All
         \li \l{Qt for Android}{Android} and \l{Qt for Linux/X11}{Linux}
@@ -293,6 +298,11 @@
         \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[QtSpeech]{Qt Speech}
+        \li All
+        \li
+        \li Provides support for accessibility features such as text-to-speech.
+    \row
         \li \l[QtSvg]{Qt SVG}
         \li All
         \li
@@ -408,10 +418,6 @@
     \header
         \li Module
         \li Description
-    \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.
     \row \li \l{Qt Remote Objects}
          \li Provides an easy to use mechanism for sharing a QObject's API
              (Properties/Signals/Slots) between processes or devices.
diff --git a/doc/src/testing.qdoc b/doc/src/testing.qdoc
index 660e3e7a..d66725b6 100644
--- a/doc/src/testing.qdoc
+++ b/doc/src/testing.qdoc
@@ -41,7 +41,7 @@ functions, or whole libraries.
 
 \list
 \li \l {Qt Test Overview}{Qt Test} (also known as \e testlib) - a framework for unit tests of C++ code
-\li \l {Qt Quick Test Reference Documentation}{Qt Quick Test} - a framework for unit tests of QML code
+\li \l {Qt Quick Test} - a framework for unit tests of QML code
 \endlist
 
 \section2 Autotests
diff --git a/doc/src/whatsnew/whatsnew510.qdoc b/doc/src/whatsnew/whatsnew510.qdoc
index 74ce9d00..8cef78dd 100644
--- a/doc/src/whatsnew/whatsnew510.qdoc
+++ b/doc/src/whatsnew/whatsnew510.qdoc
@@ -197,7 +197,7 @@
 
     \section1 New Modules
     \list
-        \li \l {Qt Network Authentication} - Provides support for OAuth1 and OAuth2.
+        \li \l {Qt Network Authorization} - Provides support for OAuth1 and OAuth2.
         \li \l {Qt Speech} - Enables text-to-speech in Qt Applications.
      \endlist
 
diff --git a/doc/src/whatsnew/whatsnew511.qdoc b/doc/src/whatsnew/whatsnew511.qdoc
index d821d7c4..5df7103a 100644
--- a/doc/src/whatsnew/whatsnew511.qdoc
+++ b/doc/src/whatsnew/whatsnew511.qdoc
@@ -162,6 +162,9 @@
         \li On Windows Desktop, the accessibility support was updated and
             vastly improved. The implementation is now based on Microsoft UI
             Automation (it was formerly based on Microsoft Active Accessibility).
+        \li The widgets themes available on Windows Desktop were updated to
+            better support High-DPI displays, including fixes for several
+            rendering issues, providing improved appearance and functionality.
         \li Linux Printing now supports more CUPS options with the advanced tab
             in QPrintPropertiesDialog, allowing many additional settings
             (amongst them arbitrary page ranges).
@@ -171,6 +174,11 @@
 
     \section2 Qt Widgets Module
     \list
+        \li Added quick text selection by mouse to QLineEdit.
+    \endlist
+
+    \section2 Qt Serial Bus Module
+    \list
         \li Added J2534 Pass-Thru CAN plugin for communication between a
             computer and a vehicle.
         \li Added description, serial number and channel to QCanBusDeviceInfo,
@@ -194,6 +202,7 @@
     \section1 Platform Changes
     \list
         \li MSVC2013 support removed from the code base.
+        \li Qt WebEngine now requires MSVC 2017 on Windows.
         \li QNX 6.6 no longer supported (note: QNX 7 remains fully supported).
         \li macOS 10.10 no longer supported.
         \li Improved Accessibility support on Win32 by adopting the Windows UI
diff --git a/doc/src/whatsnew/whatsnew59.qdoc b/doc/src/whatsnew/whatsnew59.qdoc
index 29ccad60..2c5af3b4 100644
--- a/doc/src/whatsnew/whatsnew59.qdoc
+++ b/doc/src/whatsnew/whatsnew59.qdoc
@@ -138,7 +138,7 @@
             entity based on distance from the observer or size on the screen. It
             comes with a convenience loader class that loads different QML
             files.
-        \li Made the \l Mesh type plugin based. It comes with plugins for the
+        \li Made the Mesh type plugin based. It comes with plugins for the
             Wavefront OBJ, PLY and FBX formats and makes it easy to add other
             formats.
         \li Added distance field based 2D textured text that can be freely