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

Change-Id: I2031bc5164e466bc32077f77555ab5454d00a429

24 files changed, 412 insertions, 166 deletions

diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 01d381b7..4693fb1c 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -38,6 +38,7 @@ depends += \
     qtquick \
     qtquickcontrols \
     qtquickdialogs \
+    qtquickextras \
     qtquicklayouts \
     qtscript \
     qtscripttools \
@@ -58,7 +59,9 @@ depends += \
     qtwebkitexamples \
     qtx11extras \
     qtxml \
-    qtxmlpatterns
+    qtxmlpatterns \
+    qt3dcore \
+    qt3drender
 
 headerdirs  += ../src
 imagedirs   += ../src/images \
@@ -91,12 +94,15 @@ qhp.QtDoc.customFilters.Qt.filterAttributes = qtdoc $QT_VERSION
 qhp.QtDoc.subprojects         = classes qmltypes examples
 qhp.QtDoc.subprojects.classes.title = Classes
 qhp.QtDoc.subprojects.classes.indexTitle = All Classes
+qhp.QtDoc.subprojects.classes.selectors = class fake:headerfile
 qhp.QtDoc.subprojects.classes.sortPages = true
 qhp.QtDoc.subprojects.qmltypes.title = QML Types
 qhp.QtDoc.subprojects.qmltypes.indexTitle = All QML Types
+qhp.QtDoc.subprojects.qmltypes.selectors = qmlclass
 qhp.QtDoc.subprojects.qmltypes.sortPages = true
 qhp.QtDoc.subprojects.examples.title = Tutorials and Examples
 qhp.QtDoc.subprojects.examples.indexTitle = Qt Examples And Tutorials
+qhp.QtDoc.subprojects.examples.selectors = fake:example
 qhp.QtDoc.subprojects.examples.sortPages = true
 
 # Add an image used in example manifests to qhp
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 9a378096..98a5d0c7 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -248,20 +248,20 @@
     \section1 OpenGL Options for Windows
 
     On Windows, Qt can be configured with the system OpenGL or with \l{ANGLE}.
-    By default, configure uses ANGLE, which is bundled with the Qt
-    sources, but requires the DirectX SDK. Through ANGLE, OpenGL ES 2.0 is
-    mapped to DirectX APIs. OpenGL applications can then be deployed to Windows
-    computers with older OpenGL APIs, without requiring that the latest
-    OpenGL version be installed in the system.
+    By default, Qt is configured to use ANGLE, which is bundled with Qt and
+    depends on the DirectX SDK. ANGLE enables running Qt applications that
+    depend on OpenGL, without installing the latest OpenGL libraries.
 
-    The \c -opengl option configures Qt to use the OpenGL in the target system
-    or a different version of OpenGL ES.
+    The \c -opengl option can be used to configure Qt to use
+    the OpenGL in the target system, a different version of OpenGL ES (with or
+    without ANGLE), or dynamically switch between the available OpenGL
+    implementations.
 
     \code
     configure.bat -opengl desktop
     \endcode
 
-    With the \c desktop option, Qt uses the OpenGL installed in Windows,
+    With the \c desktop option, Qt uses the OpenGL installed on Windows,
     requiring that the OpenGL in the target Windows machine is compatible with
     the application. The \c -opengl option accepts two versions of OpenGL ES, \c
     es2 for OpenGL ES 2.0 or \c es1 for OpenGL ES Common Profile.
@@ -270,4 +270,8 @@
     configure.bat -opengl es2
     \endcode
 
+    You can also use \c{-opengl dynamic}, which enable applications to
+    dynamically switch between the available options at runtime. For more
+    details about the benefits of using dynamic GL-switching, see
+    \l{Graphics Drivers}.
 */
diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc
index 8d2c0513..08e482e0 100644
--- a/doc/src/development/cmake-manual.qdoc
+++ b/doc/src/development/cmake-manual.qdoc
@@ -96,7 +96,13 @@
     associated. They provide a list of plugins in the
     \c{Qt5}\e{<Module>}\c{_PLUGINS} variable.
 
-    \snippet snippets/cmake/CMakeLists.pro 7
+    \snippet snippets/cmake/CMakeLists.pro 5
+
+    \section2 Using Qt 5 with \c{CMake} older than 2.8.12
+
+    It is also necessary when using an older \c{CMake} to add Qt5<Module>_EXECUTABLE_COMPILE_FLAGS to
+    the CMAKE_CXX_FLAGS so that the -fPIC flags are added to the compile flags if necessary (as
+    is the default with Qt 5).
 
     \section2 Using Qt 5 with \c{CMake} older than 2.8.11
 
@@ -124,24 +130,6 @@
 
     \snippet snippets/cmake/CMakeLists.pro 4
 
-    It is also necessary when using an older \c{CMake} to add Qt5<Module>_EXECUTABLE_COMPILE_FLAGS to
-    the CMAKE_CXX_FLAGS so that the -fPIE flags are added to the compile flags if necessary (as
-    is the default with Qt 5).
-
-    If not using the \c{qt5_use_modules} macro, and if using CMake 2.8.9 or later, the
-    \l{CMake POSITION_INDEPENDENT_CODE Documentation}{POSITION_INDEPENDENT_CODE property} can be set on
-    targets using Qt instead, or it can be set globally for all targets. Note that this is not necessary
-    with CMake 2.8.11:
-
-    \snippet snippets/cmake/CMakeLists.pro 5
-
-    Note that it may be necessary to enable POSITION_INDEPENDENT_CODE globally in order to use try_compile
-    with Qt code, or any wrapper macros around it such as check_cxx_source_compiles etc.
-    As position independent code is a platform-specific and Qt-configuration-specific concept, the
-    Qt5_POSITION_INDEPENDENT_CODE property can be used to check whether it is required.
-
-    \snippet snippets/cmake/CMakeLists.pro 6
-
     \section1 Variable Reference
 
     \section2 Module variables
@@ -276,7 +264,7 @@
              In:  Directories sources ts_files
              Options: flags to pass to lupdate, such as -extensions to specify
              Extensions for a directory scan.
-             Generates commands to create .ts (vie lupdate) and .qm
+             Generates commands to create .ts (via lupdate) and .qm
              (via lrelease) - files from directories and/or sources. The ts files are
              created and/or updated in the source tree (unless given with full paths).
              The qm files are generated in the build tree.
diff --git a/doc/src/development/moc.qdoc b/doc/src/development/moc.qdoc
index 13f35235..6a609c1a 100644
--- a/doc/src/development/moc.qdoc
+++ b/doc/src/development/moc.qdoc
@@ -252,7 +252,7 @@
     \section1 Limitations
 
     \c moc does not handle all of C++. The main problem is that class
-    templates cannot have signals or slots. Here is an example:
+    templates cannot have the Q_OBJECT macro. Here is an example:
 
     \snippet snippets/code/doc_src_moc.cpp 5
 
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 2e0f0345..d678a2b0 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -165,13 +165,14 @@
         \endlist
     \enddiv
     \div {class="doc-column"}
-        \b{Peripheral Devices}
+        \b{Peripheral Devices and Location}
         \list
-        \li \l{Qt Serial Port Examples}{Serial Port Examples}
         \li \l{Qt Bluetooth Examples}{Bluetooth Examples}
+        \li \l{Qt Location Examples}{Location Examples}
         \li \l{Qt NFC Examples}{NFC Examples}
-        \li \l{Qt Sensors Examples}{Sensor Examples}
         \li \l{Qt Positioning Examples}{Positioning Examples}
+        \li \l{Qt Sensors Examples}{Sensor Examples}
+        \li \l{Qt Serial Port Examples}{Serial Port Examples}
         \endlist
     \enddiv
     \div {class="doc-column"}
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 3a8e8135..3eff9122 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -178,6 +178,12 @@
     \externalpage http://doc.qt.io/qtcreator/creator-configuring.html
     \title Configuring Qt Creator
 */
+
+/*!
+    \externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html#specifying-settings-for-packages
+    \title Android APK
+*/
+
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html
     \title Building and Running Example
@@ -234,11 +240,6 @@
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtQuickEnterpriseControls
-    \title Qt Quick Enterprise Controls
-*/
-
-/*!
     \externalpage http://doc.qt.io/QtVirtualKeyboard
     \title Qt Virtual Keyboard
 */
@@ -287,3 +288,13 @@
     \externalpage http://www.bluetooth.org
     \title Bluetooth SIG
 */
+
+/*!
+    \externalpage http://www.qt.io/qt-account/
+    \title Qt Account
+*/
+
+/*!
+    \externalpage http://doc.qt.io/vs-addin
+    \title Qt Visual Studio Add-in
+*/
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 4de68b19..0ae1e3ea 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -30,11 +30,14 @@
     \title Getting Started with Qt
     \brief A quick guide for developers
 
-    Qt Framework and tools can be installed using an online installer,
-    offline installers, or by building the source packages yourself.
-    The \e{online installers} give you the option to download or install only
-    certain modules or add-ons. An \e{offline installer} is a single package
-    which contains all of Qt and Add-Ons relevant for a target platform.
+    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}.
+
+    An \e{offline installer} is a single package that contains all of Qt and
+    Add-Ons relevant for a target platform.
 
     You can download Qt 5 installers from the \l Downloads page.
 
@@ -52,12 +55,18 @@
     \endlist
 
     After downloading, start the installer like any executable on the
-    development platform. Select the components that you want to install and
-    follow the instructions of the installation program to complete the
-    installation.
+    development platform.
+
+    To run the installer, you need a Qt Account. You can use your Qt Account
+    credentials to sign-in to all Qt services, including the forums and wiki.
+    If you do not already have a Qt Account, you can create one during the
+    installation process.
+
+    To complete the installation, select the components that you want to install
+    and follow the instructions of the installation program.
 
-    Use the Maintenance Tool under \e{<install_dir>} to add, update, or remove
-    installed components.
+    Use the Maintenance Tool under \e{<install_dir>} to add components and to
+    update or remove installed components.
 
     \section2 Platform Requirements
 
diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index 4a193b9e..ce958b90 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.qdoc
@@ -121,6 +121,9 @@ OpenGL into their applications.
     \li \l {http://www.khronos.org/opengl}{www.khronos.org/opengl} -
     The official OpenGL pages.
 
+    \li \l[QtCanvas3D]{Qt Canvas 3D} - An add-on module that provides a way to
+        make OpenGL-like 3D drawing calls from Qt Quick using JavaScript.
+
 \endlist
 
 Prior to Qt 5.0, OpenGL support in Qt was handled by the \l {Qt OpenGL}
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 601a7841..15cf78c4 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -351,17 +351,27 @@
 
     See \c qtimageformats/src/3rdparty/libmng/LICENSE for license details.
 
-    \section1 PNG Reference Library (libpng) version 1.5.10
+    \section1 PNG Reference Library (libpng) version 1.6.17
 
     \e{Libpng was written as a companion to the PNG specification, as a way
     of reducing the amount of time and effort it takes to support the PNG
     file format in application programs.} -- quoted from \c
     qtbase/src/3rdparty/libpng/libpng-manual.txt.
 
-    \hr
+    \badcode
+    This copy of the libpng notices is provided for your convenience.  In case of
+    any discrepancy between this copy and the notices in the file png.h that is
+    included in the libpng distribution, the latter shall prevail.
+
+    COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 
-    libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are
-    Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
+    If you modify libpng you may insert additional notices immediately following
+    this sentence.
+
+    This code is released under the libpng license.
+
+    libpng versions 1.2.6, August 15, 2004, through 1.6.17, March 26, 2015, are
+    Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are
     distributed according to the same disclaimer and license as libpng-1.2.5
     with the following individual added to the list of Contributing Authors
 
@@ -372,8 +382,8 @@
     distributed according to the same disclaimer and license as libpng-1.0.6
     with the following individuals added to the list of Contributing Authors
 
-       Simon-Pierre Cadieux\br
-       Eric S. Raymond\br
+       Simon-Pierre Cadieux
+       Eric S. Raymond
        Gilles Vollant
 
     and with the following additions to the disclaimer:
@@ -390,8 +400,8 @@
     distributed according to the same disclaimer and license as libpng-0.96,
     with the following individuals added to the list of Contributing Authors:
 
-       Tom Lane\br
-       Glenn Randers-Pehrson\br
+       Tom Lane
+       Glenn Randers-Pehrson
        Willem van Schaik
 
     libpng versions 0.89, June 1996, through 0.96, May 1997, are
@@ -399,11 +409,11 @@
     Distributed according to the same disclaimer and license as libpng-0.88,
     with the following individuals added to the list of Contributing Authors:
 
-       John Bowler\br
-       Kevin Bracey\br
-       Sam Bushell\br
-       Magnus Holmgren\br
-       Greg Roelofs\br
+       John Bowler
+       Kevin Bracey
+       Sam Bushell
+       Magnus Holmgren
+       Greg Roelofs
        Tom Tanner
 
     libpng versions 0.5, May 1995, through 0.88, January 1996, are
@@ -412,10 +422,10 @@
     For the purposes of this copyright and license, "Contributing Authors"
     is defined as the following set of individuals:
 
-       Andreas Dilger\br
-       Dave Martindale\br
-       Guy Eric Schalnat\br
-       Paul Schmidt\br
+       Andreas Dilger
+       Dave Martindale
+       Guy Eric Schalnat
+       Paul Schmidt
        Tim Wegner
 
     The PNG Reference Library is supplied "AS IS".  The Contributing Authors
@@ -444,7 +454,22 @@
     source code in a product, acknowledgment is not required but would be
     appreciated.
 
-    \hr
+
+    A "png_get_copyright" function is available, for convenient use in "about"
+    boxes and the like:
+
+       printf("%s",png_get_copyright(NULL));
+
+    Also, the PNG logo (in PNG format, of course) is supplied in the
+    files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+
+    Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
+    certification mark of the Open Source Initiative.
+
+    Glenn Randers-Pehrson
+    glennrp at users.sourceforge.net
+    March 26, 2015
+    \endcode
 
     See \c qtbase/src/3rdparty/libpng/LICENSE for license details.
 
@@ -1028,8 +1053,8 @@
     mentioned above being set in the cookie jar supported by Qt (by the
     QNetworkCookieJar class).
 
-    See \c qtbase/src/network/access/qnetworkcookiejartlds_p.h.INFO for more
-    information about how the list is used.
+    See \c qtbase/src/corelib/io/qurltlds_p.h.INFO for more information about
+    how the list is used.
 
 
     \section1 IAccessible2 IDL Specification
@@ -1949,7 +1974,7 @@
         \li From \c {qtwayland/src/3rdparty/protocol/wayland.xml}
     \endlist
 
-    \section1 WebP (libwebp) version 0.4.0
+    \section1 WebP (libwebp) version 0.4.3
 
     \e {WebP is a new image format that provides lossless and lossy
     compression for images on the web.}
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index d79b968a..c9bf05d3 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -93,10 +93,10 @@
     \table
     \header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes
 
-    \row \li {1,26} Qt Core
+    \row \li {1,28} Qt Core
 
-    \row \li \l{QCrashHandler class}{QCrashHandler}
-         \li Parts of implementation of QCrashHandler class. \li BSD-style \li
+    \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}
@@ -146,6 +146,9 @@
          \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 \li \li \li
 
     \row \li {1,12} Qt Gui
     \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
@@ -157,7 +160,7 @@
     \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.5.10}{PNG Reference Library}
+    \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
@@ -175,13 +178,6 @@
          \li Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library. \li BSD-style \li
     \row \li \li \li \li
 
-    \row \li {1,4} Qt Network
-
-    \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{The Public Suffix List}
-         \li A list of all known public Internet suffixes. \li Mozilla Public License \li
-    \row \li \li \li \li
-
     \row \li {1,4} Qt Multimedia
 
     \row \li {4,1} \b{Third-party Licenses}
@@ -302,7 +298,7 @@
          \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.0}{WebP}
+    \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
@@ -396,7 +392,7 @@
         \li \c {src/3rdparty/android/extract.h}
     \endlist
 
-    \section1 QCrashHandler class
+    \section1 QSegfaultHandler Class
 
     Copyright (c) 1998 by Bjorn Reese <breese@imada.ou.dk>
 
@@ -410,7 +406,8 @@
     CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
 
     \list
-    \li Parts of the QCrashHandler class
+    \li Parts of the QSegfaultHandler class in
+        \c {qtbase/src/corelib/kernel/qcrashhandler.cpp}.
     \endlist
 
     \section1 FreeType
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index c78d686c..33a75a40 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -253,18 +253,6 @@ application to Android using the qrc approach:
      \note QML documents can refer to the contents in qrc files using the
      relative path to the document. Such references do not require the
      "\c{qrc:}" or "\c{:/}" prefix.
- \li Update the "Run" settings for your project as described in the
-     \l{Qt Creator: Specifying Run Settings}
-
-     \note You can change the default settings for application icons and
-     identifier.
- \li If your application uses imports or plugins which depend on special Qt
-     modules, these Qt modules should be added to the .pro file. For example, if
-     your application uses the \l{Qt Multimedia} import in QML, you should add
-     the following to your .pro file:
-     \code
-     QT += multimedia
-     \endcode
  \li Save the changes to your project and run the application.
 \endlist
 
@@ -326,9 +314,9 @@ the APK:
  \li Run \c{make build_libs} to build the \c libcrypto and \c libssl shared
      libraries.
 
- \li Open your Qt project using Qt Creator and update the
-     "Deployment Configuration" under run settings to add \e libcrypto and
-     \e libssl as additional libraries required for your project.
+ \li Open your Qt project using Qt Creator and update the "Build Android APK"
+     settings to add \e libcrypto and \e libssl as additional libraries for
+     your project.
 
  \li Run your application to see it running on the device.
 \endlist
@@ -358,10 +346,9 @@ on Google Play:
  \li Open your application project using Qt Creator v3.0 or later and change
  its \uicontrol Build settings to build release version.
 
- \li Open \uicontrol Run settings of your project and select
- \uicontrol {Create AndroidManifest.xml}. Qt Creator adds the manifest XML
- based on the application's \e .pro file and opens it in \uicontrol General
- mode.
+ \li Select \uicontrol {Create Templates} under \uicontrol Build settings to
+ create the template files such as \e AndroidManifest.xml and other
+ resources.
 
  \note You can edit the \e AndroidManifest.xml in \uicontrol General or
  \uicontrol {XML Source} mode.
@@ -388,7 +375,8 @@ on Google Play:
  information on the manifest XML format, see \l{Android: App Manifest}.
 
  \li Set up a \uicontrol keystore to sign the \e .apk. You can create a new
- keystore if you do not have one.
+ keystore if you do not have one. For more details, see
+ \l{Android APK}{QtCreator: Specifying Settings for Packages}.
 
  \li Select \uicontrol{Open package location after build} and run your
  application to build the \e .apk. Qt Creator builds the \e .apk and opens the
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index e58f7cd1..ae4a7750 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -194,7 +194,10 @@
   optional, but very useful to avoid the need to set this environment variable
   in case there are more than one plugins present in the target system. In a
   desktop environment the KMS or the X11 backends are prioritized, depending on
-  the presence of the \c DISPLAY environment variable.
+  the presence of the \c DISPLAY environment variable. Note that on some boards
+  the special value of \c none will be used instead of an actual plugin. This
+  indicates that no special integration is necessary to use EGL with the
+  framebuffer and so no plugins should be loaded.
 
   \endlist
 
diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc
index ba1cf2cd..0b501d0d 100644
--- a/doc/src/platforms/platform-notes-android.qdoc
+++ b/doc/src/platforms/platform-notes-android.qdoc
@@ -129,16 +129,10 @@
 
     \section1 OpenGL Special Considerations
 
-    Qt for Android provides two separate platform plugins: One which is suited for traditional
-    \l{Qt Widgets}{widget-based} apps that do not require OpenGL support, and one which will be used
-    when OpenGL is required. When building and deploying your app, Qt Creator will detect whether the
-    OpenGL-enabled plugin is required by checking if your app depends on either the \l{Qt OpenGL}
-    module or the \l{Qt Quick} module.
-
-    There are some special considerations to be made when the OpenGL-enabled platform plugin is in
-    use. The plugin only supports full screen top-level windows. This means that even dialogs and popups
-    will be shown as full screen. There may also be drawing errors if you try to stack windows that
-    have animations or otherwise require updating their UI while they are obscured by another window.
+    There are some special considerations to be made when OpenGL is used. The platform plugin only
+    supports full screen top-level OpenGL windows. This means that even dialogs and popups will be
+    shown as full screen. There may also be drawing errors if you try to stack windows that have
+    animations or otherwise require updating their UI while they are obscured by another window.
 
     It is recommended that you try to avoid multiple top-level windows in the case of Android apps, as
     there is no traditional window system on this platform.
@@ -146,6 +140,15 @@
     \note Embedding a QGLWidget inside a widget hierarchy is not supported. When QGLWidget is in use,
     it must be the top-level widget.
 
+    \note Avoid using the legacy QGLWidget. For embedding OpenGL or Qt Quick content into a
+    widget-based user interface, prefer using QOpenGLWidget and QQuickWidget.
+
+    Modern devices often support OpenGL ES 3.0 or 3.1 in addition to 2.0. To get a suitable OpenGL
+    context, set the requested version via QSurfaceFormat::setVersion(). Note however that the
+    header files are only available in recent API levels, for example to include gl31.h, you need to
+    target API level 21. Keep in mind also that using OpenGL ES 3.x features will result in the
+    application breaking on older devices that only support 2.0.
+
     \section1 Multimedia Special Considerations
 
     \l{Qt Multimedia}, like the rest of Qt, supports Android versions 2.3.3 (API level 10) or later.
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index ac0e821c..76af7663 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -44,8 +44,6 @@
     \contentspage Platform and Compiler Notes
     \target QNX
 
-    \note QNX Neutrino RTOS is a community supported platform. See the \l{http://wiki.qt.io/Qnx}{related page} on the Qt Project wiki.
-
     \section1 Supported Architectures and QNX Releases
 
     From the perspective of an application development platform, Qt runs on top of
@@ -67,12 +65,12 @@
 
     For a specific list of available boards, displays and input devices, contact QNX Software
     Systems (info@qnx.com) or KDAB (qnx-info@kdab.com). Qt on the QNX Neutrino OS is also supported
-    by Qt Enterprise Embedded, \l {http://qt.digia.com/About-Us/Contact-Us/}{contact Digia Qt}
+    by Qt Enterprise Embedded, \l {http://www.qt.io/contact-us/}{contact The Qt Company}
     for more details.
 
     \section1 Supported Modules
 
-    Almost all Qt Essential \l{All Modules}{modules} and quite some add-ons are supported on
+    Almost all Qt Essential \l{All Modules}{modules} and some add-ons are supported on
     the QNX Neutrino RTOS. See the \l{http://wiki.qt.io/Qt_Status_on_QNX}
     {status page on the Qt Project wiki} for details.
 
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 27aba60a..06e189c3 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -91,7 +91,7 @@
 
     \section2 Visual Studio Add-in
 
-    The Qt Visual Studio Add-in allows programmers to create, build, debug
+    The \l {Qt Visual Studio Add-in} allows programmers to create, build, debug
     and run Qt applications from within non-Express versions of Microsoft Visual Studio
     2008, 2010, and 2012. The add-in contains project wizards, Qt project import/export
     support, integrated Qt resource manager and automated build setup for
@@ -597,23 +597,40 @@
     as well as the executable to the same directory tree in the \c release
     subdirectory.
 
-    In contrast to user plugins, Qt plugins have to be put into subdirectories
+    In contrast to user plugins, Qt plugins must be put into subdirectories
     matching the plugin type. The correct location for the platform plugin
     is a subdirectory named \c {platforms}. \l{Qt Plugins} section has
     additional information about plugins and how Qt searches for them.
 
-    Qt relies on the \l{ICU} library for unicode support. Therefore, you must
+    Qt relies on the \l{ICU} library for unicode support. You must
     include the ICU DLLs that are located in the \c bin directory of your Qt
     installation if Qt was configured to use ICU. The Qt version bundled in
     the Qt5 package uses ICU, so deployment is needed there. The ICU DLLs are
     version dependent and have to match the ones your Qt version was linked
     against.
 
-    If you are using \l{ANGLE} (the default) then you additionally
-    need to include both libEGL.dll and libGLESv2.dll from Qt's 'lib'
-    directory as well as the HLSL compiler from DirectX. The HLSL
-    compiler library is called d3dcompiler_XX.dll where XX is the
-    version number that ANGLE (libGLESv2) was linked against.
+    If \l{ANGLE} (the default) is used, you additionally need to include both
+    \c libEGL.dll and \c libGLESv2.dll from Qt's 'lib' directory as well as
+    the HLSL compiler from DirectX. The HLSL compiler library,
+    d3dcompiler_XX.dll, where XX is the version number that ANGLE (libGLESv2)
+    was linked against.
+
+    If your application depends on Qt WebEngine, you must deploy
+    \c{<Qt install path>/bin/QtWebEngineProcess.exe} to the application install
+    path. If you chose to deploy the binary to a different path, set the
+    \c QTWEBENGINEPROCESS_PATH environment variable to the binary's absolute
+    path (including its file name). This enables the application to find the
+    binary and execute it for every instance of QWebEngineView or
+    WebEngineView created. For example, a browser application with two tabs
+    open should have two separate processes of \c QtWebEngineProcess.exe
+    running. This is a common approach used by most modern web engines to
+    provide a stable browsing experience.
+
+    \note To support HTML5 videos, you must additionally deploy
+    \c ffmpegsumo.dll (WebM codec plugin) into the \c qtwebengine directory
+    under the application install path or under the path that the
+    \c PluginsPath variable was set to in
+    \c{<Qt install path>/<Qt version>/msvc2013/qt.conf}.
 
     Remember that if your application depends on compiler specific
     libraries, these must be redistributed along with your
diff --git a/doc/src/portingcppapps_toqt5.qdoc b/doc/src/portingcppapps_toqt5.qdoc
index 6cc062f4..9217217e 100644
--- a/doc/src/portingcppapps_toqt5.qdoc
+++ b/doc/src/portingcppapps_toqt5.qdoc
@@ -37,6 +37,8 @@ port the \l{Animated Tiles Example}{Animated Tiles} application to Qt 5:
    \li Open the Animated Tiles project using Qt Creator.
    \li Edit \c {main.cpp} and replace the \c {#include <QtGui>} instance with
        \c {#include <QtWidgets>}.
+       The Perl-script \c fixqt4headers.pl can be used to scan the source files
+       of a project and perform the replacements.
    \li Edit the \c {animatedtiles.pro} and add \c {QT += widgets} towards the
        end of the file.
        \note \l{Qt GUI} is included by default in all Qt applications unless excluded using the \c {QT -= gui} directive in the \c{qmake} project file.
@@ -61,6 +63,31 @@ step-by-step instructions take you through the changes required to achieve this:
    \li Save changes and run your application.
 \endlist
 
+For larger projects, we recommend initially enabling deprecated API by adding the define
+\code
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+\endcode
+to the \c{.pro} file. In a second step, the define can be removed.
+
+It is possible to keep the project compiling with Qt 4 and Qt 5. This requires:
+
+\list 1
+   \li Omitting the module name from all includes. This is done by passing
+       the command line option \c --strip-modules to \c fixqt4headers.pl.
+   \li Adding scopes depending on the version of Qt to the \c{.pro} files:
+       \code
+       greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+       \endcode
+   \li Introducing \c #if scopes around code using modified API:
+       \code
+       #if QT_VERSION >= 0x050000
+           headerView->setSectionResizeMode(QHeaderView::ResizeToContents);
+       #else
+           headerView->setResizeMode(QHeaderView::ResizeToContents);
+       #endif
+       \endcode
+\endlist
+
 \section1 Related Topics
 \list
 \li \l {C++ API Changes}
diff --git a/doc/src/qmlapp/debugging.qdoc b/doc/src/qmlapp/debugging.qdoc
index bd3814e5..6e781e90 100644
--- a/doc/src/qmlapp/debugging.qdoc
+++ b/doc/src/qmlapp/debugging.qdoc
@@ -34,6 +34,7 @@
 \section1 Console API
 
 \section2 Log
+\keyword console log
 
 \c console.log, console.debug, console.info, console.warn and console.error can be used to print
 debugging information to the console. For example:
@@ -48,6 +49,7 @@ The output is generated using the qDebug, qWarning, qCritical methods in C++
 (see also \l {Debugging Techniques}).
 
 \section2 Assert
+\keyword console assert
 
 \c console.assert tests that an expression is true. If not, it will write an optional message
 to the console and print the stack trace.
@@ -61,7 +63,8 @@ function f() {
 \endcode
 
 \section2 Timer
-
+\keyword console time
+\keyword console timeEnd
 \c console.time and console.timeEnd log the time (in milliseconds) that was spent between
 the calls. Both take a string argument that identifies the measurement. For example:
 
@@ -77,13 +80,14 @@ function f() {
 \endcode
 
 \section2 Trace
+\keyword console trace
 
 \c console.trace prints the stack trace of the JavaScript execution at the point where
 it was called. The stack trace info contains the function name, file name, line number
 and column number. The stack trace is limited to last 10 stack frames.
 
 \section2 Count
-
+\keyword console count
 \c console.count prints the current number of times a particular piece of code has been executed,
 along with a message. That is,
 
@@ -96,10 +100,11 @@ function f() {
 will print \c{f called: 1}, \c{f called: 2} ... whenever \c{f()} is executed.
 
 \section2 Profile
-
+\keyword console profile
 \c console.profile turns on the QML and JavaScript profilers. Nested calls are not
 supported and a warning will be printed to the console.
 
+\keyword console profileEnd
 \c console.profileEnd turns off the QML and JavaScript profilers. Calling this function
 without a previous call to console.profile will print a warning to the console. A
 profiling client should have been attached before this call to receive and store the
@@ -116,7 +121,7 @@ function f() {
 \endcode
 
 \section2 Exception
-
+\keyword console exception
 \c console.exception prints an error message together with the stack trace of JavaScript
 execution at the point where it is called.
 
@@ -145,7 +150,8 @@ QQmlImportDatabase::resolveType "Rectangle" = "QDeclarativeRectangle"
 \endcode
 
 \section1 QML Debugging Infrastructure
-
+\keyword declarative_debug
+\keyword qml debug
 The \l{Qt QML} module provides services for debugging, inspecting, and profiling
 applications via a TCP port.
 
diff --git a/doc/src/qmlapp/qtquicktest.qdoc b/doc/src/qmlapp/qtquicktest.qdoc
index 7fee0d65..2f653a44 100644
--- a/doc/src/qmlapp/qtquicktest.qdoc
+++ b/doc/src/qmlapp/qtquicktest.qdoc
@@ -108,8 +108,10 @@
     needed for shadow builds.
 
     If your test case needs QML imports, then you can add them as
-    \c{-import} options to the test program command-line by adding
-    the following line to your .pro file:
+    \c{-import} options to the test program command-line.
+
+    If IMPORTPATH is specified in your .pro file, each import path added to IMPORTPATH
+    will be passed as a command-line argument when the test is run using "make check":
 
     \code
     IMPORTPATH += $$PWD/../imports/my_module1 $$PWD/../imports/my_module2
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index dfc3007a..ad5b358a 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -503,6 +503,7 @@
 
     \section1 Related Topics
     \list
+    \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}
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 8055ff22..513e6fbf 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -92,11 +92,11 @@
         \li \l[QtTestLib]{Qt Test}
         \li Classes for unit testing Qt applications and libraries.
     \row
-        \li \l[QtWebKit]{Qt WebKit}
-        \li Classes for a WebKit2 based implementation and a new QML API.
-            See also Qt WebKit Widgets in the add-on modules.
+        \li \l[QtWebKit]{Qt WebKit} (Deprecated)
+        \li Classes for a WebKit2 based implementation and a QML API.
+            Deprecated in favor of \l[QtWebEngine]{Qt WebEngine}.
     \row
-        \li \l[QtWebKit]{Qt WebKit Widgets}
+        \li \l[QtWebKit]{Qt WebKit Widgets} (Deprecated)
         \li WebKit1 and QWidget-based classes from Qt 4.
     \row
         \li \l[QtWidgets]{Qt Widgets}
@@ -157,6 +157,12 @@
         \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} and \l{Qt for OS X}{OS X}
         \li Provides access to Bluetooth hardware.
     \row
+        \li \l[QtCanvas3D]{Qt Canvas 3D}
+        \li All
+        \li
+        \li Enables OpenGL-like 3D drawing calls from Qt Quick applications
+            using JavaScript.
+    \row
         \li \l[QtConcurrent]{Qt Concurrent}
         \li
         \li
@@ -212,14 +218,25 @@
         \li
         \li Classes to make printing easier and more portable.
     \row
-        \li \l{Qt Quick 1 Reference Documentation}{Qt Declarative}
+        \li \l{Qt Quick 1 Reference Documentation}{Qt Declarative} (Deprecated)
         \li All
         \li
         \li Qt Declarative is provided for \l{Qt 4.8 Reference Documentation}{Qt 4}
         compatibility. The documentation is available through the Qt 4.8
         \l{Qt Quick 1 Reference Documentation}{Qt Quick} documentation.
     \row
-        \li \l[QtScript]{Qt Script}
+        \li \l[QtQuickExtras]{Qt Quick Extras}
+        \li All
+        \li
+        \li Provides a specialized set of controls that can be used to build
+            interfaces in Qt Quick.
+    \row
+        \li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets}
+        \li All
+        \li
+        \li Provides a C++ widget class for displaying a Qt Quick user interface.
+    \row
+        \li \l[QtScript]{Qt Script} (Deprecated)
         \li All
         \li
         \li Classes for making Qt applications scriptable. Provided for Qt 4.x
@@ -312,8 +329,6 @@
     \row \li \l{Qt Quick Compiler}
          \li Enables compiling .qml source files into application binaries, improving load times
              and security for code assets.
-    \row \li \l{Qt Quick Enterprise Controls}
-         \li A set of advanced UI controls with an industry-specific look-and-feel.
     \row \li \l{Qt Data Visualization}
          \li UI Components for creating stunning 3D data visualizations.
     \row \li \l{Qt Purchasing}
@@ -339,8 +354,9 @@
     \row \li \l{Qt WebView}
          \li Displays web content in a QML application by using APIs native to the platform,
              without the need to include a full web browser stack.
-    \row \li \l{Qt Canvas 3D}
-         \li Enables OpenGL-like 3D drawing calls from Qt Quick applications using JavaScript.
+    \row \li \l[Qt3DCore]{Qt3D Module}{Qt3D}
+         \li Functionality for near-realtime simulation systems with support
+             for 2D and 3D rendering.
     \endtable
 
     \section1 Qt Tools
diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc
index d92a0695..f76dbf0c 100644
--- a/doc/src/reference.qdoc
+++ b/doc/src/reference.qdoc
@@ -58,7 +58,6 @@
     \li \l{Qt for Device Creation}
     \li \l{Qt Charts}
     \li \l{Qt Quick Compiler}
-    \li \l{Qt Quick Enterprise Controls}
     \li \l{Qt Data Visualization}
     \li \l{Qt Purchasing}
     \li \l{Qt Virtual Keyboard}
diff --git a/doc/src/snippets/cmake/CMakeLists.pro b/doc/src/snippets/cmake/CMakeLists.pro
index 5600e870..efdf4226 100644
--- a/doc/src/snippets/cmake/CMakeLists.pro
+++ b/doc/src/snippets/cmake/CMakeLists.pro
@@ -73,28 +73,8 @@ target_link_libraries(helloworld Qt5::Widgets)
 #! [4]
 
 #! [5]
-find_package(Qt5Core)
-
-add_executable(exe1 ${exe1_SRCS})
-# Set the POSITION_INDEPENDENT_CODE property for the exe1 target...
-set_target_properties(exe1 PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-# Or set it globally for all targets:
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-add_executable(exe2 ${exe2_SRCS})
-
-add_executable(exe3 ${exe3_SRCS})
-#! [5]
-
-#! [6]
-if (Qt5_POSITION_INDEPENDENT_CODE)
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-endif()
-#! [6]
-
-#! [7]
 foreach(plugin ${Qt5Network_PLUGINS})
   get_target_property(_loc ${plugin} LOCATION)
   message("Plugin ${plugin} is at location ${_loc}")
 endforeach()
-#! [7]
+#! [5]
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
index 764c0671..3a559436 100644
--- a/doc/src/snippets/code/doc_src_deployment.qdoc
+++ b/doc/src/snippets/code/doc_src_deployment.qdoc
@@ -41,7 +41,7 @@
 //! [0]
 cd /path/to/Qt
 ./configure -static -prefix /path/to/Qt <other parameters>
-make sub-src
+make
 //! [0]
 
 
diff --git a/doc/src/whatsnew/whatsnew55.qdoc b/doc/src/whatsnew/whatsnew55.qdoc
index 702957d2..22510555 100644
--- a/doc/src/whatsnew/whatsnew55.qdoc
+++ b/doc/src/whatsnew/whatsnew55.qdoc
@@ -33,7 +33,28 @@
     \section1 New Modules
 
     \list
+    \li \l[Qt3DCore]{Qt3D Module}{Qt 3D}
+    \list
+        \li Included as a technology preview.
+        \li C++ and QML APIs for easy inclusion of 3D graphics into Qt applications.
+        \li Supports OpenGL versions 2, 3 and 4, and OpenGL ES versions 2 and 3.
+        \li Data-driven renderer configuration.
+        \li Extensible beyond 3D graphics. Provides a full Entity Component System framework.
+        \li Supported platforms:
+        \list
+            \li Windows (not RT)
+            \li OS X
+            \li Linux/xcb
+            \li Android
+            \li Embedded Linux with ES 2
+            \li (Support for QNX and iOS planned)
+        \endlist
+    \endlist
     \li \l[QtLocation]{Qt Location}
+    \list
+        \li Included as a technology preview.
+        \li Adds mapping, (reverse-)geocoding, routing and place features to Qt.
+    \endlist
     \endlist
 
     \section1 New Features in Qt 5.5
@@ -45,11 +66,152 @@
     and \l{Qt for OS X}{OS X}
     \endlist
 
+    \section2 Qt Core Module
+    \list
+        \li Added a possibility to have Q_PROPERTY and Q_INVOKABLE within a Q_GADGET,
+            with a way to query the QMetaObject of such gadgets using the QMetaType
+            system.
+        \li Added Q_ENUM to replace Q_ENUMS, which allows to get a QMetaEnum at
+            compile time using QMetaEnum::fromType<T>. Such enums are now automatically
+            registered as metatypes, and can be converted to strings within QVariant,
+            or printed as string by qDebug().
+    \endlist
+
+    \section2 Qt GUI Module
+    \list
+        \li All Windows packages are now built with \c {-opengl dynamic}.
+            No OpenGL-only or ANGLE-only builds are provided anymore.
+        \li On Windows, the OpenGL implementation to use can now be configured
+            based on the GPU vendor and driver versions using JSON configuration
+            files. This allows shipping fine-grained card and driver blacklists
+            with the applications when necessary.
+        \li QImage: Added 8-bit alpha map and grayscale formats.
+    \endlist
+
+    \section2 Qt Multimedia Module
+    \list
+        \li Added GStreamer 1.0 support. Note that the default is still 0.10. Version
+            1.0 support can be enabled by configuring Qt with \c {-gstreamer 1.0}.
+        \li Added a new video filtering framework to integrate frameworks like OpenCV
+            or compute APIs such as OpenCL or CUDA with VideoOutput elements.
+        \li Added a new API to control camera viewfinder settings.
+        \li Improved camera support on iOS (focus, zoom, exposure, image and
+            viewfinder settings).
+        \li The QML MediaPlayer is now rendered in an OpenGL texture on iOS. This
+            means VideoOutput supports advanced transformation and shader effects,
+            and doesn't have to be always on top of other items anymore.
+    \endlist
+
     \section2 Qt NFC Module
     \list
     \li Ported to \l{Qt for Linux/X11}{Linux} using Neard v0.14 or later.
     \endlist
 
+    \section2 Qt Network Module
+    \list
+        \li Added a new SSL backend for iOS and OS X, based on Secure Transport.
+        \li Added support for \e libproxy.
+        \li Added support for TLS PSK ciphersuites.
+        \li Added support for elliptic curve certificates.
+        \li Added ability to select specific curves when using elliptic curve
+            ciphersuites.
+    \endlist
+
+    \section2 Qt Platform Abstraction (QPA)
+    \list
+        \li Added support for Raspberry Pi 2.
+        \li On supported desktops, the xcb plugin now uses the D-Bus based
+            \c org.kde.StatusNotifier protocol for system tray icons, and
+            \c org.freedesktop.Notifications for notifications.
+        \li Added a KMS/DRM backend for EGLFS. This replaces the now deprecated
+            KMS platform plugin. It allows running applications with eglfs on
+            the console on systems with Mesa and devices that come with DRM
+            support.
+        \li Added a plugin-based backend mechanism for EGLFS, in addition to
+            the existing, statically compiled-in solution. Most compiled-in
+            hooks are converted to be dynamically loaded plugins that are built
+            based on configure time tests. This reduces the reliance on the
+            device makespecs for Raspberry Pi, i.MX6 and Mali-based devices.
+        \li Input handling is now unified for EGLFS and LinuxFB, avoiding the
+            need to launch and configure LinuxFB-based applications differently
+            compared when using EGLFS.
+        \li \e tslib is now better integrated with EGLFS and LinuxFB to provide
+            support for resistive single-touch touchscreens often used in
+            industrial environments.
+        \li xcb is refactored to move GLX and EGL support into plugins.
+        \li Added a TUIO Touch plugin for receiving remote touch events via UDP.
+        \li Added a \e libinput plugin.
+        \li iOS: Added support into QFileDialog for browsing system photos using a
+            native image picker dialog. Selected photos can be loaded using QFile.
+    \endlist
+
+    \section2 Qt QML Module
+    \list
+        \li Added a possibility to conveniently expose custom C++ value types into
+            the JavaScript environment of QML and QJSEngine.
+        \li Added support for JavaScript typed arrays.
+        \li Various performance improvements, notably QJSValue.
+        \li Added a convenience qJsEngine(QObject*) getter function.
+    \endlist
+
+    \section2 Qt Quick Module
+    \list
+        \li Windows now defaults to the threaded Qt Quick render loop when using
+            desktop OpenGL (\c opengl32.dll).
+        \li Added support for threaded rendering in QQuickRenderControl.
+        \li Improved behavior of \l [QML] {Flickable} on OS X trackpads using
+            pixel deltas from native gestures.
+        \li Added support for PinchArea to handle native pinch gestures when the
+            OS provides them (so far, only on OS X).
+        \li Added a smart zoom signal to PinchArea to react to that gesture on an
+            OS X trackpad.
+        \li Added a \l {QtQuick::MouseArea::}{scrollGestureEnabled} property to
+            MouseArea to control whether native scroll gestures from the OS will
+            be handled by the wheel signal handler.
+    \endlist
+
+    \section2 Qt Quick Controls Module
+    \list
+        \li \l [QtQuickExtras]{Qt Quick Extras}, formerly Qt Quick Enterprise
+            Controls, was added under the QtQuick.Extras import.
+        \li Added a TreeView control for QAbstractItemModel-derived models.
+            Supports QItemSelectionModel selection.
+    \endlist
+
+    \section2 Qt WebEngine Module
+    \list
+        \li Added WebEngineProfile for controlling storage and cache paths and
+            related policies.
+        \li Added support for a JavaScript Geolocation API with \l[QtLocation]
+            {Qt Location} as a backend.
+        \li Added API for managing downloading of files.
+        \li Added API for controlling cache and cookie paths and policy.
+        \li Added API for WebEngine settings.
+        \li Various experimental QML APIs promoted to public.
+        \li Added QtWebChannel integration API over Chromium IPC.
+        \li Updated Chromium snapshot to version 40.
+    \endlist
+
+    \section2 Qt WebView Module
+    \list
+        \li Added native implementations for OS X.
+        \li Added API for running JavaScript (Requires API 19+ on Android).
+        \li Added API for setting the HTML content.
+        \li Added API for load status notifications.
+    \endlist
+
+    \section1 Deprecated Functionality
+
+    The following modules are deprecated in Qt 5.5:
+    \list
+        \li Qt WebKit
+        \li Qt Declarative (Qt Quick 1)
+        \li Qt Script
+    \endlist
+
+    These modules are still included in Qt 5.5, but are considered for removal
+    in future releases.
+
     \section1 List of API Changes
 
     The pages below contain a list of API changes in Qt 5.5: