Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-serialbus for openSUSE:Factory checked in at 2022-06-20 15:37:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-serialbus (Old) and /work/SRC/openSUSE:Factory/.qt6-serialbus.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-serialbus" Mon Jun 20 15:37:40 2022 rev:7 rq:983750 version:6.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-serialbus/qt6-serialbus.changes 2022-04-20 16:56:17.918565243 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-serialbus.new.1548/qt6-serialbus.changes 2022-06-20 15:38:08.270935169 +0200 @@ -1,0 +2,6 @@ +Fri Jun 17 15:15:33 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 6.3.1: + * https://www.qt.io/blog/qt-6.3.1-released + +------------------------------------------------------------------- Old: ---- qtserialbus-everywhere-src-6.3.0.tar.xz New: ---- qtserialbus-everywhere-src-6.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-serialbus.spec ++++++ --- /var/tmp/diff_new_pack.VJUQEC/_old 2022-06-20 15:38:09.434936871 +0200 +++ /var/tmp/diff_new_pack.VJUQEC/_new 2022-06-20 15:38:09.438936877 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.3.0 +%define real_version 6.3.1 %define short_version 6.3 %define tar_name qtserialbus-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-serialbus -Version: 6.3.0 +Version: 6.3.1 Release: 0 Summary: Qt 6 SerialBus library License: LGPL-3.0-only OR GPL-2.0-or-later @@ -35,6 +35,7 @@ Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-serialbus-rpmlintrc BuildRequires: fdupes +BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: cmake(Qt6Core) BuildRequires: cmake(Qt6Gui) @@ -61,8 +62,8 @@ %package devel Summary: Qt 6 SerialBus library - Development files -Requires: libQt6SerialBus6 = %{version} Requires: %{name} = %{version} +Requires: libQt6SerialBus6 = %{version} Requires: cmake(Qt6Network) Requires: cmake(Qt6SerialPort) @@ -117,13 +118,13 @@ %files devel %{_qt6_cmakedir}/Qt6BuildInternals/StandaloneTests/QtSerialBusTestsConfig.cmake %{_qt6_cmakedir}/Qt6SerialBus/ -%{_qt6_cmakedir}/Qt6SerialBusTools/ %{_qt6_descriptionsdir}/SerialBus.json %{_qt6_includedir}/QtSerialBus/ %{_qt6_libdir}/libQt6SerialBus.prl %{_qt6_libdir}/libQt6SerialBus.so %{_qt6_metatypesdir}/qt6serialbus_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_serialbus.pri +%{_qt6_pkgconfigdir}/Qt6SerialBus.pc %exclude %{_qt6_includedir}/QtSerialBus/%{real_version}/ %files private-devel ++++++ qtserialbus-everywhere-src-6.3.0.tar.xz -> qtserialbus-everywhere-src-6.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/.cmake.conf new/qtserialbus-everywhere-src-6.3.1/.cmake.conf --- old/qtserialbus-everywhere-src-6.3.0/.cmake.conf 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/.cmake.conf 2022-06-06 03:28:00.000000000 +0200 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.3.0") -set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") +set(QT_REPO_MODULE_VERSION "6.3.1") +set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/.tag new/qtserialbus-everywhere-src-6.3.1/.tag --- old/qtserialbus-everywhere-src-6.3.0/.tag 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/.tag 2022-06-06 03:28:00.000000000 +0200 @@ -1 +1 @@ -e70e26805d99eaaf9050ec613eeb53c3eaec7fb9 +da85691035d132165f653725bee32f584bc5ec6b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/conanfile.py new/qtserialbus-everywhere-src-6.3.1/conanfile.py --- old/qtserialbus-everywhere-src-6.3.0/conanfile.py 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/conanfile.py 2022-06-06 03:28:00.000000000 +0200 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the release tools of the Qt Toolkit. @@ -63,8 +63,8 @@ def get_qt_leaf_module_options(self) -> Dict[str, Any]: """Implements abstractmethod from qt-conan-common.QtLeafModule""" - return {item.replace("-", "_"): ["yes", "no", None] for item in _qtserialbus_features} + return self._shared.convert_qt_features_to_conan_options(_qtserialbus_features) def get_qt_leaf_module_default_options(self) -> Dict[str, Any]: """Implements abstractmethod from qt-conan-common.QtLeafModule""" - return {item.replace("-", "_"): None for item in _qtserialbus_features} + return self._shared.convert_qt_features_to_default_conan_options(_qtserialbus_features) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/dependencies.yaml new/qtserialbus-everywhere-src-6.3.1/dependencies.yaml --- old/qtserialbus-everywhere-src-6.3.0/dependencies.yaml 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/dependencies.yaml 2022-06-06 03:28:00.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 9554d315aa74eaba1726405ee09117e2ebc6111f + ref: 8483dcde90f40cdfd0a0ec4245b03610b46b6cae required: true ../qtserialport: - ref: da602a3e43d7c5dae6c62e597284de9eba0f430e + ref: 51e896081c70c40bf2a02a8f4953e9b27b984bff required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qcanbusdevice_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qcanbusdeviceinfo_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbus_symbols_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusadu_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusclient_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbuscommevent_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusdevice_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialclient_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialclient_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialclient_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialclient_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusrtuserialclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialserver_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialserver_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialserver_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusrtuserialserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialbus/qmodbusrtuserialserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbusserver_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbustcpclient_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.0/QtSerialBus/private/qmodbustcpserver_p.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdevice_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qcanbusdeviceinfo_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbus_symbols_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbus_symbols_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusadu_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusadu_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusclient_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbuscommevent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbuscommevent_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusdevice_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialclient_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialclient_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialclient_p.h 2022-06-06 03:28:00.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialserver_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialserver_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusrtuserialserver_p.h 2022-06-06 03:28:00.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbusserver_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpclient_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/6.3.1/QtSerialBus/private/qmodbustcpserver_p.h 2022-06-06 03:28:00.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-6.3.0/include/QtSerialBus/qtserialbusversion.h new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/qtserialbusversion.h --- old/qtserialbus-everywhere-src-6.3.0/include/QtSerialBus/qtserialbusversion.h 2022-04-06 19:56:41.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/include/QtSerialBus/qtserialbusversion.h 2022-06-09 02:14:40.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSERIALBUS_VERSION_H #define QT_QTSERIALBUS_VERSION_H -#define QTSERIALBUS_VERSION_STR "6.3.0" +#define QTSERIALBUS_VERSION_STR "6.3.1" -#define QTSERIALBUS_VERSION 0x060300 +#define QTSERIALBUS_VERSION 0x060301 #endif // QT_QTSERIALBUS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/src/serialbus/qcanbusdeviceinfo.h new/qtserialbus-everywhere-src-6.3.1/src/serialbus/qcanbusdeviceinfo.h --- old/qtserialbus-everywhere-src-6.3.0/src/serialbus/qcanbusdeviceinfo.h 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/src/serialbus/qcanbusdeviceinfo.h 2022-06-06 03:28:00.000000000 +0200 @@ -57,7 +57,7 @@ void swap(QCanBusDeviceInfo &other) noexcept { - qSwap(d_ptr, other.d_ptr); + d_ptr.swap(other.d_ptr); } QCanBusDeviceInfo &operator=(const QCanBusDeviceInfo &other); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/src/serialbus/qmodbusclient.cpp new/qtserialbus-everywhere-src-6.3.1/src/serialbus/qmodbusclient.cpp --- old/qtserialbus-everywhere-src-6.3.0/src/serialbus/qmodbusclient.cpp 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/src/serialbus/qmodbusclient.cpp 2022-06-06 03:28:00.000000000 +0200 @@ -367,7 +367,7 @@ } QModbusDataUnit unit = element.unit; - if (!processResponse(pdu, &unit)) { + if (!q_func()->processResponse(pdu, &unit)) { element.reply->setError(QModbusDevice::UnknownError, QModbusClient::tr("An invalid response has been received.")); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/src/tools/CMakeLists.txt new/qtserialbus-everywhere-src-6.3.1/src/tools/CMakeLists.txt --- old/qtserialbus-everywhere-src-6.3.0/src/tools/CMakeLists.txt 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/src/tools/CMakeLists.txt 2022-06-06 03:28:00.000000000 +0200 @@ -1,3 +1,8 @@ -if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID)) - add_subdirectory(canbusutil) +if(android_app OR + (QT_FEATURE_commandlineparser + AND NOT ANDROID + AND NOT IOS + AND NOT WASM + AND NOT rtems)) + add_subdirectory(canbusutil) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.3.0/src/tools/canbusutil/CMakeLists.txt new/qtserialbus-everywhere-src-6.3.1/src/tools/canbusutil/CMakeLists.txt --- old/qtserialbus-everywhere-src-6.3.0/src/tools/canbusutil/CMakeLists.txt 2022-04-05 17:42:29.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.3.1/src/tools/canbusutil/CMakeLists.txt 2022-06-06 03:28:00.000000000 +0200 @@ -2,10 +2,8 @@ ## canbusutil Tool: ##################################################################### -qt_get_tool_target_name(target_name canbusutil) -qt_internal_add_tool(${target_name} +qt_internal_add_app(canbusutil TARGET_DESCRIPTION "Qt CAN Bus Util" - TOOLS_TARGET SerialBus SOURCES canbusutil.cpp canbusutil.h main.cpp @@ -15,4 +13,4 @@ Qt::Network Qt::SerialBus ) -qt_internal_return_unless_building_tools() +set_target_properties(canbusutil PROPERTIES WIN32_EXECUTABLE FALSE)
