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 2022-06-20 15:37:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-remoteobjects (Old)
and /work/SRC/openSUSE:Factory/.qt6-remoteobjects.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-remoteobjects"
Mon Jun 20 15:37:37 2022 rev:7 rq:983747 version:6.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-remoteobjects/qt6-remoteobjects.changes
2022-04-20 16:56:12.734560401 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-remoteobjects.new.1548/qt6-remoteobjects.changes
2022-06-20 15:38:03.838928687 +0200
@@ -1,0 +2,6 @@
+Fri Jun 17 15:15:28 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.3.1:
+ * https://www.qt.io/blog/qt-6.3.1-released
+
+-------------------------------------------------------------------
Old:
----
qtremoteobjects-everywhere-src-6.3.0.tar.xz
New:
----
qtremoteobjects-everywhere-src-6.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-remoteobjects.spec ++++++
--- /var/tmp/diff_new_pack.XGsLYB/_old 2022-06-20 15:38:04.446929577 +0200
+++ /var/tmp/diff_new_pack.XGsLYB/_new 2022-06-20 15:38:04.450929582 +0200
@@ -16,7 +16,7 @@
#
-%define real_version 6.3.0
+%define real_version 6.3.1
%define short_version 6.3
%define tar_name qtremoteobjects-everywhere-src
%define tar_suffix %{nil}
@@ -27,13 +27,14 @@
%endif
#
Name: qt6-remoteobjects%{?pkg_suffix}
-Version: 6.3.0
+Version: 6.3.1
Release: 0
Summary: Qt6 RemoteObjects Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
URL: https://www.qt.io
Source:
https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-remoteobjects-rpmlintrc
+BuildRequires: pkgconfig
BuildRequires: qt6-core-private-devel
BuildRequires: qt6-qml-private-devel
BuildRequires: cmake(Qt6Core)
@@ -137,6 +138,7 @@
# Unneeded?
rm -r %{buildroot}%{_qt6_mkspecsdir}/features
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6RepParser
+rm %{buildroot}%{_qt6_pkgconfigdir}/Qt6RepParser.pc
%post -n libQt6RemoteObjects6 -p /sbin/ldconfig
%post -n libQt6RemoteObjectsQml6 -p /sbin/ldconfig
@@ -163,6 +165,7 @@
%{_qt6_metatypesdir}/qt6remoteobjects_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_remoteobjects.pri
%{_qt6_mkspecsdir}/modules/qt_lib_repparser.pri
+%{_qt6_pkgconfigdir}/Qt6RemoteObjects.pc
%exclude %{_qt6_includedir}/QtRemoteObjects/%{real_version}
%files private-devel
@@ -180,6 +183,7 @@
%{_qt6_libdir}/libQt6RemoteObjectsQml.so
%{_qt6_metatypesdir}/qt6remoteobjectsqml_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_remoteobjectsqml.pri
+%{_qt6_pkgconfigdir}/Qt6RemoteObjectsQml.pc
%exclude %{_qt6_includedir}/QtRemoteObjectsQml/%{real_version}
%files -n qt6-remoteobjectsqml-private-devel
++++++ qtremoteobjects-everywhere-src-6.3.0.tar.xz ->
qtremoteobjects-everywhere-src-6.3.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.3.0/.cmake.conf
new/qtremoteobjects-everywhere-src-6.3.1/.cmake.conf
--- old/qtremoteobjects-everywhere-src-6.3.0/.cmake.conf 2022-04-05
23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/.cmake.conf 2022-06-08
05:44:24.000000000 +0200
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.3.0")
-set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
+set(QT_REPO_MODULE_VERSION "6.3.1")
+set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtremoteobjects-everywhere-src-6.3.0/.tag
new/qtremoteobjects-everywhere-src-6.3.1/.tag
--- old/qtremoteobjects-everywhere-src-6.3.0/.tag 2022-04-05
23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/.tag 2022-06-08
05:44:24.000000000 +0200
@@ -1 +1 @@
-a4a1673eff8399cb81bf0e276919c6e580e85768
+c6f1f414aa9103b75f5f2d28a071b0807a0f91b2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/dependencies.yaml
new/qtremoteobjects-everywhere-src-6.3.1/dependencies.yaml
--- old/qtremoteobjects-everywhere-src-6.3.0/dependencies.yaml 2022-04-05
23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/dependencies.yaml 2022-06-08
05:44:24.000000000 +0200
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: 9554d315aa74eaba1726405ee09117e2ebc6111f
+ ref: 8483dcde90f40cdfd0a0ec4245b03610b46b6cae
required: true
../qtdeclarative:
- ref: 2a45651292f45eca3d1f9fa518a8ebfcac647f18
+ ref: 47ef121e1a436fd46129cdaa1a4398c82045eb97
required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/examples/remoteobjects/.prev_CMakeLists.txt
new/qtremoteobjects-everywhere-src-6.3.1/examples/remoteobjects/.prev_CMakeLists.txt
---
old/qtremoteobjects-everywhere-src-6.3.0/examples/remoteobjects/.prev_CMakeLists.txt
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/examples/remoteobjects/.prev_CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-# Generated from remoteobjects.pro.
-
-add_subdirectory(server)
-add_subdirectory(cppclient)
-add_subdirectory(simpleswitch)
-add_subdirectory(websockets)
-if(TARGET Qt::Widgets)
- add_subdirectory(modelviewclient)
- add_subdirectory(modelviewserver)
-endif()
-if(QT_CONFIG___contains___ssl)
- add_subdirectory(ssl)
-endif()
-if(TARGET Qt::Quick)
- add_subdirectory(plugins)
- add_subdirectory(clientapp)
-endif()
-if(TARGET Qt::Quick AND UNIX AND NOT ANDROID)
- add_subdirectory(qmlmodelviewclient)
-endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_local_backend_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_local_backend_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_local_backend_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_backend_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_backend_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_backend_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_global_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_global_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_global_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_server_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_server_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_qnx_server_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnectionfactories_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnectionfactories_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qconnectionfactories_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectcontainers_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectcontainers_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectcontainers_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectnode_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectnode_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectnode_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectpacket_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectpacket_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectpacket_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectreplica_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectreplica_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectreplica_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectsource_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectsource_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectsource_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectsourceio_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectsourceio_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.0/QtRemoteObjects/private/qremoteobjectsourceio_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.0/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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_local_backend_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_local_backend_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_local_backend_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_local_backend_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_backend_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_global_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_global_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_global_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_global_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_qiodevices_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_server_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_server_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_server_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_qnx_server_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnection_tcpip_backend_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -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.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnectionfactories_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnectionfactories_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnectionfactories_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qconnectionfactories_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qconnectionfactories_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeladapter_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include
"../../../../../src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodelreplica_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include
"../../../../../src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectabstractitemmodeltypes_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include
"../../../../../src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectcontainers_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectcontainers_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectnode_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectnode_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectnode_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectnode_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectnode_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpacket_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpacket_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpacket_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpacket_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectpacket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectpendingcall_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectpendingcall_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectregistrysource_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectregistrysource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectreplica_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectreplica_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectreplica_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectreplica_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectreplica_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsource_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsource_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsource_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsource_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectsource_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/6.3.1/QtRemoteObjects/private/qremoteobjectsourceio_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjects/qremoteobjectsourceio_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/qtremoteobjectsversion.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/qtremoteobjectsversion.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjects/qtremoteobjectsversion.h
2022-04-06 19:56:43.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjects/qtremoteobjectsversion.h
2022-06-09 02:14:42.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTREMOTEOBJECTS_VERSION_H
#define QT_QTREMOTEOBJECTS_VERSION_H
-#define QTREMOTEOBJECTS_VERSION_STR "6.3.0"
+#define QTREMOTEOBJECTS_VERSION_STR "6.3.1"
-#define QTREMOTEOBJECTS_VERSION 0x060300
+#define QTREMOTEOBJECTS_VERSION 0x060301
#endif // QT_QTREMOTEOBJECTS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjectsQml/6.3.0/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjectsQml/6.3.0/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjectsQml/6.3.0/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjectsQml/6.3.0/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.3.0/include/QtRemoteObjectsQml/6.3.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjectsQml/6.3.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjectsQml/6.3.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjectsQml/6.3.1/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h
2022-06-08 05:44:24.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/remoteobjectsqml/qremoteobjectsqml_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h
2022-04-06 19:56:43.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h
2022-06-09 02:14:42.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTREMOTEOBJECTSQML_VERSION_H
#define QT_QTREMOTEOBJECTSQML_VERSION_H
-#define QTREMOTEOBJECTSQML_VERSION_STR "6.3.0"
+#define QTREMOTEOBJECTSQML_VERSION_STR "6.3.1"
-#define QTREMOTEOBJECTSQML_VERSION 0x060300
+#define QTREMOTEOBJECTSQML_VERSION 0x060301
#endif // QT_QTREMOTEOBJECTSQML_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRepParser/qtrepparserversion.h
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRepParser/qtrepparserversion.h
---
old/qtremoteobjects-everywhere-src-6.3.0/include/QtRepParser/qtrepparserversion.h
2022-04-06 19:56:43.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/include/QtRepParser/qtrepparserversion.h
2022-06-09 02:14:42.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTREPPARSER_VERSION_H
#define QT_QTREPPARSER_VERSION_H
-#define QTREPPARSER_VERSION_STR "6.3.0"
+#define QTREPPARSER_VERSION_STR "6.3.1"
-#define QTREPPARSER_VERSION 0x060300
+#define QTREPPARSER_VERSION 0x060301
#endif // QT_QTREPPARSER_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/doc/snippets/cmake-macros/CMakeLists.txt
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/doc/snippets/cmake-macros/CMakeLists.txt
---
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/doc/snippets/cmake-macros/CMakeLists.txt
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/doc/snippets/cmake-macros/CMakeLists.txt
2022-06-08 05:44:24.000000000 +0200
@@ -11,7 +11,7 @@
endif()
#! [remote_objects_cmake]
-find_package(Qt6 COMPONENTS RemoteObjects REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS RemoteObjects)
#! [remote_objects_cmake]
set(SOURCES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/qconnection_qnx_backend.cpp
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/qconnection_qnx_backend.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/qconnection_qnx_backend.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/qconnection_qnx_backend.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -98,6 +98,7 @@
case QAbstractSocket::RemoteHostClosedError:
m_socket->close();
qCWarning(QT_REMOTEOBJECT) << "RemoteHostClosedError";
+ Q_FALLTHROUGH();
case QAbstractSocket::HostNotFoundError: //Host not there, wait and
try again
case QAbstractSocket::AddressInUseError:
case QAbstractSocket::ConnectionRefusedError:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/qconnection_qnx_qiodevices.cpp
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/qconnection_qnx_qiodevices.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/qconnection_qnx_qiodevices.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/qconnection_qnx_qiodevices.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -200,7 +200,7 @@
ibLock.lockForWrite();
iov_t reply_vector[2];
SETIOV(reply_vector, &bytesLeft, sizeof(bytesLeft));
- SETIOV(reply_vector+1, buffer.reserve(len), len);
+ SETIOV(reply_vector+1, buffer.reserve(len), size_t(len));
const int res = MsgSendv(serverId, tx_iov, 1, reply_vector, 2);
if (res == -1) {
@@ -217,7 +217,7 @@
msgType = MsgType::SOURCE_TX_RESP_REPEAT;
ibLock.lockForWrite();
SETIOV(reply_vector, &nTxRequestToIgnore,
sizeof(nTxRequestToIgnore));
- SETIOV(reply_vector+1, buffer.reserve(bytesLeft), bytesLeft);
+ SETIOV(reply_vector+1, buffer.reserve(bytesLeft),
size_t(bytesLeft));
const int res = MsgSendv(serverId, tx_iov, 1, reply_vector, 2);
if (res == -1) {
buffer.chop(bytesLeft);
@@ -241,7 +241,7 @@
Q_ASSERT(len == payload.length());
msgType = MsgType::REPLICA_TX_RECV;
- SETIOV(tx_iov + 1, payload.constData(), len);
+ SETIOV(tx_iov + 1, payload.constData(), size_t(len));
if (MsgSendvs(serverId, tx_iov, 2, nullptr, 0) == -1) {
WARNING(MsgSendvs);
obLock.lockForWrite();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/qconnection_qnx_server.cpp
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/qconnection_qnx_server.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/src/remoteobjects/qconnection_qnx_server.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/src/remoteobjects/qconnection_qnx_server.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -308,7 +308,7 @@
iov_t reply_vector[2];
SETIOV(reply_vector, &bytesLeft, sizeof(bytesLeft));
- SETIOV(reply_vector+1, data.data(), data.length());
+ SETIOV(reply_vector+1, data.data(), size_t(data.length()));
FATAL_ON_ERROR(MsgReplyv, rcvid, EOK, reply_vector, 2)
}
@@ -346,7 +346,7 @@
resp_repeat_iov.resize(buffers_taken+1);
SETIOV(&resp_repeat_iov[0], &buffers_taken, sizeof(buffers_taken));
for (int i = 1; i <= buffers_taken; ++i)
- SETIOV(&resp_repeat_iov[i], qba_array.at(i-1).constData(),
qba_array.at(i-1).length());
+ SETIOV(&resp_repeat_iov[i], qba_array.at(i-1).constData(),
size_t(qba_array.at(i-1).length()));
FATAL_ON_ERROR(MsgReplyv, rcvid, EOK, resp_repeat_iov.data(),
buffers_taken+1)
}
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/src/repparser/parser.g
new/qtremoteobjects-everywhere-src-6.3.1/src/repparser/parser.g
--- old/qtremoteobjects-everywhere-src-6.3.0/src/repparser/parser.g
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/src/repparser/parser.g
2022-06-08 05:44:24.000000000 +0200
@@ -79,7 +79,9 @@
#include <qregexparser.h>
#include <QStringList>
#include <QList>
+#include <QHash>
#include <QRegularExpression>
+#include <QSet>
QT_BEGIN_NAMESPACE
class QIODevice;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/CMakeLists.txt
new/qtremoteobjects-everywhere-src-6.3.1/tests/CMakeLists.txt
--- old/qtremoteobjects-everywhere-src-6.3.0/tests/CMakeLists.txt
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tests/CMakeLists.txt
2022-06-08 05:44:24.000000000 +0200
@@ -1,4 +1,6 @@
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
QuickTestUtilsPrivate)
+
if(QT_BUILD_STANDALONE_TESTS)
# Add qt_find_package calls for extra dependencies that need to be found
when building
# the standalone tests here.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/CMakeLists.txt
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/CMakeLists.txt
--- old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/CMakeLists.txt
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/CMakeLists.txt
2022-06-08 05:44:24.000000000 +0200
@@ -5,7 +5,9 @@
add_subdirectory(modelview)
add_subdirectory(pods)
add_subdirectory(proxy)
-add_subdirectory(rep_from_header)
+if(NOT CMAKE_CROSSCOMPILING)
+ add_subdirectory(rep_from_header)
+endif()
add_subdirectory(repc)
add_subdirectory(repcodegenerator)
add_subdirectory(repparser)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/benchmarks/tst_benchmarkstest.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/benchmarks/tst_benchmarkstest.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/benchmarks/tst_benchmarkstest.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/benchmarks/tst_benchmarkstest.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -36,6 +36,8 @@
#include "rep_localdatacenter_replica.h"
#include "rep_localdatacenter_source.h"
+#include "../../shared/testutils.h"
+
class BenchmarksModel : public QAbstractListModel
{
// QAbstractItemModel interface
@@ -98,14 +100,14 @@
}
void BenchmarksTest::initTestCase() {
- m_basicServer.setHostUrl(QUrl(QStringLiteral("local:benchmark_replica")));
+ m_basicServer.setHostUrl(QUrl(QStringLiteral(LOCAL_SOCKET
":benchmark_replica")));
dataCenterLocal.reset(new LocalDataCenterSimpleSource);
dataCenterLocal->setData1(5);
const bool remoted = m_basicServer.enableRemoting(dataCenterLocal.data());
Q_ASSERT(remoted);
Q_UNUSED(remoted)
-
m_basicClient.connectToNode(QUrl(QStringLiteral("local:benchmark_replica")));
+ m_basicClient.connectToNode(QUrl(QStringLiteral(LOCAL_SOCKET
":benchmark_replica")));
Q_ASSERT(m_basicClient.lastError() == QRemoteObjectNode::NoError);
m_basicServer.enableRemoting(&m_sourceModel,
QStringLiteral("BenchmarkRemoteModel"),
@@ -248,7 +250,7 @@
// which are the last 50 items
QBENCHMARK {
QRemoteObjectNode localClient;
-
localClient.connectToNode(QUrl(QStringLiteral("local:benchmark_replica")));
+ localClient.connectToNode(QUrl(QStringLiteral(LOCAL_SOCKET
":benchmark_replica")));
QScopedPointer<QAbstractItemModelReplica>
model(localClient.acquireModel(QStringLiteral("BenchmarkRemoteModel")));
QEventLoop loop;
QHash<int, QPair<QString, QString>> dataToWait;
@@ -320,7 +322,7 @@
{
QBENCHMARK {
QRemoteObjectNode localClient;
-
localClient.connectToNode(QUrl(QStringLiteral("local:benchmark_replica")));
+ localClient.connectToNode(QUrl(QStringLiteral(LOCAL_SOCKET
":benchmark_replica")));
QScopedPointer<QAbstractItemModelReplica>
model(localClient.acquireModel(QStringLiteral("BenchmarkRemoteModel")));
model->setRootCacheSize(5000); // we need to make room for all 5000
rows that we'll use
QEventLoop loop;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/external_IODevice/tst_client/tst_client.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/external_IODevice/tst_client/tst_client.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/external_IODevice/tst_client/tst_client.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/external_IODevice/tst_client/tst_client.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -46,6 +46,10 @@
}
void testRun()
{
+// TODO: This a limitation of QProcess on Android, QTBUG-88507 is relevant to
this issue.
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
QProcess serverProc;
serverProc.setProcessChannelMode(QProcess::ForwardedChannels);
serverProc.start(TestUtils::findExecutable("sslTestServer",
"/sslTestServer"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/integration/tst_integration.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/integration/tst_integration.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/integration/tst_integration.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/integration/tst_integration.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -51,6 +51,8 @@
#include "rep_localdatacenter_replica.h"
#include "rep_tcpdatacenter_replica.h"
+#include "../../shared/testutils.h"
+
#define SET_NODE_NAME(obj) (obj).setName(QLatin1String(#obj))
//DUMMY impl for variant comparison
@@ -216,7 +218,7 @@
#ifdef __QNXNTO__
QTest::newRow("qnx") << QUrl(QLatin1String("qnx:replica")) <<
QUrl(QLatin1String("qnx:registry"));
#endif
- QTest::newRow("local") <<
QUrl(QLatin1String("local:replicaLocalIntegration")) <<
QUrl(QLatin1String("local:registryLocalIntegration"));
+ QTest::newRow("local") << QUrl(QLatin1String(LOCAL_SOCKET
":replicaLocalIntegration")) << QUrl(QLatin1String(LOCAL_SOCKET
":registryLocalIntegration"));
#ifdef Q_OS_LINUX
QTest::newRow("localabstract") <<
QUrl(QLatin1String("localabstract:replicaAbstractIntegration")) <<
QUrl(QLatin1String("localabstract:registryAbstractIntegration"));
#endif
@@ -1431,7 +1433,7 @@
QVERIFY(info.exists());
QRemoteObjectNode localSocketTestClient;
- const QUrl connection = QUrl(QStringLiteral("local:crashMe"));
+ const QUrl connection = QUrl(QStringLiteral(LOCAL_SOCKET ":crashMe"));
const QString objectname = QStringLiteral("connectme");
localSocketTestClient.connectToNode(connection);
QVERIFY(localSocketTestClient.lastError() ==
QRemoteObjectNode::NoError);
@@ -1465,7 +1467,7 @@
QVERIFY(info.exists());
QRemoteObjectNode localSocketTestClient;
- const QUrl connection = QUrl(QStringLiteral("local:crashMe"));
+ const QUrl connection = QUrl(QStringLiteral(LOCAL_SOCKET ":crashMe"));
const QString objectname = QStringLiteral("connectme");
localSocketTestClient.connectToNode(connection);
QVERIFY(localSocketTestClient.lastError() ==
QRemoteObjectNode::NoError);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/integration_external/external/tst_integration_external.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/integration_external/external/tst_integration_external.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/integration_external/external/tst_integration_external.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/integration_external/external/tst_integration_external.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -58,6 +58,9 @@
void testRun()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
QFETCH(bool, templated);
qDebug() << "Starting server process";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -58,6 +58,9 @@
void testRun()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
QFETCH(bool, templated);
qDebug() << "Starting server process";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/localsockettestserver/main.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/localsockettestserver/main.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/localsockettestserver/main.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/localsockettestserver/main.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -29,12 +29,14 @@
#include <QCoreApplication>
#include <QRemoteObjectNode>
+#include "../../shared/testutils.h"
+
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
QObject remotedObject;
remotedObject.setObjectName(QStringLiteral("connectme"));
- QRemoteObjectHost node(QUrl(QStringLiteral("local:crashMe")));
+ QRemoteObjectHost node(QUrl(QStringLiteral(LOCAL_SOCKET ":crashMe")));
node.enableRemoting(&remotedObject);
return a.exec();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/modelreplica/BLACKLIST
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/modelreplica/BLACKLIST
--- old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/modelreplica/BLACKLIST
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/modelreplica/BLACKLIST
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# See qtbase/src/testlib/qtestblacklist.cpp for format
-#QTBUG-101336
-[basicFunctions]
-qnx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy/tst_proxy.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy/tst_proxy.cpp
--- old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy/tst_proxy.cpp
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy/tst_proxy.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -34,12 +34,14 @@
#include <QRemoteObjectReplica>
#include <QRemoteObjectNode>
-const QUrl localHostUrl = QUrl(QLatin1String("local:testHost"));
+#include "../../shared/testutils.h"
+
+const QUrl localHostUrl = QUrl(QLatin1String(LOCAL_SOCKET ":testHost"));
const QUrl tcpHostUrl = QUrl(QLatin1String("tcp://127.0.0.1:9989"));
const QUrl proxyNodeUrl = QUrl(QLatin1String("tcp://127.0.0.1:12123"));
const QUrl remoteNodeUrl = QUrl(QLatin1String("tcp://127.0.0.1:23234"));
-const QUrl registryUrl = QUrl(QLatin1String("local:testRegistry"));
-const QUrl proxyHostUrl = QUrl(QLatin1String("local:fromProxy"));
+const QUrl registryUrl = QUrl(QLatin1String(LOCAL_SOCKET ":testRegistry"));
+const QUrl proxyHostUrl = QUrl(QLatin1String(LOCAL_SOCKET ":fromProxy"));
#define SET_NODE_NAME(obj) (obj).setName(QLatin1String(#obj))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy_multiprocess/proxy/main.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy_multiprocess/proxy/main.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy_multiprocess/proxy/main.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy_multiprocess/proxy/main.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -30,6 +30,8 @@
#include <QtRemoteObjects/qremoteobjectnode.h>
#include <QtTest/QtTest>
+#include "../../../shared/testutils.h"
+
class tst_Proxy_Process : public QObject
{
Q_OBJECT
@@ -39,7 +41,7 @@
{
m_hostNode.reset(new QRemoteObjectHost);
m_hostNode->setHostUrl(QUrl(QStringLiteral("tcp://127.0.0.1:65213")));
- m_hostNode->proxy(QUrl("local:testRegistry"));
+ m_hostNode->proxy(QUrl(LOCAL_SOCKET ":testRegistry"));
// our proxied object should be added, and then later removed when the
server shuts down
QSignalSpy addSpy(m_hostNode.data(),
&QRemoteObjectNode::remoteObjectAdded);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy_multiprocess/server/main.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy_multiprocess/server/main.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy_multiprocess/server/main.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy_multiprocess/server/main.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -33,6 +33,8 @@
#include <QCoreApplication>
#include <QtTest/QtTest>
+#include "../../../shared/testutils.h"
+
static QMap<int, MyPOD> int_map{{1, initialValue},
{16, initialValue}};
static MyTestServer::ActivePositions flags1 =
MyTestServer::Position::position1;
@@ -54,7 +56,7 @@
bool templated = qEnvironmentVariableIsSet("TEMPLATED_REMOTING");
qDebug() << "Starting tests:" << objectMode << "templated =" <<
templated;
- QRemoteObjectRegistryHost
srcNode(QUrl(QStringLiteral("local:testRegistry")));
+ QRemoteObjectRegistryHost srcNode(QUrl(QStringLiteral(LOCAL_SOCKET
":testRegistry")));
MyTestServer parent;
SubClassSimpleSource subclass;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -64,6 +64,9 @@
void testRun()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
QFETCH(bool, templated);
QFETCH(ObjectMode, objectMode);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/CMakeLists.txt
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/CMakeLists.txt
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/CMakeLists.txt
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/CMakeLists.txt
2022-06-08 05:44:24.000000000 +0200
@@ -2,19 +2,39 @@
#####################################################################
## tst_usertypes Test:
#####################################################################
+file(GLOB_RECURSE test_data_glob
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
+list(APPEND test_data ${test_data_glob})
qt_internal_add_test(tst_usertypes
SOURCES
tst_usertypes.cpp
- DEFINES
- SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
PUBLIC_LIBRARIES
+ Qt::Gui
Qt::Qml
Qt::RemoteObjects
+ Qt::QuickTestUtilsPrivate
+ TESTDATA ${test_data}
)
qt6_add_repc_merged(tst_usertypes
usertypes.rep
)
+qt_internal_extend_target(tst_usertypes CONDITION ANDROID OR IOS
+ DEFINES
+ QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_usertypes CONDITION NOT ANDROID AND NOT IOS
+ DEFINES
+ QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
+
+if(QT_BUILD_STANDALONE_TESTS)
+ # For fully static builds, let qmlimportscanner take care of plugin
importing
+ qt_import_qml_plugins(tst_usertypes)
+endif()
+
#### Keys ignored in scope 1:.:.:usertypes.pro:<TRUE>:
# TEMPLATE = "app"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/complex.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/complex.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/complex.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/complex.qml
2022-06-08 05:44:24.000000000 +0200
@@ -4,6 +4,7 @@
ComplexTypeReplica {
node: Node {
- registryUrl: "local:testModel"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":testModel"
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/composite.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/composite.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/composite.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/composite.qml
2022-06-08 05:44:24.000000000 +0200
@@ -1,7 +1,8 @@
import QtQuick 2.0
+import "../data" as MyComponents //for staric build resource path should be set
QtObject {
- property QtObject myTypeOk: MyType {} // this works
- property MyType myType: MyType {} // this crashes
- property MyType myType2 // this crashes (ensure solution works with null
object)
+ property QtObject myTypeOk: MyComponents.MyType {} // this works
+ property MyComponents.MyType myType: MyComponents.MyType {} // this crashes
+ property MyComponents.MyType myType2 // this crashes (ensure solution
works with null object)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/extraPropComplex.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/extraPropComplex.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/extraPropComplex.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/extraPropComplex.qml
2022-06-08 05:44:24.000000000 +0200
@@ -7,7 +7,8 @@
property QtObject object: QtObject {}
node: Node {
- registryUrl: "local:testExtraComplex"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":testExtraComplex"
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/extraprop.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/extraprop.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/extraprop.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/extraprop.qml
2022-06-08 05:44:24.000000000 +0200
@@ -4,9 +4,9 @@
SimpleClockReplica {
property string result: hour // test that the existence of this property
doesn't cause issues
-
node: Node {
- registryUrl: "local:test"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":test"
}
onStateChanged: if (state == SimpleClockReplica.Valid) pushHour(10)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/extraprop2.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/extraprop2.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/extraprop2.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/extraprop2.qml
2022-06-08 05:44:24.000000000 +0200
@@ -6,6 +6,7 @@
property string result: hour // test that the existence of this property
doesn't cause issues
node: Node {
- registryUrl: "local:test2"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":test2"
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/hosted.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/hosted.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/hosted.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/hosted.qml
2022-06-08 05:44:24.000000000 +0200
@@ -8,7 +8,8 @@
}
Host {
- hostUrl: "local:testHost"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ hostUrl: local_socket + ":testHost"
Component.onCompleted: enableRemoting(clock)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/model.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/model.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/model.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/model.qml
2022-06-08 05:44:24.000000000 +0200
@@ -4,6 +4,7 @@
TypeWithModelReplica {
node: Node {
- registryUrl: "local:testModel"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":testModel"
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/subObject.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/subObject.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/subObject.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/subObject.qml
2022-06-08 05:44:24.000000000 +0200
@@ -6,7 +6,8 @@
property int result: replica.clock.hour
property Node sharedNode: Node {
- registryUrl: "local:testSubObject"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":testSubObject"
}
property TypeWithSubObjectReplica replica: TypeWithSubObjectReplica {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/twoReplicas.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/twoReplicas.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/twoReplicas.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/twoReplicas.qml
2022-06-08 05:44:24.000000000 +0200
@@ -8,7 +8,8 @@
Node {
id: sharedNode
- registryUrl: "local:testTwoReplicas"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":testTwoReplicas"
}
SimpleClockReplica {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/watcher.qml
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/watcher.qml
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/data/watcher.qml
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/data/watcher.qml
2022-06-08 05:44:24.000000000 +0200
@@ -7,7 +7,8 @@
property bool hasError
node: Node {
- registryUrl: "local:testWatcher"
+ property string local_socket: Qt.platform.os == "android" ?
"localabstract" : "local"
+ registryUrl: local_socket + ":testWatcher"
}
onStateChanged: function(state) {
if (state != TypeWithReplyReplica.Valid)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/tst_usertypes.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/tst_usertypes.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/qml/usertypes/tst_usertypes.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/qml/usertypes/tst_usertypes.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -30,8 +30,12 @@
#include <QtTest>
#include <qqmlengine.h>
#include <qqmlcomponent.h>
+#include <QtQuickTestUtils/private/qmlutils_p.h>
+
#include "rep_usertypes_merged.h"
+#include "../../../shared/testutils.h"
+
class TypeWithReply : public TypeWithReplySimpleSource
{
public:
@@ -47,7 +51,7 @@
}
};
-class tst_usertypes : public QObject
+class tst_usertypes : public QQmlDataTest
{
Q_OBJECT
@@ -68,7 +72,7 @@
void remoteCompositeType();
};
-tst_usertypes::tst_usertypes()
+tst_usertypes::tst_usertypes() : QQmlDataTest(QT_QMLTEST_DATADIR)
{
qmlRegisterType<ComplexTypeReplica>("usertypes", 1, 0,
"ComplexTypeReplica");
}
@@ -77,12 +81,12 @@
{
qmlRegisterType<SimpleClockReplica>("usertypes", 1, 0,
"SimpleClockReplica");
- QRemoteObjectRegistryHost host(QUrl("local:test"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":test"));
SimpleClockSimpleSource clock;
host.enableRemoting(&clock);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/extraprop.qml");
+ QQmlComponent c(&e, testFileUrl("extraprop.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -93,13 +97,13 @@
{
qmlRegisterType<SimpleClockReplica>("usertypes", 1, 0,
"SimpleClockReplica");
- QRemoteObjectRegistryHost host(QUrl("local:test2"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":test2"));
SimpleClockSimpleSource clock;
clock.setHour(10);
host.enableRemoting(&clock);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/extraprop2.qml");
+ QQmlComponent c(&e, testFileUrl("extraprop2.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -109,7 +113,7 @@
void tst_usertypes::extraPropertyInQmlComplex()
{
- QRemoteObjectRegistryHost host(QUrl("local:testExtraComplex"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":testExtraComplex"));
SimpleClockSimpleSource clock;
QStringListModel *model = new QStringListModel();
@@ -120,7 +124,7 @@
host.enableRemoting(&source);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/extraPropComplex.qml");
+ QQmlComponent c(&e, testFileUrl("extraPropComplex.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -135,7 +139,7 @@
{
qmlRegisterType<TypeWithModelReplica>("usertypes", 1, 0,
"TypeWithModelReplica");
- QRemoteObjectRegistryHost host(QUrl("local:testModel"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":testModel"));
QStringListModel *model = new QStringListModel();
model->setStringList(QStringList() << "Track1" << "Track2" << "Track3");
@@ -144,7 +148,7 @@
host.enableRemoting<TypeWithModelSourceAPI>(&source);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/model.qml");
+ QQmlComponent c(&e, testFileUrl("model.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -160,7 +164,7 @@
{
qmlRegisterType<TypeWithSubObjectReplica>("usertypes", 1, 0,
"TypeWithSubObjectReplica");
- QRemoteObjectRegistryHost host(QUrl("local:testSubObject"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":testSubObject"));
SimpleClockSimpleSource clock;
TypeWithSubObjectSimpleSource source;
@@ -168,7 +172,7 @@
host.enableRemoting(&source);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/subObject.qml");
+ QQmlComponent c(&e, testFileUrl("subObject.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -194,7 +198,7 @@
QFETCH(bool, templated);
QFETCH(bool, nullobject);
- QRemoteObjectRegistryHost host(QUrl("local:testModel"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":testModel"));
QStringListModel *model = new QStringListModel();
model->setStringList(QStringList() << "Track1" << "Track2" << "Track3");
@@ -210,7 +214,7 @@
host.enableRemoting(&source);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/complex.qml");
+ QQmlComponent c(&e, testFileUrl("complex.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -234,12 +238,12 @@
{
qmlRegisterType<TypeWithReplyReplica>("usertypes", 1, 0,
"TypeWithReplyReplica");
- QRemoteObjectRegistryHost host(QUrl("local:testWatcher"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":testWatcher"));
TypeWithReply source;
host.enableRemoting(&source);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/watcher.qml");
+ QQmlComponent c(&e, testFileUrl("watcher.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -262,12 +266,12 @@
qmlRegisterType<SimpleClockSimpleSource>("usertypes", 1, 0,
"SimpleClockSimpleSource");
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/hosted.qml");
+ QQmlComponent c(&e, testFileUrl("hosted.qml"));
QObject *obj = c.create();
QVERIFY(obj);
QRemoteObjectNode node;
- node.connectToNode(QUrl("local:testHost"));
+ node.connectToNode(QUrl(LOCAL_SOCKET ":testHost"));
SimpleClockReplica *replica = node.acquire<SimpleClockReplica>();
QTRY_COMPARE_WITH_TIMEOUT(replica->state(), QRemoteObjectReplica::Valid,
1000);
@@ -280,13 +284,13 @@
{
qmlRegisterType<SimpleClockReplica>("usertypes", 1, 0,
"SimpleClockReplica");
- QRemoteObjectRegistryHost host(QUrl("local:testTwoReplicas"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":testTwoReplicas"));
SimpleClockSimpleSource clock;
clock.setHour(7);
host.enableRemoting(&clock);
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/twoReplicas.qml");
+ QQmlComponent c(&e, testFileUrl("twoReplicas.qml"));
QObject *obj = c.create();
QVERIFY(obj);
@@ -297,11 +301,11 @@
void tst_usertypes::remoteCompositeType()
{
QQmlEngine e;
- QQmlComponent c(&e, SRCDIR "data/composite.qml");
+ QQmlComponent c(&e, testFileUrl("composite.qml"));
QScopedPointer<QObject> obj(c.create());
QVERIFY(obj);
- QRemoteObjectRegistryHost host(QUrl("local:remoteCompositeType"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":remoteCompositeType"));
host.enableRemoting(obj.data(), "composite");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/reconnect/tst/tst_reconnect.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/reconnect/tst/tst_reconnect.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/reconnect/tst/tst_reconnect.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/reconnect/tst/tst_reconnect.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -40,12 +40,15 @@
void testRun_data()
{
QTest::addColumn<QString>("url");
- QTest::addRow("local") << QStringLiteral("local:replica");
+ QTest::addRow("local") << QStringLiteral(LOCAL_SOCKET ":replica");
QTest::addRow("tcp") << QStringLiteral("tcp://127.0.0.1:65217");
}
void testRun()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
QFETCH(QString, url);
QVERIFY(TestUtils::init("tst"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/repc/signature/signatureTests/tst_signature.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/repc/signature/signatureTests/tst_signature.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/repc/signature/signatureTests/tst_signature.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/repc/signature/signatureTests/tst_signature.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -52,6 +52,9 @@
void testRun()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
qDebug() << "Starting signatureServer process";
QProcess serverProc;
serverProc.setProcessChannelMode(QProcess::ForwardedChannels);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/restart/tst/tst_restart.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/restart/tst/tst_restart.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/restart/tst/tst_restart.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/restart/tst/tst_restart.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -72,6 +72,9 @@
void testRun()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("QProcess doesn't support running user bundled binaries on
Android");
+#endif
QFETCH(RunMode, runMode);
QFETCH(ObjectMode, objectMode);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/subclassreplica/tst_subclassreplicatest.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/subclassreplica/tst_subclassreplicatest.cpp
---
old/qtremoteobjects-everywhere-src-6.3.0/tests/auto/subclassreplica/tst_subclassreplicatest.cpp
2022-04-05 23:41:46.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-6.3.1/tests/auto/subclassreplica/tst_subclassreplicatest.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -30,6 +30,8 @@
#include <QtTest>
#include "rep_class_merged.h"
+#include "../../shared/testutils.h"
+
class SubClassReplicaTest : public QObject
{
Q_OBJECT
@@ -61,7 +63,7 @@
QFETCH(bool, templated);
QFETCH(bool, nullobject);
- QRemoteObjectRegistryHost host(QUrl("local:test"));
+ QRemoteObjectRegistryHost host(QUrl(LOCAL_SOCKET ":test"));
SubClassSimpleSource subclass1, subclass2;
ParentClassSimpleSource parent;
parent.setSub1(&subclass1);
@@ -87,7 +89,7 @@
else
host.enableRemoting(&parent);
- QRemoteObjectNode client(QUrl("local:test"));
+ QRemoteObjectNode client(QUrl(LOCAL_SOCKET ":test"));
const QScopedPointer<ParentClassReplica>
replica(client.acquire<ParentClassReplica>());
QVERIFY(replica->waitForSource(1000));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tests/shared/testutils.h
new/qtremoteobjects-everywhere-src-6.3.1/tests/shared/testutils.h
--- old/qtremoteobjects-everywhere-src-6.3.0/tests/shared/testutils.h
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tests/shared/testutils.h
2022-06-08 05:44:24.000000000 +0200
@@ -35,6 +35,12 @@
#include <QStandardPaths>
#include <QCoreApplication>
+#ifdef Q_OS_ANDROID
+#define LOCAL_SOCKET "localabstract"
+#else
+#define LOCAL_SOCKET "local"
+#endif
+
namespace TestUtils {
QString subFolder;
@@ -44,6 +50,12 @@
{
if (!TestUtils::rootFolder.isEmpty())
return true;
+
+#ifdef Q_OS_ANDROID
+ // All libraries are at located at the native libraries folder
+ return true;
+#endif
+
const auto appPath = QCoreApplication::applicationDirPath();
auto dir = QDir(appPath);
while (dir.dirName() != folder) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tools/repc/.prev_CMakeLists.txt
new/qtremoteobjects-everywhere-src-6.3.1/tools/repc/.prev_CMakeLists.txt
--- old/qtremoteobjects-everywhere-src-6.3.0/tools/repc/.prev_CMakeLists.txt
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tools/repc/.prev_CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-# Generated from repc.pro.
-
-#####################################################################
-## repc Tool:
-#####################################################################
-
-qt_get_tool_target_name(target_name repc)
-qt_add_tool(${target_name}
- TARGET_DESCRIPTION "Qt Remote Objects Compiler"
- SOURCES
- cppcodegenerator.cpp cppcodegenerator.h
- main.cpp
- repcodegenerator.cpp repcodegenerator.h
- utils.cpp utils.h
- DEFINES
- QT_NO_CAST_FROM_ASCII
- QT_NO_CAST_FROM_BYTEARRAY
- QT_NO_CAST_TO_ASCII
- QT_NO_URL_CAST_FROM_STRING
- RO_INSTALL_HEADERS=\"$$[QT_INSTALL_HEADERS]/QtRemoteObjects\"
- INCLUDE_DIRECTORIES
- ${CMAKE_SOURCE_DIR}/src/repparser
- PUBLIC_LIBRARIES
- Qt::CorePrivate
-)
-
-# QLALR Grammars:
-qt_process_qlalr(
- repc
- ${CMAKE_SOURCE_DIR}/src/repparser/parser.g
- ""
-)
-
-#### Keys ignored in scope 1:.:.:repc.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Qt Remote Objects Compiler"
-# _OPTION = "host_build"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(${target_name} CONDITION MSVC
- COMPILE_OPTIONS
- /wd4129
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tools/repc/repcodegenerator.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tools/repc/repcodegenerator.cpp
--- old/qtremoteobjects-everywhere-src-6.3.0/tools/repc/repcodegenerator.cpp
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tools/repc/repcodegenerator.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -261,6 +261,7 @@
"#include <QtCore/qobject.h>\n"
"#include <QtCore/qdatastream.h>\n"
"#include <QtCore/qvariant.h>\n"
+ "#include <QtCore/qmap.h>\n"
"#include <QtCore/qmetatype.h>\n";
bool hasModel = false;
for (auto c : m_ast.classes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-6.3.0/tools/repc/utils.cpp
new/qtremoteobjects-everywhere-src-6.3.1/tools/repc/utils.cpp
--- old/qtremoteobjects-everywhere-src-6.3.0/tools/repc/utils.cpp
2022-04-05 23:41:46.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-6.3.1/tools/repc/utils.cpp
2022-06-08 05:44:24.000000000 +0200
@@ -48,7 +48,8 @@
Bool
};
- static QJsonValue _Sub(const QJsonValue &json, const char *key,
JSON::Types type=JSON::Any) {
+ static QJsonValue getItem(const QJsonValue &json, const char *key,
JSON::Types type = JSON::Any)
+ {
if (json.isUndefined())
qCritical() << "Invalid metadata json file. Unexpected Undefined
value when looking for key:" << key;
if (!json.isObject())
@@ -76,7 +77,8 @@
return value;
}
- static bool _Contains(const QJsonValue &json, const char *key) {
+ static bool containsKey(const QJsonValue &json, const char *key)
+ {
if (json.isUndefined())
qCritical() << "Invalid metadata json file. Unexpected Undefined
value when looking for key:" << key;
if (!json.isObject())
@@ -84,23 +86,37 @@
return json.toObject().contains(_(key));
}
- static bool _Empty(const QJsonValue &json, const char *key) {
- if (!_Contains(json, key))
+ static bool isEmptyArray(const QJsonValue &json, const char *key)
+ {
+ if (!containsKey(json, key))
return true;
- const auto value = _Sub(json, key);
+ const auto value = getItem(json, key);
if (!value.isArray())
qCritical() << "Invalid metadata json file." << key << "is not an
array.";
return value.toArray().count() == 0;
}
- static QJsonArray _Array(const QJsonValue &json, const char *key) { return
_Sub(json, key, JSON::Array).toArray(); }
- static QString _String(const QJsonValue &json, const char *key) { return
_Sub(json, key, JSON::String).toString(); }
- static QByteArray _Bytes(const QJsonValue &json, const char *key) { return
_Sub(json, key, JSON::String).toString().toLatin1(); }
- static bool _Bool(const QJsonValue &json, const char *key) { return
_Sub(json, key, JSON::Bool).toBool(); }
- static bool _Bool(const QJsonValue &json, const char *key, bool
missingValue) {
- if (!_Contains(json, key))
+ static QJsonArray getArray(const QJsonValue &json, const char *key)
+ {
+ return getItem(json, key, JSON::Array).toArray();
+ }
+ static QString getString(const QJsonValue &json, const char *key)
+ {
+ return getItem(json, key, JSON::String).toString();
+ }
+ static QByteArray getBytes(const QJsonValue &json, const char *key)
+ {
+ return getItem(json, key, JSON::String).toString().toLatin1();
+ }
+ static bool getBool(const QJsonValue &json, const char *key)
+ {
+ return getItem(json, key, JSON::Bool).toBool();
+ }
+ static bool getBool(const QJsonValue &json, const char *key, bool
missingValue)
+ {
+ if (!containsKey(json, key))
return missingValue;
- bool res = _Bool(json, key);
+ bool res = getBool(json, key);
return res;
}
}
@@ -123,14 +139,15 @@
{
QByteArrayList ret;
for (const QJsonValue prop : properties) {
- if (!isPod && !_Contains(prop, "notify") && !_Bool(prop, "constant")) {
- qWarning() << "Skipping property" << _String(prop, "name") <<
"because it is non-notifiable & non-constant";
+ if (!isPod && !containsKey(prop, "notify") && !getBool(prop,
"constant")) {
+ qWarning() << "Skipping property" << getString(prop, "name")
+ << "because it is non-notifiable & non-constant";
continue; // skip non-notifiable properties
}
- QByteArray output = _Bytes(prop, "type") + " " + _Bytes(prop, "name");
- if (_Bool(prop, "constant"))
+ QByteArray output = getBytes(prop, "type") + " " + getBytes(prop,
"name");
+ if (getBool(prop, "constant"))
output += " CONSTANT";
- if (!_Contains(prop, "write") && _Contains(prop, "read."))
+ if (!containsKey(prop, "write") && containsKey(prop, "read."))
output += " READONLY";
ret << output;
}
@@ -141,10 +158,10 @@
{
QByteArray ret;
for (const QJsonValue func : functions) {
- ret += type + "(" + _Bytes(func, "returnType") + " " + _Bytes(func,
"name") + "(";
- const auto arguments = _Array(func, "arguments");
+ ret += type + "(" + getBytes(func, "returnType") + " " +
getBytes(func, "name") + "(";
+ const auto arguments = getArray(func, "arguments");
for (const QJsonValue arg : arguments)
- ret += _Bytes(arg, "type") + " " + _Bytes(arg, "name") + ", ";
+ ret += getBytes(arg, "type") + " " + getBytes(arg, "name") + ", ";
if (arguments.count())
ret.chop(2);
ret += "));\n";
@@ -153,22 +170,25 @@
}
const auto filterNotPublic = [](const QJsonValue &value) {
- return _String(value, "access") != QStringLiteral("public"); };
+ return getString(value, "access") != QStringLiteral("public");
+};
static QJsonArray cleanedSignalList(const QJsonValue &cls)
{
- if (_Empty(cls, "signals"))
+ if (isEmptyArray(cls, "signals"))
return QJsonArray();
- auto signalList = _Array(cls, "signals");
- if (_Empty(cls, "properties"))
+ auto signalList = getArray(cls, "signals");
+ if (isEmptyArray(cls, "properties"))
return signalList;
- const auto props = _Array(cls, "properties");
+ const auto props = getArray(cls, "properties");
const auto filterNotify = [&props](const QJsonValue &value) {
const auto filter = [&value](const QJsonValue &prop) {
- return _Sub(value, "name") == _Sub(prop, "notify"); };
- return std::find_if(props.begin(), props.end(), filter) !=
props.end(); };
+ return getItem(value, "name") == getItem(prop, "notify");
+ };
+ return std::find_if(props.begin(), props.end(), filter) != props.end();
+ };
for (auto it = signalList.begin(); it != signalList.end(); /* blank */ ) {
if (filterNotify(*it))
it = signalList.erase(it);
@@ -182,20 +202,22 @@
static QJsonArray cleanedSlotList(const QJsonValue &cls)
{
- if (_Empty(cls, "slots"))
+ if (isEmptyArray(cls, "slots"))
return QJsonArray();
- auto slotList = _Array(cls, "slots");
- if (!_Empty(cls, "properties"))
+ auto slotList = getArray(cls, "slots");
+ if (!isEmptyArray(cls, "properties"))
return slotList;
- const auto props = _Array(cls, "properties");
+ const auto props = getArray(cls, "properties");
const auto filterWrite = [&props](const QJsonValue &value) {
const auto filter = [&value](const QJsonValue &prop) {
- const auto args = _Array(prop, "arguments");
- return _Sub(value, "name") == _Sub(prop, "write") &&
- args.count() == 1 && _Sub(args.at(0), "type") == _Sub(prop,
"type"); };
- return std::find_if(props.begin(), props.end(), filter) !=
props.end(); };
+ const auto args = getArray(prop, "arguments");
+ return getItem(value, "name") == getItem(prop, "write") &&
args.count() == 1
+ && getItem(args.at(0), "type") == getItem(prop, "type");
+ };
+ return std::find_if(props.begin(), props.end(), filter) != props.end();
+ };
for (auto it = slotList.begin(); it != slotList.end(); /* blank */ ) {
if (filterWrite(*it))
it = slotList.erase(it);
@@ -209,13 +231,15 @@
QByteArray generateClass(const QJsonValue &cls, bool alwaysGenerateClass)
{
- if (_Bool(cls, "gadget", false) || alwaysGenerateClass ||
- (_Empty(cls, "signals") && _Empty(cls, "slots")))
- return "POD " + _Bytes(cls, "className") + "(" +
join(generateProperties(_Array(cls, "properties"), true), ", ") + ")\n";
-
- QByteArray ret("class " + _Bytes(cls, "className") + "\n{\n");
- if (!_Empty(cls, "properties"))
- ret += " PROP(" + join(generateProperties(_Array(cls,
"properties")), ");\n PROP(") + ");\n";
+ if (getBool(cls, "gadget", false) || alwaysGenerateClass
+ || (isEmptyArray(cls, "signals") && isEmptyArray(cls, "slots")))
+ return "POD " + getBytes(cls, "className") + "("
+ + join(generateProperties(getArray(cls, "properties"), true),
", ") + ")\n";
+
+ QByteArray ret("class " + getBytes(cls, "className") + "\n{\n");
+ if (!isEmptyArray(cls, "properties"))
+ ret += " PROP(" + join(generateProperties(getArray(cls,
"properties")), ");\n PROP(")
+ + ");\n";
ret += generateFunctions(" SLOT", cleanedSlotList(cls));
ret += generateFunctions(" SIGNAL", cleanedSignalList(cls));
ret += "}\n";
@@ -226,7 +250,7 @@
{
QList<PODAttribute> ret;
for (const QJsonValue prop : list)
- ret.push_back(PODAttribute(_String(prop, "type"), _String(prop,
"name")));
+ ret.push_back(PODAttribute(getString(prop, "type"), getString(prop,
"name")));
return ret;
}
@@ -234,18 +258,18 @@
{
QList<ASTProperty> ret;
for (const QJsonValue property : list) {
- if (!_Contains(property, "notify") && !_Bool(property, "constant")) {
- qWarning() << "Skipping property" << _String(property, "name") <<
"because it is non-notifiable & non-constant";
+ if (!containsKey(property, "notify") && !getBool(property,
"constant")) {
+ qWarning() << "Skipping property" << getString(property, "name")
+ << "because it is non-notifiable & non-constant";
continue; // skip non-notifiable properties
}
ASTProperty prop;
- prop.name = _String(property, "name");
- prop.type = _String(property, "type");
- prop.modifier = _Bool(property, "constant")
- ? ASTProperty::Constant
- : !_Contains(property, "write") && _Contains(property,
"read")
- ? ASTProperty::ReadOnly
- : ASTProperty::ReadWrite;
+ prop.name = getString(property, "name");
+ prop.type = getString(property, "type");
+ prop.modifier = getBool(property, "constant") ? ASTProperty::Constant
+ : !containsKey(property, "write") && containsKey(property,
"read")
+ ? ASTProperty::ReadOnly
+ : ASTProperty::ReadWrite;
ret.push_back(prop);
}
return ret;
@@ -256,11 +280,11 @@
QList<ASTFunction> ret;
for (const QJsonValue function : list) {
ASTFunction func;
- func.name = _String(function, "name");
- func.returnType = _String(function, "returnType");
- const auto arguments = _Array(function, "arguments");
+ func.name = getString(function, "name");
+ func.returnType = getString(function, "returnType");
+ const auto arguments = getArray(function, "arguments");
for (const QJsonValue arg : arguments)
- func.params.push_back(ASTDeclaration(_String(arg, "type"),
_String(arg, "name")));
+ func.params.push_back(ASTDeclaration(getString(arg, "type"),
getString(arg, "name")));
ret.push_back(func);
}
return ret;
@@ -270,14 +294,14 @@
{
AST ret;
for (const QJsonValue cls : classes) {
- if (_Empty(cls, "signals") && _Empty(cls, "slots")) {
+ if (isEmptyArray(cls, "signals") && isEmptyArray(cls, "slots")) {
POD pod;
- pod.name = _String(cls, "className");
- pod.attributes = propertyList2PODAttributes(_Array(cls,
"properties"));
+ pod.name = getString(cls, "className");
+ pod.attributes = propertyList2PODAttributes(getArray(cls,
"properties"));
ret.pods.push_back(pod);
} else {
- ASTClass cl(_String(cls, "className"));
- cl.properties = propertyList2AstProperties(_Array(cls,
"properties"));
+ ASTClass cl(getString(cls, "className"));
+ cl.properties = propertyList2AstProperties(getArray(cls,
"properties"));
cl.signalsList =
functionList2AstFunctionList(cleanedSignalList(cls));
cl.slotsList = functionList2AstFunctionList(cleanedSlotList(cls));
ret.classes.push_back(cl);
