diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:52:53 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:52:53 +0100 |
commit | 1de55623cdd960b164181870154b23d0d13007b5 (patch) | |
tree | 57abccc668a30481f17ebb874f6e3b694e3bfbe5 | |
parent | 9540cac57a7f67160b34f099e61aae62ce7d6657 (diff) | |
parent | 5c4b2eb41483bb6827f1e38d23eb11e2d60e8d6c (diff) |
Merge remote-tracking branch 'origin/5.12.6' into 5.12
Change-Id: I62a97f398bc622d9b988853cc320ae5a2717e80a
-rw-r--r-- | dist/changes-5.12.6 | 20 | ||||
-rw-r--r-- | doc/src/legal/licensechanges.qdoc | 10 |
2 files changed, 30 insertions, 0 deletions
diff --git a/dist/changes-5.12.6 b/dist/changes-5.12.6 new file mode 100644 index 000000000..ad5098e30 --- /dev/null +++ b/dist/changes-5.12.6 @@ -0,0 +1,20 @@ +Qt 5.12.6 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.5. + +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 8d0c3951d..a328b0ba3 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -34,6 +34,16 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.12.6 + + \section2 Qt GUI Module + + l{X Server helper} was added under X11 License and Historical Permission Notice and Disclaimer license. + + \section2 Qt SQL Module + + \l{SQLite} got updated to upstream version 3.29.0. + \section1 Qt 5.12.5 \section2 Qt GUI Module |