diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-09 09:03:07 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-09 09:11:28 +0200 |
commit | a6b5232ce32b3b019293fbbc8edd0cd8d4e3145c (patch) | |
tree | 25dd846f8d8678fbe6584da0d2f70110ebcdd80f | |
parent | bf10f7e76139a5d31c59c58b5431f3deb99afcaf (diff) | |
parent | 3c327b7c2d57cb876ff12bb870899c5ec12f6c85 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r-- | dist/changes-5.12.5 | 20 | ||||
-rw-r--r-- | doc/src/legal/licensechanges.qdoc | 11 | ||||
-rw-r--r-- | doc/src/platforms/linux.qdoc | 7 |
3 files changed, 38 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 29a95c594..b572a0c1a 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -84,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 8ad1b9a43..86c0b0fa0 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -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 |