Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-remoteobjects for openSUSE:Factory checked in at 2021-12-08 22:09:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-remoteobjects (Old) and /work/SRC/openSUSE:Factory/.qt6-remoteobjects.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-remoteobjects" Wed Dec 8 22:09:07 2021 rev:3 rq:936315 version:6.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-remoteobjects/qt6-remoteobjects.changes 2021-11-04 16:09:35.869047822 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-remoteobjects.new.31177/qt6-remoteobjects.changes 2021-12-08 22:10:03.542893639 +0100 @@ -1,0 +2,8 @@ +Wed Dec 1 10:06:19 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 6.2.2 + * https://www.qt.io/blog/qt-6.2.2-released +- Make sure all dependencies are present when installing devel + packages. Qt >= 6.2.2 is much less permissive. + +------------------------------------------------------------------- Old: ---- qtremoteobjects-everywhere-src-6.2.1.tar.xz New: ---- qtremoteobjects-everywhere-src-6.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-remoteobjects.spec ++++++ --- /var/tmp/diff_new_pack.cAn0DA/_old 2021-12-08 22:10:04.022893864 +0100 +++ /var/tmp/diff_new_pack.cAn0DA/_new 2021-12-08 22:10:04.026893866 +0100 @@ -16,13 +16,13 @@ # -%define real_version 6.2.1 +%define real_version 6.2.2 %define short_version 6.2 %define tar_name qtremoteobjects-everywhere-src %define tar_suffix %{nil} # Name: qt6-remoteobjects -Version: 6.2.1 +Version: 6.2.2 Release: 0 Summary: Qt6 RemoteObjects Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) @@ -56,6 +56,7 @@ Summary: Qt 6 RemoteObjects library - Development files Requires: libQt6RemoteObjects6 = %{version} Requires: qt6-remoteobjects-tools = %{version} +Requires: cmake(Qt6Network) %description devel Development files for the Qt 6 RemoteObjects library. @@ -77,6 +78,9 @@ %package -n qt6-remoteobjectsqml-devel Summary: Qt 6 RemoteObjectsQml library - Development files Requires: libQt6RemoteObjectsQml6 = %{version} +Requires: cmake(Qt6Gui) +Requires: cmake(Qt6Qml) +Requires: cmake(Qt6RemoteObjects) = %{real_version} %description -n qt6-remoteobjectsqml-devel Development files for the Qt 6 RemoteObjectsQml library. ++++++ qtremoteobjects-everywhere-src-6.2.1.tar.xz -> qtremoteobjects-everywhere-src-6.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtremoteobjects-everywhere-src-6.2.2/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtremoteobjects-everywhere-src-6.2.1/.QT-ENTERPRISE-LICENSE-AGREEMENT 2021-10-21 18:32:38.111421300 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2021-11-26 23:02:17.656226200 +0100 @@ -82,7 +82,7 @@ "Distribution License(s)" shall mean the license required for any kind of sale, trade, exchange, loan, lease, rental or other distribution by or on behalf of Licensee to a third party of Redistributables in connection with Devices -ursuant to license grant described in Section 3.3 of this Agreement. +pursuant to license grant described in Section 3.3 of this Agreement. "Distribution License Packs" shall mean set of prepaid Distribution Licenses for distribution of Redistributables, as defined in The Qt Company's standard price @@ -688,7 +688,7 @@ or through an in-person visit to Licensee's place of business. Any such in-person audit shall be conducted during regular business hours at Licensee's facilities and shall not unreasonably interfere with Licensee's -usiness activities. The Qt Company or the independent auditor acting on +business activities. The Qt Company or the independent auditor acting on behalf of The Qt Company shall be entitled to inspect Licensee's Records and conduct necessary interviews of Licensee's relevant employees and Contractors. All such Licensee's Records and use thereof shall be subject @@ -1227,7 +1227,7 @@ Agreement, for a Renewal Term either as new Start-up Development Licenses (if the Licensee still qualifies as a Start-up Company), or as normal Development Licenses (if the Licensee no longer qualifies as a Start-up -ompany). +company). APPENDIX 5: NON-COMMERCIAL USE The provisions of this Appendix 5 are applicable for non-commercial use of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT new/qtremoteobjects-everywhere-src-6.2.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT --- old/qtremoteobjects-everywhere-src-6.2.1/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2021-10-21 18:32:38.111421300 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2021-11-26 23:02:17.656226200 +0100 @@ -82,7 +82,7 @@ "Distribution License(s)" shall mean the license required for any kind of sale, trade, exchange, loan, lease, rental or other distribution by or on behalf of Licensee to a third party of Redistributables in connection with Devices -ursuant to license grant described in Section 3.3 of this Agreement. +pursuant to license grant described in Section 3.3 of this Agreement. "Distribution License Packs" shall mean set of prepaid Distribution Licenses for distribution of Redistributables, as defined in The Qt Company's standard price @@ -688,7 +688,7 @@ or through an in-person visit to Licensee's place of business. Any such in-person audit shall be conducted during regular business hours at Licensee's facilities and shall not unreasonably interfere with Licensee's -usiness activities. The Qt Company or the independent auditor acting on +business activities. The Qt Company or the independent auditor acting on behalf of The Qt Company shall be entitled to inspect Licensee's Records and conduct necessary interviews of Licensee's relevant employees and Contractors. All such Licensee's Records and use thereof shall be subject @@ -1227,7 +1227,7 @@ Agreement, for a Renewal Term either as new Start-up Development Licenses (if the Licensee still qualifies as a Start-up Company), or as normal Development Licenses (if the Licensee no longer qualifies as a Start-up -ompany). +company). APPENDIX 5: NON-COMMERCIAL USE The provisions of this Appendix 5 are applicable for non-commercial use of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT new/qtremoteobjects-everywhere-src-6.2.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT --- old/qtremoteobjects-everywhere-src-6.2.1/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2021-10-21 18:32:38.111421300 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2021-11-26 23:02:17.656226200 +0100 @@ -82,7 +82,7 @@ "Distribution License(s)" shall mean the license required for any kind of sale, trade, exchange, loan, lease, rental or other distribution by or on behalf of Licensee to a third party of Redistributables in connection with Devices -ursuant to license grant described in Section 3.3 of this Agreement. +pursuant to license grant described in Section 3.3 of this Agreement. "Distribution License Packs" shall mean set of prepaid Distribution Licenses for distribution of Redistributables, as defined in The Qt Company's standard price @@ -688,7 +688,7 @@ or through an in-person visit to Licensee's place of business. Any such in-person audit shall be conducted during regular business hours at Licensee's facilities and shall not unreasonably interfere with Licensee's -usiness activities. The Qt Company or the independent auditor acting on +business activities. The Qt Company or the independent auditor acting on behalf of The Qt Company shall be entitled to inspect Licensee's Records and conduct necessary interviews of Licensee's relevant employees and Contractors. All such Licensee's Records and use thereof shall be subject @@ -1227,7 +1227,7 @@ Agreement, for a Renewal Term either as new Start-up Development Licenses (if the Licensee still qualifies as a Start-up Company), or as normal Development Licenses (if the Licensee no longer qualifies as a Start-up -ompany). +company). APPENDIX 5: NON-COMMERCIAL USE The provisions of this Appendix 5 are applicable for non-commercial use of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT new/qtremoteobjects-everywhere-src-6.2.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT --- old/qtremoteobjects-everywhere-src-6.2.1/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2021-10-21 18:32:38.111421300 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2021-11-26 23:02:17.656226200 +0100 @@ -82,7 +82,7 @@ "Distribution License(s)" shall mean the license required for any kind of sale, trade, exchange, loan, lease, rental or other distribution by or on behalf of Licensee to a third party of Redistributables in connection with Devices -ursuant to license grant described in Section 3.3 of this Agreement. +pursuant to license grant described in Section 3.3 of this Agreement. "Distribution License Packs" shall mean set of prepaid Distribution Licenses for distribution of Redistributables, as defined in The Qt Company's standard price @@ -688,7 +688,7 @@ or through an in-person visit to Licensee's place of business. Any such in-person audit shall be conducted during regular business hours at Licensee's facilities and shall not unreasonably interfere with Licensee's -usiness activities. The Qt Company or the independent auditor acting on +business activities. The Qt Company or the independent auditor acting on behalf of The Qt Company shall be entitled to inspect Licensee's Records and conduct necessary interviews of Licensee's relevant employees and Contractors. All such Licensee's Records and use thereof shall be subject @@ -1227,7 +1227,7 @@ Agreement, for a Renewal Term either as new Start-up Development Licenses (if the Licensee still qualifies as a Start-up Company), or as normal Development Licenses (if the Licensee no longer qualifies as a Start-up -ompany). +company). APPENDIX 5: NON-COMMERCIAL USE The provisions of this Appendix 5 are applicable for non-commercial use of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.cmake.conf new/qtremoteobjects-everywhere-src-6.2.2/.cmake.conf --- old/qtremoteobjects-everywhere-src-6.2.1/.cmake.conf 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.cmake.conf 2021-11-24 22:47:41.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.1") +set(QT_REPO_MODULE_VERSION "6.2.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.qmake.conf new/qtremoteobjects-everywhere-src-6.2.2/.qmake.conf --- old/qtremoteobjects-everywhere-src-6.2.1/.qmake.conf 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.qmake.conf 2021-11-24 22:47:41.000000000 +0100 @@ -4,6 +4,6 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.1 +MODULE_VERSION = 6.2.2 QTRO_SOURCE_TREE = $$PWD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/.tag new/qtremoteobjects-everywhere-src-6.2.2/.tag --- old/qtremoteobjects-everywhere-src-6.2.1/.tag 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/.tag 2021-11-24 22:47:41.000000000 +0100 @@ -1 +1 @@ -300501c76494029831c7eb534a08e0ab17110ef9 +60e52df675c4fada85c61f7c05a3f202e88c48d1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/dependencies.yaml new/qtremoteobjects-everywhere-src-6.2.2/dependencies.yaml --- old/qtremoteobjects-everywhere-src-6.2.1/dependencies.yaml 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/dependencies.yaml 2021-11-24 22:47:41.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 9fa805f7f8dfe96d561e9ed3170770ad768baf93 + ref: eae95814a46386f8930eeae5486513a78a7a4ddc required: true ../qtdeclarative: - ref: 973399d8e67c264a55ff0f394865a1b721bd8b5a + ref: 00c352c4d4b61f8c7a6243768bc5375c3dca3e76 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_local_backend_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_local_backend_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_local_backend_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_local_backend_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_local_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_global_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_global_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_global_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_global_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_global_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_qiodevices_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_server_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_server_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_server_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_qnx_server_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_qnx_server_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnection_tcpip_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnectionfactories_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnectionfactories_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnectionfactories_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qconnectionfactories_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qconnectionfactories_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectcontainers_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectnode_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectnode_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectnode_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpacket_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpacket_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpacket_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpacket_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectpacket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectpendingcall_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectregistrysource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectreplica_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectreplica_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectreplica_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectreplica_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsource_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsource_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsource_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsource_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectsource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjects/qremoteobjectsourceio_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_local_backend_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_local_backend_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_local_backend_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_local_backend_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_local_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_backend_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_global_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_global_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_global_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_global_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_global_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_qiodevices_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_server_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_server_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_server_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_qnx_server_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_qnx_server_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnection_tcpip_backend_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnection_tcpip_backend_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnectionfactories_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnectionfactories_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnectionfactories_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qconnectionfactories_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qconnectionfactories_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectcontainers_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectcontainers_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectnode_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectnode_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectnode_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpacket_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpacket_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpacket_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpacket_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectpacket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectpendingcall_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectpendingcall_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectregistrysource_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectregistrysource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectreplica_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectreplica_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectreplica_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectreplica_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectreplica_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsource_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsource_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsource_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsource_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectsource_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/6.2.2/QtRemoteObjects/private/qremoteobjectsourceio_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjects/qremoteobjectsourceio_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/qtremoteobjectsversion.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/qtremoteobjectsversion.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjects/qtremoteobjectsversion.h 2021-10-21 18:32:37.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjects/qtremoteobjectsversion.h 2021-11-26 23:02:17.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTREMOTEOBJECTS_VERSION_H #define QT_QTREMOTEOBJECTS_VERSION_H -#define QTREMOTEOBJECTS_VERSION_STR "6.2.1" +#define QTREMOTEOBJECTS_VERSION_STR "6.2.2" -#define QTREMOTEOBJECTS_VERSION 0x060201 +#define QTREMOTEOBJECTS_VERSION 0x060202 #endif // QT_QTREMOTEOBJECTS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjectsQml/6.2.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjectsQml/6.2.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjectsQml/6.2.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjectsQml/6.2.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/remoteobjectsqml/qremoteobjectsqml_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjectsQml/6.2.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjectsQml/6.2.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjectsQml/6.2.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjectsQml/6.2.2/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/remoteobjectsqml/qremoteobjectsqml_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h 2021-10-21 18:32:37.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h 2021-11-26 23:02:17.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTREMOTEOBJECTSQML_VERSION_H #define QT_QTREMOTEOBJECTSQML_VERSION_H -#define QTREMOTEOBJECTSQML_VERSION_STR "6.2.1" +#define QTREMOTEOBJECTSQML_VERSION_STR "6.2.2" -#define QTREMOTEOBJECTSQML_VERSION 0x060201 +#define QTREMOTEOBJECTSQML_VERSION 0x060202 #endif // QT_QTREMOTEOBJECTSQML_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/include/QtRepParser/qtrepparserversion.h new/qtremoteobjects-everywhere-src-6.2.2/include/QtRepParser/qtrepparserversion.h --- old/qtremoteobjects-everywhere-src-6.2.1/include/QtRepParser/qtrepparserversion.h 2021-10-21 18:32:37.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/include/QtRepParser/qtrepparserversion.h 2021-11-26 23:02:17.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTREPPARSER_VERSION_H #define QT_QTREPPARSER_VERSION_H -#define QTREPPARSER_VERSION_STR "6.2.1" +#define QTREPPARSER_VERSION_STR "6.2.2" -#define QTREPPARSER_VERSION 0x060201 +#define QTREPPARSER_VERSION 0x060202 #endif // QT_QTREPPARSER_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/src/remoteobjects/qconnection_tcpip_backend.cpp new/qtremoteobjects-everywhere-src-6.2.2/src/remoteobjects/qconnection_tcpip_backend.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/src/remoteobjects/qconnection_tcpip_backend.cpp 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/src/remoteobjects/qconnection_tcpip_backend.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -162,7 +162,7 @@ if (!m_server.isListening()) return nullptr; - return new TcpServerIo(m_server.nextPendingConnection()); + return new TcpServerIo(m_server.nextPendingConnection(), this); } bool TcpServerImpl::hasPendingConnections() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp new/qtremoteobjects-everywhere-src-6.2.2/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -264,6 +264,8 @@ auto parentItem = cacheData(parentIndex); q->beginInsertRows(parentIndex, start, end); parentItem->insertChildren(start, end); + for (int i = start; i <= end; ++i) + m_headerData[1].append(CacheEntry()); q->endInsertRows(); if (!parentItem->hasChildren && parentItem->columnCount > 0) { parentItem->hasChildren = true; @@ -290,6 +292,8 @@ return; q->beginInsertColumns(parentIndex, start, end); parentItem->columnCount += end - start + 1; + for (int i = start; i <= end; ++i) + m_headerData[0].append(CacheEntry()); q->endInsertColumns(); if (!parentItem->hasChildren && parentItem->children.size() > 0) { parentItem->hasChildren = true; @@ -311,6 +315,7 @@ q->beginRemoveRows(parentIndex, start, end); if (parentItem) parentItem->removeChildren(start, end); + m_headerData[1].erase(m_headerData[1].begin() + start, m_headerData[1].begin() + end + 1); q->endRemoveRows(); } @@ -669,7 +674,7 @@ // TODO clean cache const int index = orientation == Qt::Horizontal ? 0 : 1; QList<CacheEntry> &entries = m_headerData[index]; - for (int i = first; i < last; ++i ) + for (int i = first; i <= last && i < entries.size(); ++i ) entries[i].data.clear(); emit q->headerDataChanged(orientation, first, last); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/src/remoteobjects/qremoteobjectsource.cpp new/qtremoteobjects-everywhere-src-6.2.2/src/remoteobjects/qremoteobjectsource.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/src/remoteobjects/qremoteobjectsource.cpp 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/src/remoteobjects/qremoteobjectsource.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -177,8 +177,11 @@ return QByteArray{}; } -inline bool qtro_is_cloned_method(const QMetaObject *mobj, int local_method_index) +inline bool qtro_is_cloned_method(const QMetaObject *mobj, int index) { + int local_method_index = index - mobj->methodOffset(); + if (local_method_index < 0 && mobj->superClass()) + return qtro_is_cloned_method(mobj->superClass(), index); const QtPrivate::Data data = QtPrivate::fromRelativeMethodIndex(mobj, local_method_index); if (data.flags() & 0x20 /*MethodFlags::MethodCloned*/) return true; @@ -293,9 +296,8 @@ const auto targetMeta = isAdapter ? m_adapter->metaObject() : meta; // don't connect cloned signals, or we end up with multiple emissions - if (qtro_is_cloned_method(targetMeta, sourceIndex - targetMeta->methodOffset())) + if (qtro_is_cloned_method(targetMeta, sourceIndex)) continue; - // This basically connects the parent Signals (note, all dynamic properties have onChange //notifications, thus signals) to us. Normally each Signal is mapped to a unique index, //but since we are forwarding them all, we keep the offset constant. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/CMakeLists.txt new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/CMakeLists.txt --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/CMakeLists.txt 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/CMakeLists.txt 2021-11-24 22:47:41.000000000 +0100 @@ -21,6 +21,7 @@ add_subdirectory(proxy_multiprocess) add_subdirectory(integration_external) add_subdirectory(restart) + add_subdirectory(reconnect) endif() add_subdirectory(localsockettestserver) add_subdirectory(integration) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/modelview/tst_modelview.cpp new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/modelview/tst_modelview.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/modelview/tst_modelview.cpp 2021-10-21 11:07:23.000000000 +0200 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/modelview/tst_modelview.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -497,6 +497,7 @@ void testInitialData(); void testInitialDataTree(); void testHeaderData(); + void testHeaderDataChange(); void testFlags(); void testDataChanged(); void testDataChangedTree(); @@ -649,6 +650,34 @@ QCOMPARE(model->headerData(i, Qt::Horizontal, Qt::DisplayRole), m_sourceModel.headerData(i, Qt::Horizontal, Qt::DisplayRole)); } +void TestModelView::testHeaderDataChange() +{ + _SETUP_TEST_ + QString newHeader = QStringLiteral("New header name"); + QScopedPointer<QAbstractItemModelReplica> model(client.acquireModel("test")); + + FetchData f(model.data()); + QVERIFY(f.fetchAndWait(MODELTEST_WAIT_TIME)); + QVERIFY(model->headerData(0, Qt::Horizontal, Qt::DisplayRole).toString() != newHeader); + + QSignalSpy spyHeader(model.data(), &QAbstractItemModelReplica::headerDataChanged); + m_sourceModel.setHeaderData(0, Qt::Horizontal, newHeader, Qt::DisplayRole); + spyHeader.wait(); + QTRY_COMPARE(model->headerData(0, Qt::Horizontal, Qt::DisplayRole).toString(), newHeader); + + spyHeader.clear(); + m_sourceModel.setHeaderData(1, Qt::Horizontal, newHeader, Qt::DisplayRole); + spyHeader.wait(); + QTRY_COMPARE(model->headerData(1, Qt::Horizontal, Qt::DisplayRole).toString(), newHeader); + + QString anotherHeader = QStringLiteral("Modified header name"); + m_sourceModel.setHeaderData(0, Qt::Horizontal, anotherHeader, Qt::DisplayRole); + spyHeader.wait(); + + QTRY_COMPARE(model->headerData(0, Qt::Horizontal, Qt::DisplayRole).toString(), anotherHeader); + QCOMPARE(model->headerData(1, Qt::Horizontal, Qt::DisplayRole).toString(), newHeader); +} + void TestModelView::testDataChangedTree() { _SETUP_TEST_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/CMakeLists.txt new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/CMakeLists.txt --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/CMakeLists.txt 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,4 @@ + +add_subdirectory(client) +add_subdirectory(server) +add_subdirectory(tst) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/client/CMakeLists.txt new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/client/CMakeLists.txt --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/client/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/client/CMakeLists.txt 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,6 @@ +qt_internal_add_executable(qtro_reconnect_client + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES main.cpp + INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC_LIBRARIES Qt::RemoteObjects Qt::Test +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/client/main.cpp new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/client/main.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/client/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/client/main.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtRemoteObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QCoreApplication> +#include <QtTest/QtTest> +#include <QtRemoteObjects/qremoteobjectnode.h> + +class tst_Client_Process : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void testRun() + { + const QString url = qEnvironmentVariable("RO_URL"); + QRemoteObjectNode node; + node.connectToNode(QUrl(url)); + QRemoteObjectDynamicReplica *ro = node.acquireDynamic("SourceObj"); + + QSignalSpy initSpy(ro, &QRemoteObjectDynamicReplica::initialized); + QVERIFY(initSpy.wait()); + QSignalSpy pongSpy(ro, SIGNAL(pong())); + QMetaObject::invokeMethod(ro, "ping"); + QVERIFY(pongSpy.wait()); + QMetaObject::invokeMethod(ro, "ping"); + + QVERIFY(initSpy.wait()); + QMetaObject::invokeMethod(ro, "ping"); + QVERIFY(pongSpy.wait()); + QMetaObject::invokeMethod(ro, "ping"); + QTest::qWait(100); + delete ro; + } +}; + +QTEST_MAIN(tst_Client_Process) + +#include "main.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/server/CMakeLists.txt new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/server/CMakeLists.txt --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/server/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/server/CMakeLists.txt 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,6 @@ +qt_internal_add_executable(qtro_reconnect_server + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES main.cpp + INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC_LIBRARIES Qt::RemoteObjects Qt::Test +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/server/main.cpp new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/server/main.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/server/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/server/main.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtRemoteObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QCoreApplication> +#include <QtTest/QtTest> +#include <QtRemoteObjects/qremoteobjectnode.h> +#include <QtRemoteObjects/qremoteobjectsource.h> + + +class SourceObj : public QObject +{ + Q_OBJECT + +public Q_SLOTS: + void ping() { ++m_pingCount; }; + +Q_SIGNALS: + void pong(); + +public: + int m_pingCount = 0; +}; + +class tst_Server_Process : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void testRun() + { + const QString url = qEnvironmentVariable("RO_URL"); + QRemoteObjectHost *srcNode = new QRemoteObjectHost(QUrl(url)); + SourceObj so; + so.setObjectName(QStringLiteral("SourceObj")); + srcNode->enableRemoting(&so); + + QTRY_VERIFY(so.m_pingCount == 1); + emit so.pong(); + QTRY_VERIFY(so.m_pingCount == 2); + delete srcNode; + + srcNode = new QRemoteObjectHost(QUrl(url)); + srcNode->enableRemoting(&so); + + QTRY_VERIFY(so.m_pingCount == 3); + emit so.pong(); + QTRY_VERIFY(so.m_pingCount == 4); + delete srcNode; + } +}; + +QTEST_MAIN(tst_Server_Process) + +#include "main.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/tst/CMakeLists.txt new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/tst/CMakeLists.txt --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/tst/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/tst/CMakeLists.txt 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,5 @@ +qt_internal_add_test(tst_reconnect + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES tst_reconnect.cpp + PUBLIC_LIBRARIES Qt::RemoteObjects +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/tst/tst_reconnect.cpp new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/tst/tst_reconnect.cpp --- old/qtremoteobjects-everywhere-src-6.2.1/tests/auto/reconnect/tst/tst_reconnect.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/qtremoteobjects-everywhere-src-6.2.2/tests/auto/reconnect/tst/tst_reconnect.cpp 2021-11-24 22:47:41.000000000 +0100 @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtRemoteObjects module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QtTest> +#include <QStandardPaths> +#include <QProcess> +#include "../../../shared/testutils.h" + + +class tst_Reconnect: public QObject +{ + Q_OBJECT + +private slots: + void testRun_data() + { + QTest::addColumn<QString>("url"); + QTest::addRow("local") << QStringLiteral("local:replica"); + QTest::addRow("tcp") << QStringLiteral("tcp://127.0.0.1:65217"); + } + + void testRun() + { + QFETCH(QString, url); + + QVERIFY(TestUtils::init("tst")); + + QProcess serverProc; + serverProc.setProcessChannelMode(QProcess::ForwardedChannels); + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("RO_URL", url); + serverProc.setProcessEnvironment(env); + serverProc.start(TestUtils::findExecutable("qtro_reconnect_server", "/server"), + QStringList()); + QVERIFY(serverProc.waitForStarted()); + + QProcess clientProc; + clientProc.setProcessChannelMode(QProcess::ForwardedChannels); + clientProc.setProcessEnvironment(env); + clientProc.start(TestUtils::findExecutable("qtro_reconnect_client", "/client"), + QStringList()); + qDebug() << "Started server and client process on:" << url; + QVERIFY(clientProc.waitForStarted()); + + QVERIFY(clientProc.waitForFinished()); + QVERIFY(serverProc.waitForFinished()); + + QCOMPARE(serverProc.exitCode(), 0); + QCOMPARE(clientProc.exitCode(), 0); + } +}; + +QTEST_MAIN(tst_Reconnect) + +#include "tst_reconnect.moc"
