diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:32:00 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:32:00 +0200 |
commit | 4bde3f575a3180574c6c741437ce2fb4a692016e (patch) | |
tree | b8db067f36d277108cad167937afd05ea6c869b6 | |
parent | 9dc3bd8fea81a8e1bba751215c7ff0ebacdd1b92 (diff) | |
parent | 6db8f18db786a2e6d871c70c2958a7df79283f71 (diff) | |
download | qtdoc-4bde3f575a3180574c6c741437ce2fb4a692016e.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | dist/changes-5.12.4 | 20 | ||||
-rw-r--r-- | doc/src/legal/licensechanges.qdoc | 20 | ||||
-rw-r--r-- | doc/src/platforms/linux.qdoc | 1 |
4 files changed, 42 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1bf9543a..f1a6177b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.12.4 diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4 new file mode 100644 index 00000000..a285cd8e --- /dev/null +++ b/dist/changes-5.12.4 @@ -0,0 +1,20 @@ +Qt 5.12.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.3. + +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 40e78abe..1fdd4361 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -34,6 +34,26 @@ Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules} released with Qt that are relevant to licensing. + \section1 Qt 5.12.4 + + \section2 Qt GUI Module + + \l{LibPNG} got updated to upstream version 1.6.37. + + \section2 Qt Core Module + + \list + \li \l{PCRE2} got updated to upstream version 10.33 + \li \l{PCRE2 - Stack-less Just-In-Time Compiler} got updated to + upstream version 10.33 + \li \l{Unicode Common Locale Data Repository (CLDR)} got updated to + upstream version v35.1 + \endlist + + \section2 Qt SQL Module + + \l{SQLite} got updated to upstream version 3.28.0. + \section1 Qt 5.12.3 \section2 Qt GUI Module diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index 26b8e866..9f61e3e3 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -292,6 +292,7 @@ \li libxcb1-dev \li libx11-xcb-dev \li libxcb-glx0-dev + \li libxkbcommon-x11-dev \endlist Additionally, if you do not configure with -qt-xcb, you should also |