Hello community, here is the log from the commit of package libqt5-qtserialbus for openSUSE:Factory checked in at 2019-09-10 08:31:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialbus (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialbus" Tue Sep 10 08:31:56 2019 rev:15 rq:729218 version:5.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtserialbus/libqt5-qtserialbus.changes 2019-08-27 10:25:11.503924288 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.7948/libqt5-qtserialbus.changes 2019-09-10 08:32:00.617655941 +0200 @@ -1,0 +2,10 @@ +Fri Sep 6 08:04:29 UTC 2019 - Fabian Vogt <[email protected]> + +- Update to 5.13.1: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtserialbus.git/plain/dist/changes-5.13.1/?h=v5.13.1 +- Drop patches, now upstream: + * 0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch + +------------------------------------------------------------------- Old: ---- 0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch qtserialbus-everywhere-src-5.13.0.tar.xz New: ---- qtserialbus-everywhere-src-5.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtserialbus.spec ++++++ --- /var/tmp/diff_new_pack.XqS9V8/_old 2019-09-10 08:32:02.233655828 +0200 +++ /var/tmp/diff_new_pack.XqS9V8/_new 2019-09-10 08:32:02.237655827 +0200 @@ -19,20 +19,18 @@ %define qt5_snapshot 0 Name: libqt5-qtserialbus -Version: 5.13.0 +Version: 5.13.1 Release: 0 Summary: Qt 5 Serial Bus Addon License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.13.0 -%define so_version 5.13.0 -%define tar_version qtserialbus-everywhere-src-5.13.0 +%define real_version 5.13.1 +%define so_version 5.13.1 +%define tar_version qtserialbus-everywhere-src-5.13.1 Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch0: 0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5DBus-devel >= %{version} @@ -52,8 +50,7 @@ and others. %prep -%setup -q -n %{tar_version} -%patch0 -p1 +%autosetup -n %{tar_version} %package -n libQt5SerialBus5 Summary: Qt 5 Serial Bus Addon ++++++ qtserialbus-everywhere-src-5.13.0.tar.xz -> qtserialbus-everywhere-src-5.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/.qmake.conf new/qtserialbus-everywhere-src-5.13.1/.qmake.conf --- old/qtserialbus-everywhere-src-5.13.0/.qmake.conf 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/.qmake.conf 2019-08-06 06:16:14.000000000 +0200 @@ -2,4 +2,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.13.0 +MODULE_VERSION = 5.13.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/.tag new/qtserialbus-everywhere-src-5.13.1/.tag --- old/qtserialbus-everywhere-src-5.13.0/.tag 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/.tag 2019-08-06 06:16:14.000000000 +0200 @@ -1 +1 @@ -b18c452fdbe09c54caacb4323dea65b3746485e5 +bf3fe5100df93369997aa9bf3f9ca71c3a908cca diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/dist/changes-5.12.4 new/qtserialbus-everywhere-src-5.13.1/dist/changes-5.12.4 --- old/qtserialbus-everywhere-src-5.13.0/dist/changes-5.12.4 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/dist/changes-5.12.4 2019-08-06 06:16:14.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/dist/changes-5.13.1 new/qtserialbus-everywhere-src-5.13.1/dist/changes-5.13.1 --- old/qtserialbus-everywhere-src-5.13.0/dist/changes-5.13.1 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/dist/changes-5.13.1 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1,20 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +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.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qcanbusdevice_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qcanbusdeviceinfo_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbus_symbols_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusadu_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusclient_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbuscommevent_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusdevice_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusrtuserialmaster_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusrtuserialmaster_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusrtuserialmaster_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusrtuserialslave_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusrtuserialslave_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusrtuserialslave_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbusserver_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbustcpclient_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.0/QtSerialBus/private/qmodbustcpserver_p.h 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.0/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-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdevice_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qcanbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qcanbusdeviceinfo_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbus_symbols_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbus_symbols_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbus_symbols_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusadu_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusadu_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusadu_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusclient_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbuscommevent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbuscommevent_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbuscommevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusdevice_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialmaster_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialmaster_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialslave_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialslave_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialslave_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusrtuserialslave_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialslave_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbusserver_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpclient_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbustcpclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/5.13.1/QtSerialBus/private/qmodbustcpserver_p.h 2019-08-06 06:16:14.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbustcpserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/qtserialbusversion.h new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/qtserialbusversion.h --- old/qtserialbus-everywhere-src-5.13.0/include/QtSerialBus/qtserialbusversion.h 2019-06-17 14:33:13.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/include/QtSerialBus/qtserialbusversion.h 2019-09-03 13:49:46.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSERIALBUS_VERSION_H #define QT_QTSERIALBUS_VERSION_H -#define QTSERIALBUS_VERSION_STR "5.13.0" +#define QTSERIALBUS_VERSION_STR "5.13.1" -#define QTSERIALBUS_VERSION 0x050D00 +#define QTSERIALBUS_VERSION 0x050D01 #endif // QT_QTSERIALBUS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/src/plugins/canbus/socketcan/socketcanbackend.cpp new/qtserialbus-everywhere-src-5.13.1/src/plugins/canbus/socketcan/socketcanbackend.cpp --- old/qtserialbus-everywhere-src-5.13.0/src/plugins/canbus/socketcan/socketcanbackend.cpp 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/src/plugins/canbus/socketcan/socketcanbackend.cpp 2019-08-06 06:16:14.000000000 +0200 @@ -45,6 +45,7 @@ #include <linux/can/error.h> #include <linux/can/raw.h> +#include <linux/sockios.h> #include <errno.h> #include <unistd.h> #include <net/if.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/src/serialbus/doc/qtserialbus.qdocconf new/qtserialbus-everywhere-src-5.13.1/src/serialbus/doc/qtserialbus.qdocconf --- old/qtserialbus-everywhere-src-5.13.0/src/serialbus/doc/qtserialbus.qdocconf 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/src/serialbus/doc/qtserialbus.qdocconf 2019-08-06 06:16:14.000000000 +0200 @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtserialbus.qdocconf) project = QtSerialBus description = Qt Serial Bus Reference Documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/src/serialbus/doc/src/peakcan.qdoc new/qtserialbus-everywhere-src-5.13.1/src/serialbus/doc/src/peakcan.qdoc --- old/qtserialbus-everywhere-src-5.13.0/src/serialbus/doc/src/peakcan.qdoc 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/src/serialbus/doc/src/peakcan.qdoc 2019-08-06 06:16:14.000000000 +0200 @@ -96,10 +96,25 @@ \li Configuration parameter key \li Description \row + \li QCanBusDevice::CanFdKey + \li This configuration option determines whether CAN FD frames may be sent or + received. By default, this option is disabled. CAN FD compatible hardware + is needed to enable this option. + \row \li QCanBusDevice::BitRateKey \li Determines the bit rate of the CAN bus connection. The following bit rates are supported: 5000, 10000, 20000, 33000, 47000, 50000, 83000, 95000, - 100000, 125000, 250000, 500000, 800000, 1000000. Note that this configuration - parameter can only be adjusted while the QCanBusDevice is not connected. + 100000, 125000, 250000, 500000, 800000, 1000000. + If the QCanBusDevice::CanFdKey option is enabled, the bit rates are limited + to 125000, 250000, 500000, or 1000000. + Note that this configuration parameter can only be adjusted while the + QCanBusDevice is not connected. + \row + \li QCanBusDevice::DataBitRateKey + \li Determines the data bit rate of the CAN FD bus connection. The + QCanBusDevice::CanFdKey option must be enabled to allow setting this option. + Possible data bitrates are 2000000, 4000000, 8000000, or 10000000. Note that + this configuration parameter can only be adjusted while the QCanBusDevice is + not connected. \endtable */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/src/serialbus/qcanbusframe.cpp new/qtserialbus-everywhere-src-5.13.1/src/serialbus/qcanbusframe.cpp --- old/qtserialbus-everywhere-src-5.13.0/src/serialbus/qcanbusframe.cpp 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/src/serialbus/qcanbusframe.cpp 2019-08-06 06:16:14.000000000 +0200 @@ -80,9 +80,15 @@ /*! \fn QCanBusFrame::setFrameId(quint32 newFrameId) - Sets the identifier of the CAN frame to \a newFrameId. The maximum size of a CAN frame - identifier is 11 bits, which can be extended up to 29 bits by supporting the \e {CAN extended frame - format}. The \e {CAN extended frame format} setting is automatically adapted to match \a newFrameId. + Sets the identifier of the CAN frame to \a newFrameId. + + The maximum size of a CAN frame identifier is 11 bits, which can be + extended up to 29 bits by supporting the \e {CAN extended frame format}. + The \e {CAN extended frame format} setting is automatically set when a + \a newFrameId with more than 11 bits in size is given. + + When the format is extended and a \a newFrameId with up to 11 bits or less + is passed, the \e {CAN extended frame format} setting is \a not changed. \sa frameId(), hasExtendedFrameFormat() */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/src/serialbus/qmodbusreply.cpp new/qtserialbus-everywhere-src-5.13.1/src/serialbus/qmodbusreply.cpp --- old/qtserialbus-everywhere-src-5.13.0/src/serialbus/qmodbusreply.cpp 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/src/serialbus/qmodbusreply.cpp 2019-08-06 06:16:14.000000000 +0200 @@ -74,7 +74,7 @@ \value Common The reply originates from a common read, write or read/write request. See \l QModbusClient::sendReadRequest, \l QModbusClient::sendWriteRequest and \l QModbusClient::sendReadWriteRequest - \value Broadcast The replay originates from a Modbus broadcast request. The + \value Broadcast The reply originates from a Modbus broadcast request. The \l serverAddress() will return \c 0 and the \l finished() signal will be emitted immediately. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.13.0/tests/auto/auto.pro new/qtserialbus-everywhere-src-5.13.1/tests/auto/auto.pro --- old/qtserialbus-everywhere-src-5.13.0/tests/auto/auto.pro 2019-05-19 06:57:47.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.13.1/tests/auto/auto.pro 2019-08-06 06:16:14.000000000 +0200 @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += cmake \ qcanbusframe \ - qcanbus \ qcanbusdevice \ qmodbusdataunit \ qmodbusreply \ @@ -17,6 +16,8 @@ qtConfig(modbus-serialport): SUBDIRS += qmodbusrtuserialmaster +!android: SUBDIRS += qcanbus + qcanbus.depends += plugins qcanbusdevice.depends += plugins
