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 2023-03-17 17:03:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-serialbus (Old) and /work/SRC/openSUSE:Factory/.qt6-serialbus.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-serialbus" Fri Mar 17 17:03:26 2023 rev:12 rq:1072416 version:6.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-serialbus/qt6-serialbus.changes 2023-01-11 14:35:14.265293075 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-serialbus.new.31432/qt6-serialbus.changes 2023-03-17 17:04:06.949634314 +0100 @@ -1,0 +2,6 @@ +Thu Mar 16 10:00:08 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.4.3: + * https://www.qt.io/blog/qt-6.4.3-released + +------------------------------------------------------------------- Old: ---- qtserialbus-everywhere-src-6.4.2.tar.xz New: ---- qtserialbus-everywhere-src-6.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-serialbus.spec ++++++ --- /var/tmp/diff_new_pack.dSBXlU/_old 2023-03-17 17:04:07.517637289 +0100 +++ /var/tmp/diff_new_pack.dSBXlU/_new 2023-03-17 17:04:07.521637310 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.2 +%define real_version 6.4.3 %define short_version 6.4 %define tar_name qtserialbus-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-serialbus -Version: 6.4.2 +Version: 6.4.3 Release: 0 Summary: Qt 6 SerialBus library License: LGPL-3.0-only OR GPL-2.0-or-later @@ -103,8 +103,7 @@ %{qt6_link_executables} -%post -n libQt6SerialBus6 -p /sbin/ldconfig -%postun -n libQt6SerialBus6 -p /sbin/ldconfig +%ldconfig_scriptlets -n libQt6SerialBus6 %files %{_bindir}/canbusutil6 ++++++ qtserialbus-everywhere-src-6.4.2.tar.xz -> qtserialbus-everywhere-src-6.4.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtserialbus-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtserialbus-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2022-12-13 08:05:05.976460200 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT 2023-03-12 11:00:39.350241000 +0100 @@ -1061,6 +1061,7 @@ - Appendix 8: Intentionally left blank (optional) - Appendix 9: Support Terms - Appendix 10: Conversion from legacy Licenses to Subscription (optional) +- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY APPENDIX 1: LICENSED SOFTWARE @@ -1975,3 +1976,46 @@ will continue to make such payments in accordance with the applicable order documentation, notwithstanding the fact that the Current Licenses are being converted to Development Licenses pursuant to this Appendix. + +APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY +Version 1.0 + +Qt Insight Tracker Library ("Tracker Library") is a software module used to +collect end user data from Customer's Application and Devices relating to The +Qt Company's Qt Insight online service the Customer is ordering from The Qt +Company under a separate service agreement ("Service Agreement"). + +Unless otherwise set forth herein, definitions written in capital letters used +herein shall have the meaning set forth in the Service Agreement. + +Subject to these terms The Qt Company grants to Customer a worldwide, +non-exclusive, non-transferable, royalty-free, revocable (for cause) right and +license, valid for the term of the Service Agreement, to + (i) use, copy and modify Tracker Library for the purpose of including it + into the Devices and Applications and solely for the purpose of being + used only in conjunction with Insight Cloud or Insight Private Cloud, + and + (ii) distribute, by itself or through its Contractors, Tracker Library as + installed, incorporated, or integrated into Applications and/or + Devices. + +Use of Tracker Library in a way or for the purpose other than the above is +strictly prohibited. Tracker Library is licensed to the Customer in all +respects "as is". + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF +ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER +WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND +NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT +WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT +IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE +UNINTERRUPTED. +IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF +PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, +SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY +KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER +LIBRARY. + +THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO +EVENT EXCEED 10,000 EUROS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/.cmake.conf new/qtserialbus-everywhere-src-6.4.3/.cmake.conf --- old/qtserialbus-everywhere-src-6.4.2/.cmake.conf 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/.cmake.conf 2023-03-11 19:32:03.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.4.2") +set(QT_REPO_MODULE_VERSION "6.4.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/.tag new/qtserialbus-everywhere-src-6.4.3/.tag --- old/qtserialbus-everywhere-src-6.4.2/.tag 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/.tag 2023-03-11 19:32:03.000000000 +0100 @@ -1 +1 @@ -2b24135d47abb73b1040424a0d8cf5de98393b30 +73fd985610355823988b0bdfde28dce4a774ff2f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/dependencies.yaml new/qtserialbus-everywhere-src-6.4.3/dependencies.yaml --- old/qtserialbus-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/dependencies.yaml 2023-03-11 19:32:03.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f + ref: 519d2d8f442409e86a0ee2fa16bd543342180861 required: true ../qtserialport: - ref: a29d4f9bb7f6145a6bfe0a0bb3889412a7032bfb + ref: 139e061de1825d032ef9632bf4e0f4244aadcf98 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/examples/serialbus/modbus/client/mainwindow.cpp new/qtserialbus-everywhere-src-6.4.3/examples/serialbus/modbus/client/mainwindow.cpp --- old/qtserialbus-everywhere-src-6.4.2/examples/serialbus/modbus/client/mainwindow.cpp 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/examples/serialbus/modbus/client/mainwindow.cpp 2023-03-11 19:32:03.000000000 +0100 @@ -7,7 +7,9 @@ #include "writeregistermodel.h" #include <QModbusTcpClient> -#include <QModbusRtuSerialClient> +#if QT_CONFIG(modbus_serialport) +# include <QModbusRtuSerialClient> +#endif #include <QStandardItemModel> #include <QStatusBar> #include <QUrl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/examples/serialbus/modbus/server/mainwindow.cpp new/qtserialbus-everywhere-src-6.4.3/examples/serialbus/modbus/server/mainwindow.cpp --- old/qtserialbus-everywhere-src-6.4.2/examples/serialbus/modbus/server/mainwindow.cpp 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/examples/serialbus/modbus/server/mainwindow.cpp 2023-03-11 19:32:03.000000000 +0100 @@ -5,7 +5,9 @@ #include "settingsdialog.h" #include "ui_mainwindow.h" -#include <QModbusRtuSerialServer> +#if QT_CONFIG(modbus_serialport) +# include <QModbusRtuSerialServer> +#endif #include <QModbusTcpServer> #include <QRegularExpression> #include <QRegularExpressionValidator> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdevice_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qcanbusdeviceinfo_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbus_symbols_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusadu_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusclient_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbuscommevent_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusdevice_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialclient_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusrtuserialserver_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbusserver_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpclient_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.2/QtSerialBus/private/qmodbustcpserver_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.2/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.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdevice_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdevice_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qcanbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdeviceinfo_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdeviceinfo_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdeviceinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qcanbusdeviceinfo_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qcanbusdeviceinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbus_symbols_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbus_symbols_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbus_symbols_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbus_symbols_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -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.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusadu_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusadu_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusadu_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusadu_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusadu_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusclient_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusclient_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusclient_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbuscommevent_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbuscommevent_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbuscommevent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbuscommevent_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbuscommevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusdevice_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusdevice_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusdevice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusdevice_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusdevice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialclient_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialclient_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialclient_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialserver_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusrtuserialserver_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusrtuserialserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusserver_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbusserver_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbusserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpclient_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpclient_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpclient_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpclient_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbustcpclient_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/6.4.3/QtSerialBus/private/qmodbustcpserver_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/serialbus/qmodbustcpserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/qtserialbusversion.h new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/qtserialbusversion.h --- old/qtserialbus-everywhere-src-6.4.2/include/QtSerialBus/qtserialbusversion.h 2022-12-13 08:05:05.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/include/QtSerialBus/qtserialbusversion.h 2023-03-12 11:00:39.342240800 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSERIALBUS_VERSION_H #define QT_QTSERIALBUS_VERSION_H -#define QTSERIALBUS_VERSION_STR "6.4.2" +#define QTSERIALBUS_VERSION_STR "6.4.3" -#define QTSERIALBUS_VERSION 0x060402 +#define QTSERIALBUS_VERSION 0x060403 #endif // QT_QTSERIALBUS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/doc/src/peakcan.qdoc new/qtserialbus-everywhere-src-6.4.3/src/serialbus/doc/src/peakcan.qdoc --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/doc/src/peakcan.qdoc 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/doc/src/peakcan.qdoc 2023-03-11 19:32:03.000000000 +0100 @@ -12,7 +12,8 @@ This plugin requires the PCAN device drivers and the PCAN-Basic library version 4.4.0 or higher on Windows (pcanbasic.dll) resp. 4.0.0 on Linux (libpcanbasic.so). On macOS the plugin requires the PCBUSB library from - \l{http://www.mac-can.com}{UV Software}. + \l{http://www.mac-can.com}{UV Software}. For Qt versions from 5.14 up to + 6.4 (both including), only PCBUSB version 0.8.1 is supported. \note QCanBusDeviceInfo::alias() is only supported on Windows and with PCAN-Basic 4.4.0 or higher. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc new/qtserialbus-everywhere-src-6.4.3/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc 2023-03-11 19:32:03.000000000 +0100 @@ -7,6 +7,7 @@ \title Qt Serial Bus C++ Classes \ingroup modules \qtvariable serialbus + \qtcmakepackage SerialBus \since 5.8 \brief Provides classes to read and write serial bus data. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusdeviceinfo.cpp new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qcanbusdeviceinfo.cpp --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusdeviceinfo.cpp 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qcanbusdeviceinfo.cpp 2023-03-11 19:32:03.000000000 +0100 @@ -108,7 +108,7 @@ \note In contrast to serialNumber(), the alias is not guaranteed to be unique. - If that function is not supported by the CAN plugin, an empty string is returned. + If this function is not supported by the CAN plugin, an empty string is returned. \sa serialNumber() */ QString QCanBusDeviceInfo::alias() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusframe.cpp new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qcanbusframe.cpp --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qcanbusframe.cpp 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qcanbusframe.cpp 2023-03-11 19:32:03.000000000 +0100 @@ -417,7 +417,7 @@ /*! \relates QCanBusFrame Writes a \a frame to the stream (\a out) and returns a reference - to the it. + to it. */ QDataStream &operator<<(QDataStream &out, const QCanBusFrame &frame) { @@ -440,7 +440,7 @@ /*! \relates QCanBusFrame Reads a \a frame from the stream (\a in) and returns a - reference to the it. + reference to it. */ QDataStream &operator>>(QDataStream &in, QCanBusFrame &frame) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbusreply.cpp new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qmodbusreply.cpp --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbusreply.cpp 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qmodbusreply.cpp 2023-03-11 19:32:03.000000000 +0100 @@ -50,7 +50,7 @@ /*! Constructs a QModbusReply object with a given \a type and the specified \a parent. - The reply will be send to the Modbus client represented by + The reply will be sent to the Modbus client represented by \a serverAddress. */ QModbusReply::QModbusReply(ReplyType type, int serverAddress, QObject *parent) @@ -116,7 +116,7 @@ request then the returned \l QModbusDataUnit instance is invalid. \note If the \l type() of the reply is \l QModbusReply::Broadcast, the - return value will always be invalid. If the l type() of the reply is + return value will always be invalid. If the \l type() of the reply is \l QModbusReply::Raw, the return value might be invalid depending on the implementation of \l QModbusClient::processPrivateResponse(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpserver.cpp new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qmodbustcpserver.cpp --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpserver.cpp 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qmodbustcpserver.cpp 2023-03-11 19:32:03.000000000 +0100 @@ -98,7 +98,9 @@ if (d->m_tcpServer->isListening()) d->m_tcpServer->close(); - for (auto socket : std::as_const(d->connections)) + const auto childSockets = + d->m_tcpServer->findChildren<QTcpSocket *>(Qt::FindDirectChildrenOnly); + for (auto socket : childSockets) socket->disconnectFromHost(); setState(QModbusDevice::UnconnectedState); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpserver_p.h new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qmodbustcpserver_p.h --- old/qtserialbus-everywhere-src-6.4.2/src/serialbus/qmodbustcpserver_p.h 2022-12-12 15:31:35.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.4.3/src/serialbus/qmodbustcpserver_p.h 2023-03-11 19:32:03.000000000 +0100 @@ -99,17 +99,13 @@ return; } - connections.append(socket); - auto buffer = new QByteArray(); - QObject::connect(socket, &QObject::destroyed, q, [buffer]() { + QObject::connect(socket, &QObject::destroyed, socket, [buffer]() { // cleanup buffer delete buffer; }); QObject::connect(socket, &QTcpSocket::disconnected, q, [socket, this]() { - connections.removeAll(socket); - Q_Q(QModbusTcpServer); emit q->modbusClientDisconnected(socket); socket->deleteLater(); @@ -193,7 +189,6 @@ } QTcpServer *m_tcpServer { nullptr }; - QList<QTcpSocket *> connections; std::unique_ptr<QModbusTcpConnectionObserver> m_observer;
