summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-20 03:01:47 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-25 08:50:53 +0000
commit842dc086d41bfd1d9109c7b1147cd653bbd690ae (patch)
treef64b6489f3a5d41094c336791e4c77567e9572c1
parent4fe4d9664eff32568ff03868fc0cbe8b81ee3278 (diff)
parentbb513f3342a043577e073510aecb94ed7aa4aafc (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: doc/src/legal/licensechanges.qdoc Change-Id: Ic1dea52541a5f1ce88e1608e90f9dd1bb1b3ca72
-rw-r--r--dist/changes-5.12.320
-rw-r--r--doc/src/legal/licensechanges.qdoc7
2 files changed, 27 insertions, 0 deletions
diff --git a/dist/changes-5.12.3 b/dist/changes-5.12.3
new file mode 100644
index 000000000..88033201a
--- /dev/null
+++ b/dist/changes-5.12.3
@@ -0,0 +1,20 @@
+Qt 5.12.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.2.
+
+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 fb12a76d0..445dcb6d4 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -45,6 +45,13 @@
The \l{libdus-1 headers} got updated to upstream version 1.12.12.
+ \section1 Qt 5.12.3
+
+ \section2 Qt GUI Module
+
+ The license of \l{Wintab API} was now classified as 'Custom' instead of
+ 'Public Domain'.
+
\section1 Qt 5.12.2
\section2 Qt GUI Module