diff options
Diffstat (limited to 'tests/baselineserver')
-rw-r--r-- | tests/baselineserver/shared/baselineprotocol.cpp | 10 | ||||
-rw-r--r-- | tests/baselineserver/shared/qbaselinetest.cpp | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp index be060ef745..1e4d8846c8 100644 --- a/tests/baselineserver/shared/baselineprotocol.cpp +++ b/tests/baselineserver/shared/baselineprotocol.cpp @@ -31,7 +31,9 @@ #include <QBuffer> #include <QHostInfo> #include <QSysInfo> -#include <QProcess> +#if QT_CONFIG(process) +# include <QProcess> +#endif #include <QFileInfo> #include <QDir> #include <QTime> @@ -88,7 +90,7 @@ PlatformInfo PlatformInfo::localHostInfo() #if QT_VERSION >= 0x050000 pi.insert(PI_QtBuildMode, QLibraryInfo::isDebugBuild() ? QLS("QtDebug") : QLS("QtRelease")); #endif -#if defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX) && QT_CONFIG(process) pi.insert(PI_OSName, QLS("Linux")); #elif defined(Q_OS_WIN) pi.insert(PI_OSName, QLS("Windows")); @@ -99,7 +101,7 @@ PlatformInfo PlatformInfo::localHostInfo() #endif pi.insert(PI_OSVersion, QSysInfo::kernelVersion()); -#ifndef QT_NO_PROCESS +#if QT_CONFIG(process) QProcess git; QString cmd; QStringList args; @@ -135,7 +137,7 @@ PlatformInfo PlatformInfo::localHostInfo() pi.insert(PI_PulseGitBranch, QString::fromLatin1(gb)); } } -#endif // !QT_NO_PROCESS +#endif // QT_CONFIG(process) return pi; } diff --git a/tests/baselineserver/shared/qbaselinetest.cpp b/tests/baselineserver/shared/qbaselinetest.cpp index 7e913c1233..ef38e21edb 100644 --- a/tests/baselineserver/shared/qbaselinetest.cpp +++ b/tests/baselineserver/shared/qbaselinetest.cpp @@ -28,7 +28,9 @@ #include "qbaselinetest.h" #include "baselineprotocol.h" -#include <QtCore/QProcess> +#if QT_CONFIG(process) +# include <QtCore/QProcess> +#endif #include <QtCore/QDir> #define MAXCMDLINEARGS 128 @@ -126,7 +128,7 @@ void addClientProperty(const QString& key, const QString& value) */ void fetchCustomClientProperties() { -#ifdef QT_NO_PROCESS +#if !QT_CONFIG(process) QSKIP("This test requires QProcess support"); #else QString script = "hostinfo.sh"; //### TBD: Windows implementation (hostinfo.bat) @@ -151,7 +153,7 @@ void fetchCustomClientProperties() else qDebug() << "Unparseable script output ignored:" << line; } -#endif // !QT_NO_PROCESS +#endif // QT_CONFIG(process) } |