Merge remote-tracking branch 'origin/5.12.2' into 5.12

Change-Id: I06014d1d05518145664d7a0628172a09eaf127eb

2 files changed, 67 insertions, 0 deletions

diff --git a/dist/changes-5.12.2 b/dist/changes-5.12.2
new file mode 100644
index 000000000..0c8bd8579
--- /dev/null
+++ b/dist/changes-5.12.2
@@ -0,0 +1,20 @@
+Qt 5.12.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.1.
+
+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/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 650b8af16..9cc992c70 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,53 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.12.2
+
+    \section2 Qt GUI Module
+
+    \list
+        \li \l{Freetype 2} got updated to upstream version 2.9.1.
+        \li \l{LibPNG} got updated to upstream version 1.6.36. libpng License 2
+        added at same time.
+    \endlist
+
+    \section2 Qt Image Formats
+
+    \l{WebP (libwebp)} got updated to upstream version 1.0.2.
+
+    \section1 Qt 5.12.1
+
+    \section2 Qt Core Module
+
+    \list
+        \li The version information for \l{FreeBSD} got updated.
+        \li The version information for \l{Secure Hash Algorithm SHA-3 - Keccak} got updated.
+        \li \l{UCD} got updated to upstream version 20.
+    \endlist
+
+    \section2 Qt GUI Module
+
+    \l{xkbcommon} was removed from 3rd party sources and we are not bundling that library any more.
+
+    \section2 Qt Image Formats
+
+    \list
+        \l{WebP (libwebp)} got updated to upstream version 1.0.1.
+        \l{libtiff} got updated to upstream version 4.0.10.
+    \endlist
+
+    \section2 Qt SQL Module
+
+    \l{SQLite} got updated to upstream version 3.26.0.
+
+    \section2 Qt Virtual Keyboard Module
+
+    The version information for \l{Lipi Toolkit} got updated.
+
+    \section2 Qt Wayland Compositor Module
+
+    The usage of \l{Wayland EGLStream Controller Protocol} under MIT license is now documented.
+
     \section1 Qt 5.12.0
 
     \section2 Qt 3D Module