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

Change-Id: Iad6cde5b05ad02a65a3e8960c8c951bdf2e2d442

6 files changed, 88 insertions, 22 deletions

diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 000000000..e8be9316f
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 000000000..57ebdbebd
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 7bc8134b7..a2bc7f018 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -58,7 +58,7 @@
                     \image landing/icon_Tools.png
                     \section1 Tools and Toolchains
                     \l{Internationalization with Qt}{Internationalization} support,
-                    \l{Qt for Embedded Linux}{embedded} toolchains, and more.
+                    \l{Qt for Embedded Linux}{embedded} toolchains, \l{Build with CMake}, and more.
                 \enddiv
                 \enddiv
                 \section1 Licenses Used in Qt
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 22fb4fe84..b572a0c1a 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,17 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.13.1
+
+    \section2 Qt Core Module
+
+    \l{Unicode Common Locale Data Repository (CLDR)} got updated to
+            upstream version v35.1
+
+    \section2 Qt Image Formats
+
+    \l{WebP (libwebp)} got updated to upstream version 1.0.3.
+
     \section1 Qt 5.13.0
 
     \section2 Qt Core Module
@@ -73,6 +84,17 @@
         License.
     \endlist
 
+    \section1 Qt 5.12.5
+
+    \section2 Qt GUI Module
+
+    Use of \l{Adobe Glyph List For New Fonts} under the \e{BSD-3-Clause}
+    license is now documented.
+
+    \section2 Qt Image Formats
+
+    \l{WebP (libwebp)} got updated to upstream version 1.0.3.
+
     \section1 Qt 5.12.4
 
     \section2 Qt GUI Module
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 9f61e3e32..86c0b0fa0 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -149,7 +149,7 @@
     \li libxcb-render
     \li X C Bindings for Render extension
     \li auto-detected or provided by -qt-xcb
-    \li 1.8.1
+    \li 1.9
     \row {id="OptionalColor"}
     \li xcb-render-util
     \li libxcb-render-util
@@ -161,31 +161,31 @@
     \li libxcb-shape
     \li X C Bindings for Shape extension
     \li auto-detected or provided by -qt-xcb
-    \li 1.8.1
+    \li 1.9
     \row {id="DefaultColor"}
     \li xcb-randr
     \li libxcb-randr
     \li X C Bindings for Resize and Rotate Extension
     \li auto-detected or provided by -qt-xcb
-    \li 1.8.1
+    \li 1.9
     \row {id="DefaultColor"}
     \li xcb-xfixes
     \li libxcb-xfixes
     \li X C Bindings for Fixes Extension
     \li auto-detected or provided by -qt-xcb
-    \li 1.8.1
+    \li 1.9
     \row {id="DefaultColor"}
     \li xcb-sync
     \li libxcb-sync
     \li X C Bindings for Sync Extension
     \li auto-detected or provided by -qt-xcb
-    \li 1.8.1
+    \li 1.9
     \row {id="DefaultColor"}
     \li xcb-shm
     \li libxcb-shm
     \li X C Bindings for Shared Memory Extension
     \li auto-detected or provided by -qt-xcb
-    \li 1.8.1
+    \li 1.9
     \row {id="DefaultColor"}
     \li xcb-icccm
     \li libxcb-icccm
@@ -206,6 +206,13 @@
     \li 0.3.9
 
     \row {id="OptionalColor"}
+    \li xkbcommon
+    \li libxkbcommon
+    \li Keymap handling
+    \li \tt{-xkbcommon} or auto-detected
+    \li 0.5.0
+
+    \row {id="OptionalColor"}
     \li Fontconfig
     \li libfontconfig
     \li Font customization and configuration
@@ -241,7 +248,7 @@
     \li libxcb
     \li X C Binding library
     \li
-    \li 1.8.1
+    \li 1.9
     \row {id="DefaultColor"}
     \li X11-xcb
     \li libX11-xcb
@@ -409,37 +416,33 @@
 
     \snippet snippets/code/doc_src_installation.qdoc 3
 
-        Note that on some systems the make utility is named differently,
-        e.g. gmake. The configure script tells you which make utility to
-        use.
+        Note that on some systems the make utility is named differently, like gmake.
+        The configure script tells you which make utility to use.
 
-        \note If you later need to reconfigure and rebuild Qt from the
-        same location, ensure that all traces of the previous configuration are
-        removed by entering the build directory and typing \c{make confclean}
-        before running \c configure again.
+        \note Later, if you need to reconfigure and rebuild Qt from the same location,
+        ensure that all traces of the previous configuration are removed. To do so, from
+        the build directory, type \c{make confclean} before running \c configure again.
 
     \section1 Step 4: Set the Environment Variables
 
-        In order to use Qt, some environment variables needs to be
-        extended.
+        To use Qt, some environment variables need to be extended.
 
     \snippet snippets/code/doc_src_installation.qdoc 4
 
-        This is done like this:
+        This is done as follows:
 
         In \c{.profile} (if your shell is bash, ksh, zsh or sh), add the
         following lines:
 
     \snippet snippets/code/doc_src_installation.qdoc 5
 
-        In \c{.login} (in case your shell is csh or tcsh), add the following line:
+        In \c{.login} (if your shell is csh or tcsh), add the following line:
 
     \snippet snippets/code/doc_src_installation.qdoc 6
 
-        If you use a different shell, please modify your environment
-        variables accordingly.
+        If you use a different shell, modify your environment variables accordingly.
 
-        For compilers that do not support rpath you must also extended the
+        For compilers that do not support rpath you must also extend the
         \c LD_LIBRARY_PATH environment variable to include
         \c{/usr/local/Qt-%VERSION%/lib}. On Linux with GCC this step
         is not needed.
diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc
index 19f541284..e382eb35d 100644
--- a/doc/src/reference.qdoc
+++ b/doc/src/reference.qdoc
@@ -51,6 +51,7 @@
     \li \l{Qt Designer Manual}{Qt Designer}
     \li \l{qmake Manual}{qmake}
     \li \l{QDoc Manual}{qdoc}
+    \li \l{Build with CMake}
     \endlist
 
     \section2 Value-Add Features