diff options
| -rw-r--r-- | tests/auto/corelib/kernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt index b6a301a618..622b4175a5 100644 --- a/tests/auto/corelib/kernel/CMakeLists.txt +++ b/tests/auto/corelib/kernel/CMakeLists.txt @@ -24,7 +24,7 @@ if(TARGET Qt::Gui) add_subdirectory(qmimedata) endif() if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) - # add_subdirectory(qobject) # special case + add_subdirectory(qobject) endif() if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qsharedmemory) diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt index ea894ff3d3..47179410b0 100644 --- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt @@ -17,3 +17,4 @@ qt_add_test(tst_qobject ## Scopes: ##################################################################### add_subdirectory(signalbug) +add_dependencies(tst_qobject signalbug_helper) # special case diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 83ec36253a..c84c812823 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -2976,7 +2976,7 @@ void tst_QObject::recursiveSignalEmission() #else QProcess proc; // signalbug helper app should always be next to this test binary - const QString path = QStringLiteral("signalbug_helper"); + const QString path = QCoreApplication::applicationDirPath() + QDir::separator() + QStringLiteral("signalbug_helper"); proc.start(path); QVERIFY2(proc.waitForStarted(), qPrintable(QString::fromLatin1("Cannot start '%1': %2").arg(path, proc.errorString()))); QVERIFY(proc.waitForFinished()); |