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

Change-Id: I1db347184bc117074027e4717851cef734f6b4cd

5 files changed, 77 insertions, 0 deletions

diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2
new file mode 100644
index 00000000..8efdf5ea
--- /dev/null
+++ b/dist/changes-5.11.2
@@ -0,0 +1,24 @@
+Qt 5.11.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+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.2 Changes                           *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 56cae67a..8c594f26 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,41 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.11.2
+
+    \section2 Qt Core Module
+
+    \l{PCRE2} got updated to upstream version 10.31.
+
+    \section2 Qt GUI Module
+
+    \list
+        \li The copyright information for \l{HarfBuzz} got updated.
+        \li The copyright information for
+            \l{Anti-aliasing rasterizer from FreeType 2} got updated.
+    \endlist
+
+    \section2 Qt Location Module
+
+    The copyright information and description of
+    \l{Clipper Polygon Clipping Library} got updated.
+
+    \section2 Qt SQL Module
+
+    \l{SQLite} got updated to upstream version 3.24.0.
+
+    \section2 Qt WebEngine Module
+
+    \list
+        \li Chromium received backported security fixes from Chromium up to version
+            68.0.3440.75.
+        \li The \l{WebEngine StyleSheet Browser Example}, \l{WebEngine Widgets Simple Browser Example},
+            \l{WebEngine Quick Nano Browser}, and \l{WebEngine Cookie Browser Example}
+            use images from the Tango Icon Library. This is now documented.
+        \li \l{Marked (WebEngine RecipeBrowser example)} got updated to upstream
+            version 0.4.0.
+    \endlist
+
     \section1 Qt 5.11.1
 
     \section2 Qt 3D Module
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 9e72166b..6827cd8e 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -342,6 +342,11 @@
 
     \l{Qt WebEngine} has additional build requirements which are listed in the
     \l{Qt WebEngine Platform Notes}.
+
+    \section1 QDoc Dependencies
+    Since version 5.11, \l {QDoc Manual}{QDoc} uses Clang to parse C++ code.
+    If you wish to build QDoc manually, refer to \l {Installing Clang for QDoc}
+    for specific build requirements.
 */
 
 /*!
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index c08388a6..1afb5294 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -183,6 +183,11 @@
 
     Qt 5 does not support OS X on PowerPC.
 
+    \section1 QDoc Dependencies
+    Since version 5.11, \l {QDoc Manual}{QDoc} uses Clang to parse C++ code.
+    If you wish to build QDoc manually, refer to \l {Installing Clang for QDoc}
+    for specific build requirements.
+
 */
 
 /*!
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index de94e726..f78df48e 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -438,10 +438,18 @@
     using the clang-cl tool to build Qt. Clang 3.8 does not support precompiled
     headers.
 
+    \sa {QDoc Dependencies}
+
     \section2 Building Qt WebEngine
 
     \l{Qt WebEngine} has additional build requirements which are listed in the
     \l{Qt WebEngine Platform Notes}.
+
+    \section1 QDoc Dependencies
+    Since version 5.11, \l {QDoc Manual}{QDoc} uses Clang to parse C++ code.
+    If you wish to build QDoc manually, refer to \l {Installing Clang for QDoc}
+    for specific build requirements.
+
 */
 
 /*!