Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: Ieff3a3c8a302268645c27f2cf2b566f9d4774fd1

20 files changed, 90 insertions, 41 deletions

diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0
new file mode 100644
index 000000000..07aff0133
--- /dev/null
+++ b/dist/changes-5.6.0
@@ -0,0 +1,37 @@
+Qt 5.6 introduces many new features and improvements along with bug fixes
+over the 5.5.x series. For more details, refer to the documentation
+included in this distribution. The documentation is also available online:
+
+  http://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 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.
+ - Improved documentation on Windows/Dynamically Loading Graphics Drivers.
+ - Updated HiDPI documentation.
+ - Improved embedded Linux documentation.
+ - Added documentation and links for new modules in Qt 5.6.
+ - Moved Qt Location and Qt WebView from technology preview modules to Qt
+   add-on modules.
+ - Added Qt Labs Controls, Qt Serial Bus, and Qt Wayland Compositor as
+   technology preview modules.
+ - Replaced references to Qt WebKit with Qt WebEngine where applicable,
+   and removed Qt WebKit documentation.
+ - Deprecated Qt Enginio documentation.
+ - Added automatically generated list of examples from all Qt modules.
+ - Updated license documentation for 3rd party libraries used in the new
+   Qt modules.
diff --git a/doc/config/images/qt-codesample.png b/doc/config/images/qt-codesample.png
index 6b76c0486..f261ed5ac 100644
--- a/doc/config/images/qt-codesample.png
+++ b/doc/config/images/qt-codesample.png
diff --git a/doc/images/landing/icon_QtCreator_78x78px.png b/doc/images/landing/icon_QtCreator_78x78px.png
index e3e86624c..d0347e155 100644
--- a/doc/images/landing/icon_QtCreator_78x78px.png
+++ b/doc/images/landing/icon_QtCreator_78x78px.png
diff --git a/doc/images/landing/icon_Qt_78x78px.png b/doc/images/landing/icon_Qt_78x78px.png
index 1d27892f2..260d3f188 100644
--- a/doc/images/landing/icon_Qt_78x78px.png
+++ b/doc/images/landing/icon_Qt_78x78px.png
diff --git a/doc/images/landing/icon_Tools.png b/doc/images/landing/icon_Tools.png
index d0c063aaa..803e0a955 100644
--- a/doc/images/landing/icon_Tools.png
+++ b/doc/images/landing/icon_Tools.png
diff --git a/doc/src/highdpi.qdoc b/doc/src/highdpi.qdoc
index 168bcf58d..01f7c3a56 100644
--- a/doc/src/highdpi.qdoc
+++ b/doc/src/highdpi.qdoc
@@ -157,9 +157,13 @@
             \note Non-integer scale factors may cause significant
             scaling/painting artifacts.
 
+         \li The application attribute \c Qt::AA_EnableHighDpiScaling, introduced in Qt 5.6,
+             enables automatic scaling based on the pixel density of the monitor.
+
          \li The application attribute \c Qt::AA_DisableHighDpiScaling, introduced in Qt 5.6,
              turns off all scaling. This is intended for applications that need to use
-             actual window system coordinates, regardless of environment variables.
+             actual window system coordinates, regardless of environment variables. This
+             attribute takes priority over Qt::AA_EnableHighDpiScaling.
 
         \li An experimental implementation of high-DPI scaling was introduced in Qt 5.4.
             It was enabled by the environment variable \c QT_DEVICE_PIXEL_RATIO, which
diff --git a/doc/src/images/activeqt-examples.png b/doc/src/images/activeqt-examples.png
index bda8ebaa7..e75e51875 100644
--- a/doc/src/images/activeqt-examples.png
+++ b/doc/src/images/activeqt-examples.png
diff --git a/doc/src/images/animatedtiles_snapshot.png b/doc/src/images/animatedtiles_snapshot.png
index c4736a445..11d77c535 100644
--- a/doc/src/images/animatedtiles_snapshot.png
+++ b/doc/src/images/animatedtiles_snapshot.png
diff --git a/doc/src/images/applicationwindow.png b/doc/src/images/applicationwindow.png
index 90111f724..478cdda50 100644
--- a/doc/src/images/applicationwindow.png
+++ b/doc/src/images/applicationwindow.png
diff --git a/doc/src/images/arrow.png b/doc/src/images/arrow.png
index 14978c2e5..20ee200f5 100644
--- a/doc/src/images/arrow.png
+++ b/doc/src/images/arrow.png
diff --git a/doc/src/images/deployment-windows-depends.png b/doc/src/images/deployment-windows-depends.png
index 6d0b36f4f..85ee29e69 100644
--- a/doc/src/images/deployment-windows-depends.png
+++ b/doc/src/images/deployment-windows-depends.png
diff --git a/doc/src/images/icon.png b/doc/src/images/icon.png
index cc2b6ac93..b482ff63d 100644
--- a/doc/src/images/icon.png
+++ b/doc/src/images/icon.png
diff --git a/doc/src/images/sql-examples.png b/doc/src/images/sql-examples.png
index e8d2b351a..7d81a1aaa 100644
--- a/doc/src/images/sql-examples.png
+++ b/doc/src/images/sql-examples.png
diff --git a/doc/src/images/threadvisual-example.png b/doc/src/images/threadvisual-example.png
index 2a4987471..415dcd75a 100644
--- a/doc/src/images/threadvisual-example.png
+++ b/doc/src/images/threadvisual-example.png
diff --git a/doc/src/images/tree.png b/doc/src/images/tree.png
index 3f046c9b2..8cd26db35 100644
--- a/doc/src/images/tree.png
+++ b/doc/src/images/tree.png
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index d3f564ed0..6c14042fc 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -2148,13 +2148,6 @@
     Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     \hr
-    \section1 DES (des.cpp)
-
-    Implementation of DES encryption for NTLM
-    Copyright 1997-2005 Simon Tatham.
-    This software is released under the MIT license.
-
-    \hr
     \section1 Bison Parser 2.3a
 
     A Bison parser, made by GNU Bison 2.3a.
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index ceeb0191a..cccaa86ef 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -93,8 +93,6 @@
          \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{DES (des.cpp)}{DES}
-         \li Implementation of DES encryption (des.cpp). \li MIT \li
     \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}
@@ -1170,15 +1168,6 @@
     \li The PCRE library in \c{qtbase/src/3rdparty/pcre}
     \endlist
 
-    \section1 DES (\c des.cpp)
-
-    \e{Implementation of DES encryption for NTLM}\br
-    \e{Copyright 1997-2005 Simon Tatham.}\br
-    \e{This software is released under the MIT license.}
-
-    See \c qtbase/src/3rdparty/des/des.cpp for more information about the terms and
-    conditions under which the code is supplied.
-
     \hr
     \b Licenses that apply to tests.
     \hr
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 1e7b9222d..acbab0ead 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -27,14 +27,14 @@
 
 /*!
 //! [embedded]
-\l {Qt for Embedded Linux}{Embedded Linux},
+Embedded Platforms: \l {Qt for Embedded Linux}{Embedded Linux},
 \l {Windows CE - Introduction to using Qt}{Windows Embedded (Compact and Standard)},
 \l {QNX},
 VxWorks
 //! [embedded]
 
 //! [mobile]
-\l {Qt for Android}{Android},
+Mobile Platforms: \l {Qt for Android}{Android},
 \l {Qt for iOS}{iOS},
 \l {Qt for WinRT}{WinRT}
 //! [mobile]
@@ -85,14 +85,15 @@ VxWorks
          \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} \li
+    \row \li {3,1} \header \li {3,1} \l {Qt for OS X}{OS X}
     \row \li Apple OS X \b 10.8, \b 10.9, \b 10.10, 10.11
          \li \b {Clang as provided by Apple}
          \li
+    \row \li Apple OS X 10.7
+         \li \li Deployment only
 
-    \row \li {3,1} \header \li {3,1} Embedded Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc embedded
-         \li
     \row \li Embedded Linux (iMX.6-armv7a)
          \li \b {arm-poky-linux-gnueabi-gcc 4.9.1}
          \li Yocto Project 1.7 'Dizzy', Ubuntu 14.04 (64-bit) host
@@ -106,9 +107,8 @@ VxWorks
          \li MSVC 2008
          \li Windows 7 host
 
-    \row \li {3,1} \header \li {3,1} Mobile Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc mobile
-         \li
     \row \li Windows Phone (arm)
          \li \b {MSVC 2013}
          \li Windows 8.1 host
@@ -170,7 +170,7 @@ VxWorks
          \li i686-apple-darwin11-llvm-gcc-4.2
          \li
 
-    \row \li {3,1} \header \li {3,1} Embedded Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc embedded
     \row \li Embedded Linux (arm-gnueabi)
          \li \b {arm-none-linux-gnueabi-gcc-4.4.1}
@@ -185,7 +185,7 @@ VxWorks
          \li \b {MSVC 2008}
          \li Windows 7 host
 
-    \row \li {3,1} \header \li {3,1} Mobile Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc mobile
     \row \li Windows Phone (arm)
          \li \b {MSVC 2013}
@@ -253,7 +253,7 @@ VxWorks
          \li \b i686-apple-darwin11-llvm-gcc-4.2
          \li
 
-    \row \li {3,1} \header \li {3,1} Embedded Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc embedded
     \row \li Embedded Linux (arm-gnueabi)
          \li \b {arm-none-linux-gnueabi-gcc-4.4.1}
@@ -268,7 +268,7 @@ VxWorks
          \li \b {MSVC 2008}
          \li Windows 7 host
 
-    \row \li {3,1} \header \li {3,1} Mobile Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc mobile
     \row \li Windows Phone (arm)
          \li \b {MSVC 2013}
@@ -338,7 +338,7 @@ VxWorks
     \row \li OS X 10.6
          \li \li Deployment only
 
-    \row \li {3,1} \header \li {3,1} Embedded Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc embedded
     \row \li Embedded Linux (arm-gnueabi)
          \li \b {arm-none-linux-gnueabi-gcc-4.4.1}
@@ -353,7 +353,7 @@ VxWorks
          \li \b {MSVC 2008}
          \li Windows 7 host
 
-    \row \li {3,1} \header \li {3,1} Mobile Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc mobile
     \row \li Windows Phone (arm)
          \li \b {MSVC 2013}
@@ -417,7 +417,7 @@ VxWorks
     \row \li OS X 10.6
          \li \li Deployment only
 
-    \row \li {3,1} \header \li {3,1} Embedded Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc embedded
     \row \li Embedded Linux (arm-gnueabi)
          \li \b {arm-none-linux-gnueabi-gcc-4.4.1}
@@ -429,7 +429,7 @@ VxWorks
          \li \b {MSVC 2008}
          \li Windows 7 host
 
-    \row \li {3,1} \header \li {3,1} Mobile Platforms:
+    \row \li {3,1} \header \li {3,1}
          \include supported-platforms.qdocinc mobile
     \row \li Windows Phone (arm)
          \li \b {MSVC 2013}
diff --git a/doc/src/platforms/winrt.qdoc b/doc/src/platforms/winrt.qdoc
index 96fcfe306..b9c4f3dbd 100644
--- a/doc/src/platforms/winrt.qdoc
+++ b/doc/src/platforms/winrt.qdoc
@@ -79,6 +79,32 @@
 
     \section1 Getting Started
 
+    \section2 Notes to Desktop Users
+
+    As WinRT applications run in a sandboxed environment, some restrictions should be taken
+    into account when considering porting or writing cross-platform applications:
+
+    \list
+        \li The class QProcess is not implemented (indicated by the macro \c QT_NO_PROCESS
+            being defined) as no subprocesses can be launched.
+        \li Some paths returned by QStandardPaths::writableLocation() may be empty.
+        \li A WinRT application may not do socket-based communication with another application
+            running on the same host (as this would violate the sandboxing).
+        \li Applications run in fullscreen mode only (see QStyleHints). On desktop,
+            the screen size varies as the application is resized.
+        \li There are no environment variables. Qt emulates the functionality
+            by maintaining the values locally, so that qputenv() and related
+            functions continue to work. All known variables influencing Qt can
+            be set in source code.
+        \li WinRT applications are UI applications by nature. This implies that
+            console type applications will have a window created internally,
+            which is always visible.
+        \li Applications should not exit programmatically. In particular, calling
+            exit() before the UI is shown causes a crash.
+        \li The WinRT clipboard is local to the application; it cannot be retrieved
+            by a desktop application.
+    \endlist
+
     \section2 Building Applications
 
     You can develop applications for WinRT just as any other Qt applications.
diff --git a/doc/src/whatsnew/whatsnew50.qdoc b/doc/src/whatsnew/whatsnew50.qdoc
index deca88bd3..deabd11b1 100644
--- a/doc/src/whatsnew/whatsnew50.qdoc
+++ b/doc/src/whatsnew/whatsnew50.qdoc
@@ -61,10 +61,10 @@
     \section2 New Classes for Windowing and Rendering
     A new set of enabler classes have been added, most importantly QWindow,
     QScreen, QSurfaceFormat, and QOpenGLContext. These are now used as backends
-    for the \l{Qt Widgets} module and by l\{Qt Quick} 2.
+    for the \l{Qt Widgets} module and by \l {Qt Quick} 2.
 
     \section2 OpenGL Classes
-    Most of the useful l\{Qt OpenGL} classes have been polished and moved into
+    Most of the useful \l {Qt OpenGL} classes have been polished and moved into
     \l{Qt GUI}. A few important ones are, QOpenGLFramebufferObject,
     QOpenGLShaderProgram, QOpenGLFunctions, and so on. For the complete list,
     refer to \l{Qt GUI C++ Classes}.
@@ -197,8 +197,8 @@
      \li New Canvas type for drawing, provides a HTML5 canvas-like API along
          with the following additional features:
      \list
-      \li Two render targets: \c{Canvas::Image}{Canvas.Image} and
-          \c{Canvas::FrameBufferObject}{Canvas.FramebufferObject}.
+      \li Two render targets: \l{QtQuick::Canvas::renderTarget}{Canvas.Image} and
+          \l{QtQuick::Canvas::renderTarget}{Canvas.FramebufferObject}.
       \li Background thread rendering.
       \li Tiled canvas rendering.
       \li Support for most of the HTML5 context2d APIs.
@@ -243,7 +243,7 @@
        \li \l{Text::}{minimumPixelSize} and \l{Text::}{minimumPointSize} properties
            can be used to specify a lower bound when auto-fitting.
       \endlist
-     \li \c {TextEdit::textFormat}{TextEdit.textFormat} property now defaults
+     \li \l {QtQuick::TextEdit::textFormat}{TextEdit.textFormat} property now defaults
          to \c PlainText instead  of \c AutoText.
      \li \l{TextInput} now has \c wrapMode and verticalAlignment properties.
      \li \c{TextInput.positionAt()} now takes \c y value.
@@ -345,8 +345,8 @@
       \li New \c{active} property delays instantiation of a Loader object’s
           item.
       \li New \c {setSource(JSObject)} method to specify initial property
-          values for the loaded item, similar to \c{Component::createObject}
-          {Component.createObject()}.
+          values for the loaded item, similar to
+          \l {QtQml::Component::createObject()} {Component.createObject()}.
       \li \c sourceChanged signal is now only emitted when the source changes
           and the \c sourceComponentChanged signal is now emitted when the
           \c sourceComponent is changed. Ealier, these signals were emitted by