diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:30:51 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:30:51 +0200 |
commit | 39a423fdc9bd0fbb6e5b0b4bf9681ab4c890ab00 (patch) | |
tree | 69a4b10e3ffded432f5dc8680a3bec5d5a7b6690 | |
parent | a49336c78a0b610b2dff25ecc1f292bdeefbfda7 (diff) | |
parent | 76a08e3d59a0ef7020464d73df6dd5a01e58c230 (diff) |
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: Ia3a8d9127ad41df57febb72b8f3a19c99f4296a9
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | dist/changes-5.12.4 | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 85f53bf..7446299 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,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..5bbc532 --- /dev/null +++ b/dist/changes-5.12.4 @@ -0,0 +1,29 @@ +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. + +**************************************************************************** +* Qt 5.12.4 Changes * +**************************************************************************** + +QtSerialBus +----------- + + - CAN Plugins + * Fixed the error message "Cannot configure TxEcho for open device" + when QCanBusDevice::ReceiveOwnKey was used in the SystecCAN plugin |