From 018fb7c43f1ee795a24bb03adb733f4545a37626 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 30 May 2018 12:38:59 +0200 Subject: tst_qmodbusclient: Fix inconsistent overrides Add override to processResponse(), fixing: \tst_qmodbusclient.cpp(70,10): warning: 'processResponse' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] bool processResponse(const QModbusResponse &response, QModbusDataUnit *data) Change-Id: Ie12af6914647c0a078189f85af1d3b037828eb6e Reviewed-by: Karsten Heimrich --- tests/auto/qmodbusclient/tst_qmodbusclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp index a6fd8ed..5e4a729 100644 --- a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp +++ b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp @@ -67,7 +67,7 @@ public: d_func()->m_open = true; setState(QModbusDevice::UnconnectedState); } - bool processResponse(const QModbusResponse &response, QModbusDataUnit *data) + bool processResponse(const QModbusResponse &response, QModbusDataUnit *data) override { return QModbusClient::processResponse(response, data); } -- cgit v1.2.3 From 28d1853b4b6598ec4f2c91d781efad96c67facac Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 31 May 2018 14:05:05 +0200 Subject: Bump version Change-Id: I3c3f593bca8588a1931f0fa265cb593bb7631c3b --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index c9d5d20..692e929 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.11.0 +MODULE_VERSION = 5.11.1 -- cgit v1.2.3 From 6f2875071dbc91fc54134be5ad724e6960957332 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 16 Mar 2018 14:09:16 +0200 Subject: Add changes file for Qt 5.9.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic8a343394048d5c267ab4aa50bb20ef722788f3c Reviewed-by: André Hartmann (cherry picked from commit df1c204a5214b2d77901572d9de2576f90662a09) --- dist/changes-5.9.5 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.9.5 diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5 new file mode 100644 index 0000000..8df339e --- /dev/null +++ b/dist/changes-5.9.5 @@ -0,0 +1,24 @@ +Qt 5.9.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.9 will continue to run with 5.9. + +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.9.5 Changes * +**************************************************************************** + + - This release contains only minor code improvements. -- cgit v1.2.3 From da0d7d591c9406e436e69def16f74c649956bca0 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sun, 27 May 2018 20:21:26 +0200 Subject: Add changes file for Qt 5.9.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id08a15b9c9425fe0b7c49e6f73318afb8fc23ff8 Reviewed-by: Alex Blasche (cherry picked from commit 6654d88750cf5431086fe1d3187ec87f52533b18) Reviewed-by: André Hartmann --- dist/changes-5.9.6 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 dist/changes-5.9.6 diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6 new file mode 100644 index 0000000..8212e34 --- /dev/null +++ b/dist/changes-5.9.6 @@ -0,0 +1,28 @@ +Qt 5.9.6 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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.9.6 Changes * +**************************************************************************** + +CAN bus +------- + + - [QTBUG-67030] Fixed a receive problem in the VectorCAN plugin. When + multiple channels were open, only the first one could receive frames. -- cgit v1.2.3