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

Change-Id: If8b9a7e6aba8e26ae80a3a36d4d4931df96db9e7

2 files changed, 31 insertions, 0 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/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 1fdd43612..8d0c3951d 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.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