diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:03:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:03:00 +0200 |
| commit | 90af436c43de88098a1aca695cb24f439880d640 (patch) | |
| tree | 3cf3574fea643b89df5f7c308b78b4ed3ffe7b9d /tests/auto/integration/tst_integration.cpp | |
| parent | 7d3866bfa7b7f886a3bf1479464df168b9281c7a (diff) | |
| parent | 9ec14db5a9f735eb4286984f934568f089627bd7 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I61c056e5c7d48e20a1ed801c2ca362521af2f190
Diffstat (limited to 'tests/auto/integration/tst_integration.cpp')
| -rw-r--r-- | tests/auto/integration/tst_integration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp index 0e90f3d..a110dd7 100644 --- a/tests/auto/integration/tst_integration.cpp +++ b/tests/auto/integration/tst_integration.cpp @@ -1351,7 +1351,7 @@ private slots: replica.reset(localSocketTestClient.acquireDynamic(objectname)); QProcess testServer; - testServer.start(progName); + testServer.start(progName, QStringList()); QVERIFY(testServer.waitForStarted()); QVERIFY(localSocketTestClient.lastError() == QRemoteObjectNode::NoError); replica->waitForSource(1000); @@ -1370,7 +1370,7 @@ private slots: }); QProcess testServer; - testServer.start(progName); + testServer.start(progName, QStringList()); QVERIFY(testServer.waitForStarted()); QFileInfo info(QDir::temp().absoluteFilePath(QStringLiteral("crashMe"))); QVERIFY(info.exists()); @@ -1386,7 +1386,7 @@ private slots: QScopedPointer<QRemoteObjectDynamicReplica> replica; replica.reset(localSocketTestClient.acquireDynamic(objectname)); - testServer.start(progName); + testServer.start(progName, QStringList()); QVERIFY(testServer.waitForStarted()); QVERIFY(localSocketTestClient.lastError() == QRemoteObjectNode::NoError); replica->waitForSource(1000); |