diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-13 19:45:20 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-13 19:45:20 +0000 |
commit | 77e71dac1607232160006579420df8b603118462 (patch) | |
tree | 8fe71cc79127465f63944eb0dd48a00478546f57 /tests/auto/corelib/kernel/qobject/tst_qobject.cpp | |
parent | 70e772079f4943822cc469ef83fb9c43afc36514 (diff) | |
parent | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (diff) |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'tests/auto/corelib/kernel/qobject/tst_qobject.cpp')
-rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index a645a7b5c6..5a5c4d3a40 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -41,8 +41,9 @@ #include <QThread> #include <QMutex> #include <QWaitCondition> -#include <QProcess> - +#if QT_CONFIG(process) +# include <QProcess> +#endif #include "qobject.h" #ifdef QT_BUILD_INTERNAL #include <private/qobject_p.h> @@ -281,7 +282,7 @@ static void playWithObjects() void tst_QObject::initTestCase() { -#ifndef QT_NO_PROCESS +#if QT_CONFIG(process) const QString testDataDir = QFileInfo(QFINDTESTDATA("signalbug")).absolutePath(); QVERIFY2(QDir::setCurrent(testDataDir), qPrintable("Could not chdir to " + testDataDir)); #endif @@ -3006,7 +3007,7 @@ void tst_QObject::dynamicProperties() void tst_QObject::recursiveSignalEmission() { -#ifdef QT_NO_PROCESS +#if !QT_CONFIG(process) QSKIP("No qprocess support", SkipAll); #else QProcess proc; |