Hello community,
here is the log from the commit of package libqt5-qtserialbus for
openSUSE:Factory checked in at 2017-10-24 22:22:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialbus (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialbus"
Tue Oct 24 22:22:07 2017 rev:4 rq:533811 version:5.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtserialbus/libqt5-qtserialbus.changes
2017-07-09 13:04:10.659279033 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new/libqt5-qtserialbus.changes
2017-10-24 22:22:37.202539509 +0200
@@ -1,0 +2,7 @@
+Sun Oct 8 14:09:15 UTC 2017 - [email protected]
+
+- Update to 5.9.2
+ * For more details please see:
+ https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/
+
+-------------------------------------------------------------------
Old:
----
qtserialbus-opensource-src-5.9.1.tar.xz
New:
----
qtserialbus-opensource-src-5.9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtserialbus.spec ++++++
--- /var/tmp/diff_new_pack.oEUJj8/_old 2017-10-24 22:22:37.882507723 +0200
+++ /var/tmp/diff_new_pack.oEUJj8/_new 2017-10-24 22:22:37.882507723 +0200
@@ -19,15 +19,15 @@
%define qt5_snapshot 0
Name: libqt5-qtserialbus
-Version: 5.9.1
+Version: 5.9.2
Release: 0
Summary: Qt 5 Serial Bus Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.9.1
-%define so_version 5.9.1
+%define real_version 5.9.2
+%define so_version 5.9.2
%define tar_version qtserialbus-opensource-src-%{real_version}
Source:
https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
++++++ qtserialbus-opensource-src-5.9.1.tar.xz ->
qtserialbus-opensource-src-5.9.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.1/.qmake.conf
new/qtserialbus-opensource-src-5.9.2/.qmake.conf
--- old/qtserialbus-opensource-src-5.9.1/.qmake.conf 2017-06-22
13:47:04.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.2/.qmake.conf 2017-09-22
11:29:57.000000000 +0200
@@ -2,4 +2,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.9.1
+MODULE_VERSION = 5.9.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.1/.tag
new/qtserialbus-opensource-src-5.9.2/.tag
--- old/qtserialbus-opensource-src-5.9.1/.tag 2017-06-22 13:47:04.000000000
+0200
+++ new/qtserialbus-opensource-src-5.9.2/.tag 2017-09-22 11:29:57.000000000
+0200
@@ -1 +1 @@
-03470806dddcfed7249ad2bffb0940e29eea4b5a
+ce5a3ced5eeefe05675736d3279d4d45bbb6df90
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.1/dist/changes-5.6.3
new/qtserialbus-opensource-src-5.9.2/dist/changes-5.6.3
--- old/qtserialbus-opensource-src-5.9.1/dist/changes-5.6.3 1970-01-01
01:00:00.000000000 +0100
+++ new/qtserialbus-opensource-src-5.9.2/dist/changes-5.6.3 2017-09-22
11:29:57.000000000 +0200
@@ -0,0 +1,37 @@
+Qt 5.6.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.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.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+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.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSerialBus
+------
+
+ - Modbus:
+ * [QTBUG-54834] Fixed handling of packets with payloads longer than 127
+ bytes.
+ * [QTBUG-56009] Fixed stack overflow in QModbusRtuSerialMaster on close.
+ * [QTBUG-59050] Fixed use case when QModbusRtuSerialMaster would not close.
+ This was introduced by the fix for QTBUG-56009.
+
+ - CanBus:
+ * [QTBUG-51845] Ensured that QCanBusFrame integer members are initialised
+ with zero.
+ * Set unused can{fd}_frame fields to zero when writing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialbus-opensource-src-5.9.1/dist/changes-5.9.2
new/qtserialbus-opensource-src-5.9.2/dist/changes-5.9.2
--- old/qtserialbus-opensource-src-5.9.1/dist/changes-5.9.2 1970-01-01
01:00:00.000000000 +0100
+++ new/qtserialbus-opensource-src-5.9.2/dist/changes-5.9.2 2017-09-22
11:29:57.000000000 +0200
@@ -0,0 +1,34 @@
+Qt 5.9.2 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.2 Changes *
+****************************************************************************
+
+QtSerialBus
+------
+
+ - Modbus:
+ * [QTBUG-62421] Fixed the address counter for received Modbus register
+ entries in the Modbus Master Example.
+ * [QTBUG-62144] [QTBUG-62299] Fixed a crash due to unexpected state in
+ Modbus process queued element.
+
+- CanBus:
+ * Improved the connect/disconnect documentation for QCanBusDevice.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/examples/serialbus/modbus/master/mainwindow.cpp
new/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/mainwindow.cpp
---
old/qtserialbus-opensource-src-5.9.1/examples/serialbus/modbus/master/mainwindow.cpp
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/examples/serialbus/modbus/master/mainwindow.cpp
2017-09-22 11:29:57.000000000 +0200
@@ -243,7 +243,7 @@
if (reply->error() == QModbusDevice::NoError) {
const QModbusDataUnit unit = reply->result();
for (uint i = 0; i < unit.valueCount(); i++) {
- const QString entry = tr("Address: %1, Value:
%2").arg(unit.startAddress())
+ const QString entry = tr("Address: %1, Value:
%2").arg(unit.startAddress() + i)
.arg(QString::number(unit.value(i),
unit.registerType() <=
QModbusDataUnit::Coils ? 10 : 16));
ui->readValue->addItem(entry);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdevice_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdevice_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qcanbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdeviceinfo_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdeviceinfo_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdeviceinfo_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qcanbusdeviceinfo_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbus_symbols_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbus_symbols_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbus_symbols_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbus_symbols_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbus_symbols_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusadu_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusadu_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusadu_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusadu_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusadu_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusclient_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusclient_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusclient_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusclient_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbuscommevent_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbuscommevent_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbuscommevent_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbuscommevent_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbuscommevent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusdevice_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusdevice_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusrtuserialmaster_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialslave_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialslave_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialslave_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusrtuserialslave_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusrtuserialslave_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusserver_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusserver_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusserver_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbusserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbusserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpclient_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpclient_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpclient_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpclient_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbustcpclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpserver_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpserver_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpserver_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.1/QtSerialBus/private/qmodbustcpserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialbus/qmodbustcpserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdevice_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qcanbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qcanbusdeviceinfo_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbus_symbols_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbus_symbols_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusadu_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusadu_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusclient_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbuscommevent_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbuscommevent_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusdevice_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusdevice_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialmaster_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusrtuserialmaster_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusrtuserialslave_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusrtuserialslave_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbusserver_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbusserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpclient_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbustcpclient_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/5.9.2/QtSerialBus/private/qmodbustcpserver_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialbus/qmodbustcpserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/qtserialbusversion.h
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/qtserialbusversion.h
---
old/qtserialbus-opensource-src-5.9.1/include/QtSerialBus/qtserialbusversion.h
2017-06-29 01:47:12.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/include/QtSerialBus/qtserialbusversion.h
2017-10-04 09:13:33.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTSERIALBUS_VERSION_H
#define QT_QTSERIALBUS_VERSION_H
-#define QTSERIALBUS_VERSION_STR "5.9.1"
+#define QTSERIALBUS_VERSION_STR "5.9.2"
-#define QTSERIALBUS_VERSION 0x050901
+#define QTSERIALBUS_VERSION 0x050902
#endif // QT_QTSERIALBUS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/src/serialbus/qcanbusdevice.cpp
new/qtserialbus-opensource-src-5.9.2/src/serialbus/qcanbusdevice.cpp
--- old/qtserialbus-opensource-src-5.9.1/src/serialbus/qcanbusdevice.cpp
2017-06-22 13:47:04.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.2/src/serialbus/qcanbusdevice.cpp
2017-09-22 11:29:57.000000000 +0200
@@ -631,6 +631,8 @@
otherwise \c false.
This function calls \l open() as part of its implementation.
+
+ \sa disconnectDevice()
*/
bool QCanBusDevice::connectDevice()
{
@@ -658,6 +660,11 @@
Disconnects the device from the CAN bus.
This function calls \l close() as part of its implementation.
+
+ \note This function should only be called, if connectDevice()
+ returned \c true.
+
+ \sa connectDevice()
*/
void QCanBusDevice::disconnectDevice()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/src/serialbus/qcanbusframe.cpp
new/qtserialbus-opensource-src-5.9.2/src/serialbus/qcanbusframe.cpp
--- old/qtserialbus-opensource-src-5.9.1/src/serialbus/qcanbusframe.cpp
2017-06-22 13:47:04.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.2/src/serialbus/qcanbusframe.cpp
2017-09-22 11:29:57.000000000 +0200
@@ -385,8 +385,8 @@
break;
}
- const char *idFormat = hasExtendedFrameFormat() ? "%08X" : " %03X";
- const char *dlcFormat = hasFlexibleDataRateFormat() ? " [%02d]" : "
[%d]";
+ const char * const idFormat = hasExtendedFrameFormat() ? "%08X" : "
%03X";
+ const char * const dlcFormat = hasFlexibleDataRateFormat() ? " [%02d]" :
" [%d]";
QString result;
result.append(QString::asprintf(idFormat, static_cast<uint>(frameId())));
result.append(QString::asprintf(dlcFormat, payload().size()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/src/serialbus/qmodbusclient_p.h
new/qtserialbus-opensource-src-5.9.2/src/serialbus/qmodbusclient_p.h
--- old/qtserialbus-opensource-src-5.9.1/src/serialbus/qmodbusclient_p.h
2017-06-22 13:47:04.000000000 +0200
+++ new/qtserialbus-opensource-src-5.9.2/src/serialbus/qmodbusclient_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -110,7 +110,7 @@
{
if (timeout >= 0) {
// always the case for TCP
- timer.reset(new QTimer);
+ timer = QSharedPointer<QTimer>::create();
timer->setSingleShot(true);
timer->setInterval(timeout);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialbus-opensource-src-5.9.1/src/serialbus/qmodbusrtuserialmaster_p.h
new/qtserialbus-opensource-src-5.9.2/src/serialbus/qmodbusrtuserialmaster_p.h
---
old/qtserialbus-opensource-src-5.9.1/src/serialbus/qmodbusrtuserialmaster_p.h
2017-06-22 13:47:04.000000000 +0200
+++
new/qtserialbus-opensource-src-5.9.2/src/serialbus/qmodbusrtuserialmaster_p.h
2017-09-22 11:29:57.000000000 +0200
@@ -151,6 +151,9 @@
return;
}
+ if (m_state != State::Receive)
+ return;
+
m_sendTimer.stop();
m_responseTimer.stop();
processQueueElement(response, m_current);
@@ -327,6 +330,7 @@
m_current.reply->setError(QModbusDevice::TimeoutError,
QModbusClient::tr("Request timeout."));
}
+ m_current = QueueElement();
scheduleNextRequest();
} else {
m_serialPort->clear(QSerialPort::AllDirections);
