1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qobject: Enable build with CMake

Browse Source 
Change-Id: Ia2b324d0e5aa88ea9a71bb040a740f359e11f2ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Fabian Kosmale 2020-08-24 15:50:23 +02:00
parent 0871a7b5a2
commit f325bac02e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/kernel/CMakeLists.txt
View File

@ -24,7 +24,7 @@ if(TARGET Qt::Gui)
add_subdirectory(qmimedata) add_subdirectory(qmimedata)
endif() endif()
if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT)
# add_subdirectory(qobject) # special case add_subdirectory(qobject)
endif() endif()
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT) if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsharedmemory) add_subdirectory(qsharedmemory)

1
tests/auto/corelib/kernel/qobject/CMakeLists.txt
View File

@ -17,3 +17,4 @@ qt_add_test(tst_qobject
## Scopes: ## Scopes:
##################################################################### #####################################################################
add_subdirectory(signalbug) add_subdirectory(signalbug)
add_dependencies(tst_qobject signalbug_helper) # special case

2
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -2976,7 +2976,7 @@ void tst_QObject::recursiveSignalEmission()
#else #else
QProcess proc; QProcess proc;
// signalbug helper app should always be next to this test binary // 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); proc.start(path);
QVERIFY2(proc.waitForStarted(), qPrintable(QString::fromLatin1("Cannot start '%1': %2").arg(path, proc.errorString()))); QVERIFY2(proc.waitForStarted(), qPrintable(QString::fromLatin1("Cannot start '%1': %2").arg(path, proc.errorString())));
QVERIFY(proc.waitForFinished()); QVERIFY(proc.waitForFinished());