diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:53 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:53 +0200 |
commit | f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac (patch) | |
tree | e9eadad9147abb934cf4471760f2bf4d6feee0e7 | |
parent | 30794c6737a1105bdcd840e41ff374ece3bc60e1 (diff) | |
parent | ba122ea95e89ec6f687b9f0386a017cf281bcc40 (diff) | |
download | qtwebsockets-f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac.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 |
2 files changed, 21 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 7e57b5b..48a283a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -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 0000000..a285cd8 --- /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. |