From 085935e7c2e7793ca915e64f2ed9d6ae37570e21 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 30 Jul 2019 11:25:42 +0300 Subject: Add changes file for Qt 5.13.1 + c4bc9fe0c181eb8c6c9b3b809bc6e0d4ffd0b82e Fix return value propagation through proxies + e520e4fd777350673d5022982481f82672fea6ff Add .vscode to .gitignore + 91f83125dd403878c989be4098cc3a35eb5ba06f More fixes for (dynamic) enums in signals and slots + fa84f22bfd5500550f26f544f6905ac89e60716f Fix dynamic use_enum logic (Qt types only) + 2d5105518ee21ea9ccb32effab76f4c5d1366cae Support Q_GADGETs with enums + ff04810bd09d3897ccede880680dd94fcf585171 Make sure class enums work dynamically + 244688018624f5f753efa16f7fe6c7b60a80fda2 Bump version + 0cdd47b80f26f5e7bb86b34ce31f07bbe2f49640 Add changes file for Qt 5.12.4 + 93cb11ec09086bf0e29fed2fd28f1d82ba2673c0 Bump version + fafb11943fac1a4a452b3db70ab604ff5aa1e281 Bump version + 1a924ee6bb250aa0a8d64d66491950bc3d86091e Fix yet another -Wdeprecated-copy warning + c973a6eb63b52db6bcb4c15854797228903fc756 Fix reported error for Handshake + d04b169dceb451507cc642dc9b1e26e3f34bafff Doc: Improve the documentation landing page + 79dff64a04486f7c599b8442a74c1b54b72137c1 Doc: Replace example file lists with links to code.qt.io + 760a7564d0774ed2de4a90fa0d51c7eca9f454bc Doc: Reorganize parts of the documentation for better readability + cbef241ded4c7255f163af962293c201b27f341f Doc: Improve conceptual content for Node and Source + 68f6423ac6e0d49bb02ae36bf29765688f271d18 Fix TestModelView::testModelTest flakiness - again + 2bcda9d9f45858ac196d9972162c870ac0a6f217 QRemoteObjectPendingReply: fix GCC -Wdeprecated-copy Change-Id: If9b549e89b9e5c553f146d1eea1370eb218aa313 Reviewed-by: Brett Stottlemyer --- dist/changes-5.13.1 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 dist/changes-5.13.1 diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1 new file mode 100644 index 0000000..ce9927b --- /dev/null +++ b/dist/changes-5.13.1 @@ -0,0 +1,21 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - Improved clarity and consistency of documentation. + - Made a number of fixes and improvements in the handling of enumerations. -- cgit v1.2.3 From c76dfdc3eafe1d2129761951c3ca6970699badfb Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 20 Aug 2019 13:16:25 +0300 Subject: Add changes file for Qt 5.12.5 + fafb11943fac1a4a452b3db70ab604ff5aa1e281 Bump version + 1a924ee6bb250aa0a8d64d66491950bc3d86091e Fix yet another -Wdeprecated-copy warning + c973a6eb63b52db6bcb4c15854797228903fc756 Fix reported error for Handshake + 68f6423ac6e0d49bb02ae36bf29765688f271d18 Fix TestModelView::testModelTest flakiness - again + 2bcda9d9f45858ac196d9972162c870ac0a6f217 QRemoteObjectPendingReply: fix GCC -Wdeprecated-copy Change-Id: I3865681f2e21b735a6e061de486c9d93bfef6242 Reviewed-by: Michael Brasser --- dist/changes-5.12.5 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.12.5 diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 0000000..e8be931 --- /dev/null +++ b/dist/changes-5.12.5 @@ -0,0 +1,20 @@ +Qt 5.12.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.4. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. -- cgit v1.2.3 From b2e0bf60442a09d16dbe89e916c8e1b9e0c0223f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 19 Sep 2019 09:57:03 +0200 Subject: Fix deprecation warnings related to QBasicAtomicInteger MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use loadRelaxed(), fixing: remoteobjectreplica_p.h: In member function ‘virtual QRemoteObjectReplica::State QRemoteObjectReplicaImplementation::state() const’: qremoteobjectreplica_p.h:120:106: warning: ‘T QBasicAtomicInteger::load() const [with T = int]’ is deprecated: Use loadRelaxed [-Wdeprecated-declarations] Change-Id: I8feef08c5de8355e02442ccf7ca1ebca05e26c1f Reviewed-by: Kari Oikarinen --- src/remoteobjects/qremoteobjectpendingcall.h | 2 +- src/remoteobjects/qremoteobjectreplica_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remoteobjects/qremoteobjectpendingcall.h b/src/remoteobjects/qremoteobjectpendingcall.h index 086e5d8..b9709fc 100644 --- a/src/remoteobjects/qremoteobjectpendingcall.h +++ b/src/remoteobjects/qremoteobjectpendingcall.h @@ -140,7 +140,7 @@ struct QMetaTypeId< QRemoteObjectPendingReply > static int qt_metatype_id() { static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); - if (const int id = metatype_id.load()) + if (const int id = metatype_id.loadRelaxed()) return id; const char *tName = QMetaType::typeName(qMetaTypeId()); Q_ASSERT(tName); diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h index 79a07cf..8acefda 100644 --- a/src/remoteobjects/qremoteobjectreplica_p.h +++ b/src/remoteobjects/qremoteobjectreplica_p.h @@ -117,7 +117,7 @@ public: void setProperty(int i, const QVariant &) override = 0; virtual bool isShortCircuit() const = 0; bool isInitialized() const override { return true; } - QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State(m_state.load()); } + QRemoteObjectReplica::State state() const override { return QRemoteObjectReplica::State(m_state.loadRelaxed()); } void setState(QRemoteObjectReplica::State state); bool waitForSource(int) override { return true; } virtual bool waitForFinished(const QRemoteObjectPendingCall &, int) { return true; } -- cgit v1.2.3 From 55cdbcd4058b352702e43f0b573f79f6dc69c13d Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 1 Oct 2019 17:19:31 -0500 Subject: Add basic documentation for QRemoteObjectPendingCall and friends Change-Id: I359e890b6b4d2ff587f5445c677f04e47e16cdd0 Reviewed-by: Brett Stottlemyer --- src/imports/remoteobjects/plugin.cpp | 2 + src/remoteobjects/doc/src/remoteobjects-qml.qdoc | 19 +++++++ src/remoteobjects/qremoteobjectpendingcall.cpp | 69 ++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/src/imports/remoteobjects/plugin.cpp b/src/imports/remoteobjects/plugin.cpp index 4032a63..2cdf38c 100644 --- a/src/imports/remoteobjects/plugin.cpp +++ b/src/imports/remoteobjects/plugin.cpp @@ -55,6 +55,8 @@ struct QtQmlRemoteObjectsResponse { QTimer *timer; }; + +// documentation updates for this class can be made in remoteobjects-qml.qdoc class QtQmlRemoteObjects : public QObject { Q_OBJECT diff --git a/src/remoteobjects/doc/src/remoteobjects-qml.qdoc b/src/remoteobjects/doc/src/remoteobjects-qml.qdoc index cdd3d5c..e69c9be 100644 --- a/src/remoteobjects/doc/src/remoteobjects-qml.qdoc +++ b/src/remoteobjects/doc/src/remoteobjects-qml.qdoc @@ -84,3 +84,22 @@ import QtRemoteObjects 5.\1 \section1 QML Types */ + +/*! +\qmltype QtRemoteObjects +\inqmlmodule QtRemoteObjects +\since 5.14 +\brief The QtRemoteObjects global object provides useful functions for working with remote + types in QML. +*/ + +/*! + \qmlmethod Promise QtRemoteObjects::QtRemoteObjects::watch(QRemoteObjectPendingCall reply, int timeout = 30000) + Encapsulates the return value from a replica in a JavaScript Promise. + + \qml + QtRemoteObjects.watch(replica.fetchDetails(identifier)) + .then(function(value) { details = value }, + function(error) { console.log("error fetching details:", error) }) + \endqml +*/ diff --git a/src/remoteobjects/qremoteobjectpendingcall.cpp b/src/remoteobjects/qremoteobjectpendingcall.cpp index 5393f12..c7574cf 100644 --- a/src/remoteobjects/qremoteobjectpendingcall.cpp +++ b/src/remoteobjects/qremoteobjectpendingcall.cpp @@ -72,6 +72,12 @@ void QRemoteObjectPendingCallWatcherHelper::emitSignals() emit finished(); } +/*! + \class QRemoteObjectPendingCall + \inmodule QtRemoteObjects + \brief Encapsulates the result of an asynchronous method call. +*/ + QRemoteObjectPendingCall::QRemoteObjectPendingCall() : d(new QRemoteObjectPendingCallData) { @@ -97,6 +103,12 @@ QRemoteObjectPendingCall &QRemoteObjectPendingCall::operator=(const QRemoteObjec return *this; } +/*! + Returns the return value of the remote call. + + returnValue will only be valid when the remote call has finished and there + are no \l {error}s. +*/ QVariant QRemoteObjectPendingCall::returnValue() const { if (!d) @@ -106,6 +118,20 @@ QVariant QRemoteObjectPendingCall::returnValue() const return d->returnValue; } +/*! + \enum QRemoteObjectPendingCall::Error + + This enum type specifies the possible error values for a remote call: + + \value NoError + No error occurred. + \value InvalidMessage + The default error state prior to the remote call finishing. +*/ + +/*! + Returns the error, if any, from the remote call. +*/ QRemoteObjectPendingCall::Error QRemoteObjectPendingCall::error() const { if (!d) @@ -115,6 +141,11 @@ QRemoteObjectPendingCall::Error QRemoteObjectPendingCall::error() const return d->error; } +/*! + Returns true if the remote call has finished, false otherwise. + + A finished call will include a returnValue or \l error. +*/ bool QRemoteObjectPendingCall::isFinished() const { if (!d) @@ -124,6 +155,9 @@ bool QRemoteObjectPendingCall::isFinished() const return d->error != InvalidMessage; } +/*! + Blocks for up to \a timeout milliseconds, until the remote call has finished. +*/ bool QRemoteObjectPendingCall::waitForFinished(int timeout) { if (!d) @@ -153,6 +187,15 @@ public: Q_DECLARE_PUBLIC(QRemoteObjectPendingCallWatcher) }; +/*! + \class QRemoteObjectPendingCallWatcher + \inmodule QtRemoteObjects + \brief Provides a QObject-based API for watching a QRemoteObjectPendingCall. + + QRemoteObjectPendingCallWatcher provides a signal indicating when a QRemoteObjectPendingCall + has finished, allowing for convenient, non-blocking handling of the call. +*/ + QRemoteObjectPendingCallWatcher::QRemoteObjectPendingCallWatcher(const QRemoteObjectPendingCall &call, QObject *parent) : QObject(*new QRemoteObjectPendingCallWatcherPrivate, parent) , QRemoteObjectPendingCall(call) @@ -174,6 +217,11 @@ QRemoteObjectPendingCallWatcher::~QRemoteObjectPendingCallWatcher() { } +/*! + Returns true if the remote call has finished, false otherwise. + + A finished call will include a returnValue or error. +*/ bool QRemoteObjectPendingCallWatcher::isFinished() const { if (!d) @@ -183,6 +231,9 @@ bool QRemoteObjectPendingCallWatcher::isFinished() const return d->error != QRemoteObjectPendingCall::InvalidMessage; } +/*! + Blocks until the remote call has finished. +*/ void QRemoteObjectPendingCallWatcher::waitForFinished() { if (d) { @@ -194,6 +245,24 @@ void QRemoteObjectPendingCallWatcher::waitForFinished() } } +/*! + \fn QRemoteObjectPendingCallWatcher::finished(QRemoteObjectPendingCallWatcher *self) + + This signal is emitted when the remote call has finished. A finished call will include a + returnValue or error. +*/ + +/*! + \class QRemoteObjectPendingReply + \inmodule QtRemoteObjects + \brief A templated version of QRemoteObjectPendingCall. +*/ + +/*! \fn template T QRemoteObjectPendingReply::returnValue() const + + Returns a strongly typed version of the return value of the remote call. +*/ + QT_END_NAMESPACE #include "moc_qremoteobjectpendingcall.cpp" -- cgit v1.2.3 From 096ea169993bd161aeb93c7acd8dbe41c5c27b29 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 4 Oct 2019 15:15:31 +0200 Subject: repc: Use declarative approach in moc.pri The assignment is technically correct but pro2cmake cannot handle it properly. Append to SOURCES and HEADERS instead, as this doesn't make a real difference to the QMake project. Change-Id: I1360c96d25be09b767b54553a9aed8cb0f4768b1 Reviewed-by: Brett Stottlemyer --- tools/repc/moc_copy/moc.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/repc/moc_copy/moc.pri b/tools/repc/moc_copy/moc.pri index b689a35..6d0ca8a 100644 --- a/tools/repc/moc_copy/moc.pri +++ b/tools/repc/moc_copy/moc.pri @@ -1,7 +1,7 @@ INCLUDEPATH += $$PWD -HEADERS = $$PWD/moc.h \ +HEADERS += $$PWD/moc.h \ $$PWD/preprocessor.h \ $$PWD/parser.h \ $$PWD/symbols.h \ @@ -9,7 +9,7 @@ HEADERS = $$PWD/moc.h \ $$PWD/utils.h \ $$PWD/generator.h \ $$PWD/outputrevision.h -SOURCES = $$PWD/moc.cpp \ +SOURCES += $$PWD/moc.cpp \ $$PWD/preprocessor.cpp \ $$PWD/generator.cpp \ $$PWD/parser.cpp \ -- cgit v1.2.3 From 83459e95f0fdcf2b9f2f553c5d1449d2ab86b329 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 4 Oct 2019 15:17:48 +0200 Subject: Add missing include guard to namespace.h The missing include guard will break the CMake build that uses mocs_compilation.cpp file that indirectly includes namespace.h twice. Change-Id: I403db6d33fca14adf71ca941cd2e0aee6e4d44d1 Reviewed-by: Brett Stottlemyer --- tests/auto/proxy_multiprocess/namespace.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/auto/proxy_multiprocess/namespace.h b/tests/auto/proxy_multiprocess/namespace.h index 2d06e67..1b9b59e 100644 --- a/tests/auto/proxy_multiprocess/namespace.h +++ b/tests/auto/proxy_multiprocess/namespace.h @@ -1,3 +1,6 @@ +#ifndef __PROXY_MULTIPROCESS_NAMESPACE_H__ +#define __PROXY_MULTIPROCESS_NAMESPACE_H__ + #include namespace NS @@ -13,3 +16,5 @@ namespace NS2 enum class NamespaceEnum : quint8 { Alpha=1, Bravo, Charlie }; Q_ENUM_NS(NamespaceEnum) } + +#endif // include guard -- cgit v1.2.3 From 11ed9065209e65e92257bf1a713d3deefd9d64fc Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 4 Oct 2019 15:22:09 +0200 Subject: Remove failed attempts of adding generated header files Line continuations were missing which made the lines no-ops, and adding generated header files this way is unnecessary. Change-Id: I2697cbb1e2c19bd7b6d56b45b01070ed0b23db8a Reviewed-by: Brett Stottlemyer --- tests/auto/integration_external/server/server.pro | 1 - tests/auto/integration_multiprocess/server/server.pro | 1 - tests/auto/restart/server/server.pro | 1 - 3 files changed, 3 deletions(-) diff --git a/tests/auto/integration_external/server/server.pro b/tests/auto/integration_external/server/server.pro index fea0c03..7f3f735 100644 --- a/tests/auto/integration_external/server/server.pro +++ b/tests/auto/integration_external/server/server.pro @@ -14,6 +14,5 @@ SOURCES += main.cpp \ HEADERS += \ mytestserver.h - $$OUT_PWD/rep_MyInterface_source.h INCLUDEPATH += $$PWD diff --git a/tests/auto/integration_multiprocess/server/server.pro b/tests/auto/integration_multiprocess/server/server.pro index 5bb7120..d210d53 100644 --- a/tests/auto/integration_multiprocess/server/server.pro +++ b/tests/auto/integration_multiprocess/server/server.pro @@ -15,6 +15,5 @@ SOURCES += main.cpp \ HEADERS += \ mytestserver.h - $$OUT_PWD/rep_MyInterface_source.h INCLUDEPATH += $$PWD diff --git a/tests/auto/restart/server/server.pro b/tests/auto/restart/server/server.pro index eefc7a5..a5a7d7e 100644 --- a/tests/auto/restart/server/server.pro +++ b/tests/auto/restart/server/server.pro @@ -14,6 +14,5 @@ SOURCES += main.cpp \ HEADERS += \ mytestserver.h - $$OUT_PWD/rep_subclass_source.h INCLUDEPATH += $$PWD -- cgit v1.2.3 From 24c7efea92ff563aa426de23c13dac0e1cad7d9a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 4 Oct 2019 15:24:44 +0200 Subject: Name tests and test helpers uniquely Several build tools (e.g. MSBuild and CMake) do not support duplicate application names in the project. Change-Id: I28da2c3f25f126bee35cb7a827be80e63689c8f4 Reviewed-by: Brett Stottlemyer --- tests/auto/integration_external/client/client.pro | 2 +- .../auto/integration_external/external/tst_integration_external.cpp | 4 ++-- tests/auto/integration_external/server/server.pro | 2 +- tests/auto/integration_multiprocess/client/client.pro | 2 +- tests/auto/integration_multiprocess/server/server.pro | 2 +- .../integration_multiprocess/tst/tst_integration_multiprocess.cpp | 4 ++-- tests/auto/proxy_multiprocess/client/client.pro | 2 +- tests/auto/proxy_multiprocess/server/server.pro | 2 +- tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp | 4 ++-- tests/auto/repc/pods/pods.pro | 2 +- tests/auto/restart/client/client.pro | 2 +- tests/auto/restart/server/server.pro | 2 +- tests/auto/restart/tst/tst_restart.cpp | 6 +++--- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/auto/integration_external/client/client.pro b/tests/auto/integration_external/client/client.pro index 4c42f5c..6bcc136 100644 --- a/tests/auto/integration_external/client/client.pro +++ b/tests/auto/integration_external/client/client.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = client +TARGET = integration_external_client DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/integration_external/external/tst_integration_external.cpp b/tests/auto/integration_external/external/tst_integration_external.cpp index 8994db8..4c62e38 100644 --- a/tests/auto/integration_external/external/tst_integration_external.cpp +++ b/tests/auto/integration_external/external/tst_integration_external.cpp @@ -81,7 +81,7 @@ private slots: env.insert("TEMPLATED_REMOTING", "true"); serverProc.setProcessEnvironment(env); } - serverProc.start(findExecutable("server", { + serverProc.start(findExecutable("integration_external_server", { QCoreApplication::applicationDirPath() + "/../server/" })); QVERIFY(serverProc.waitForStarted()); @@ -92,7 +92,7 @@ private slots: qDebug() << "Starting client process"; QProcess clientProc; clientProc.setProcessChannelMode(QProcess::ForwardedChannels); - clientProc.start(findExecutable("client", { + clientProc.start(findExecutable("integration_external_client", { QCoreApplication::applicationDirPath() + "/../client/" })); QVERIFY(clientProc.waitForStarted()); diff --git a/tests/auto/integration_external/server/server.pro b/tests/auto/integration_external/server/server.pro index 7f3f735..73b79b3 100644 --- a/tests/auto/integration_external/server/server.pro +++ b/tests/auto/integration_external/server/server.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = server +TARGET = integration_external_server DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/integration_multiprocess/client/client.pro b/tests/auto/integration_multiprocess/client/client.pro index 4c42f5c..084e665 100644 --- a/tests/auto/integration_multiprocess/client/client.pro +++ b/tests/auto/integration_multiprocess/client/client.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = client +TARGET = integration_multiprocess_client DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/integration_multiprocess/server/server.pro b/tests/auto/integration_multiprocess/server/server.pro index d210d53..71f9160 100644 --- a/tests/auto/integration_multiprocess/server/server.pro +++ b/tests/auto/integration_multiprocess/server/server.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = server +TARGET = integration_multiprocess_server DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp b/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp index fe5d929..ccdc973 100644 --- a/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp +++ b/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp @@ -81,7 +81,7 @@ private slots: env.insert("TEMPLATED_REMOTING", "true"); serverProc.setProcessEnvironment(env); } - serverProc.start(findExecutable("server", { + serverProc.start(findExecutable("integration_multiprocess_server", { QCoreApplication::applicationDirPath() + "/../server/" })); QVERIFY(serverProc.waitForStarted()); @@ -92,7 +92,7 @@ private slots: qDebug() << "Starting client process"; QProcess clientProc; clientProc.setProcessChannelMode(QProcess::ForwardedChannels); - clientProc.start(findExecutable("client", { + clientProc.start(findExecutable("integration_multiprocess_client", { QCoreApplication::applicationDirPath() + "/../client/" })); QVERIFY(clientProc.waitForStarted()); diff --git a/tests/auto/proxy_multiprocess/client/client.pro b/tests/auto/proxy_multiprocess/client/client.pro index 7a181a2..aad86e2 100644 --- a/tests/auto/proxy_multiprocess/client/client.pro +++ b/tests/auto/proxy_multiprocess/client/client.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = client +TARGET = proxy_multiprocess_client DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/proxy_multiprocess/server/server.pro b/tests/auto/proxy_multiprocess/server/server.pro index 02ca498..a56477b 100644 --- a/tests/auto/proxy_multiprocess/server/server.pro +++ b/tests/auto/proxy_multiprocess/server/server.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = server +TARGET = proxy_multiprocess_server DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp b/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp index e7f382b..6973101 100644 --- a/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp +++ b/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp @@ -89,7 +89,7 @@ private slots: env.insert("TEMPLATED_REMOTING", "true"); } serverProc.setProcessEnvironment(env); - serverProc.start(findExecutable("server", { + serverProc.start(findExecutable("proxy_multiprocess_server", { QCoreApplication::applicationDirPath() + "/../server/" })); QVERIFY(serverProc.waitForStarted()); @@ -102,7 +102,7 @@ private slots: QProcess clientProc; clientProc.setProcessChannelMode(QProcess::ForwardedChannels); clientProc.setProcessEnvironment(env); - clientProc.start(findExecutable("client", { + clientProc.start(findExecutable("proxy_multiprocess_client", { QCoreApplication::applicationDirPath() + "/../client/" })); QVERIFY(clientProc.waitForStarted()); diff --git a/tests/auto/repc/pods/pods.pro b/tests/auto/repc/pods/pods.pro index c32fffa..dc7b717 100644 --- a/tests/auto/repc/pods/pods.pro +++ b/tests/auto/repc/pods/pods.pro @@ -1,5 +1,5 @@ CONFIG += testcase -TARGET = tst_pods +TARGET = tst_repc_pods QT += testlib remoteobjects QT -= gui diff --git a/tests/auto/restart/client/client.pro b/tests/auto/restart/client/client.pro index ce435c2..24a83b3 100644 --- a/tests/auto/restart/client/client.pro +++ b/tests/auto/restart/client/client.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = client +TARGET = restart_client DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/restart/server/server.pro b/tests/auto/restart/server/server.pro index a5a7d7e..4ad55ee 100644 --- a/tests/auto/restart/server/server.pro +++ b/tests/auto/restart/server/server.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += remoteobjects core testlib QT -= gui -TARGET = server +TARGET = restart_server DESTDIR = ./ CONFIG += c++11 CONFIG -= app_bundle diff --git a/tests/auto/restart/tst/tst_restart.cpp b/tests/auto/restart/tst/tst_restart.cpp index a3633fa..d76b3de 100644 --- a/tests/auto/restart/tst/tst_restart.cpp +++ b/tests/auto/restart/tst/tst_restart.cpp @@ -96,7 +96,7 @@ private slots: env.insert("RunMode", QVariant::fromValue(runMode).toString()); env.insert("ObjectMode", QVariant::fromValue(objectMode).toString()); serverProc.setProcessEnvironment(env); - serverProc.start(findExecutable("server", { + serverProc.start(findExecutable("restart_server", { QCoreApplication::applicationDirPath() + "/../server/" })); QVERIFY(serverProc.waitForStarted()); @@ -108,7 +108,7 @@ private slots: QProcess clientProc; clientProc.setProcessChannelMode(QProcess::ForwardedChannels); clientProc.setProcessEnvironment(env); - clientProc.start(findExecutable("client", { + clientProc.start(findExecutable("restart_client", { QCoreApplication::applicationDirPath() + "/../client/" })); QVERIFY(clientProc.waitForStarted()); @@ -123,7 +123,7 @@ private slots: QCOMPARE(serverProc.exitCode(), 0); qDebug() << "Restarting server"; serverProc.setProcessEnvironment(env); - serverProc.start(findExecutable("server", { + serverProc.start(findExecutable("restart_server", { QCoreApplication::applicationDirPath() + "/../server/" })); QVERIFY(serverProc.waitForStarted()); -- cgit v1.2.3 From f4d1da2d912e915de3793c57c501b6b182b3fec1 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 2 Oct 2019 12:14:39 +0200 Subject: Remove empty qresource entry from clientapp.qrc This entry is pointless, and pro2cmake trips over it. Change-Id: I474e6d8f130405cfce34690184dc94d063d00fad Reviewed-by: Brett Stottlemyer --- examples/remoteobjects/clientapp/clientapp.qrc | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/remoteobjects/clientapp/clientapp.qrc b/examples/remoteobjects/clientapp/clientapp.qrc index 7e6bf64..23bdb39 100644 --- a/examples/remoteobjects/clientapp/clientapp.qrc +++ b/examples/remoteobjects/clientapp/clientapp.qrc @@ -5,5 +5,4 @@ qml/plugins1.qml qml/plugins2.qml - -- cgit v1.2.3