summaryrefslogtreecommitdiffstats
path: root/tests/auto/other
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/other')
-rw-r--r--tests/auto/other/networkselftest/tst_networkselftest.cpp6
-rw-r--r--tests/auto/other/other.pro5
-rw-r--r--tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp4
3 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/other/networkselftest/tst_networkselftest.cpp b/tests/auto/other/networkselftest/tst_networkselftest.cpp
index 68473906b0..3b696604b5 100644
--- a/tests/auto/other/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/other/networkselftest/tst_networkselftest.cpp
@@ -961,7 +961,7 @@ void tst_NetworkSelfTest::supportsSsl()
#endif
}
-#ifndef QT_NO_PROCESS
+#if QT_CONFIG(process)
static const QByteArray msgProcessError(const QProcess &process, const char *what)
{
QString result;
@@ -978,7 +978,7 @@ static void ensureTermination(QProcess &process)
process.kill();
}
}
-#endif // !QT_NO_PROCESS
+#endif // QT_CONFIG(process)
void tst_NetworkSelfTest::smbServer()
{
@@ -996,7 +996,7 @@ void tst_NetworkSelfTest::smbServer()
QCOMPARE(ret, strlen(contents));
QVERIFY(memcmp(buf, contents, strlen(contents)) == 0);
#else
-#ifndef QT_NO_PROCESS
+#if QT_CONFIG(process)
enum { sambaTimeOutSecs = 5 };
// try to use Samba
const QString progname = "smbclient";
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 0babac4b6f..ab42a814eb 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -57,6 +57,8 @@ cross_compile: SUBDIRS -= \
!qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux
+!qtConfig(process): SUBDIRS -= qprocess_and_guieventloop
+
!mac: SUBDIRS -= \
macgui \
macnativeevents \
@@ -66,8 +68,5 @@ cross_compile: SUBDIRS -= \
!embedded: SUBDIRS -= \
qdirectpainter
-winrt: SUBDIRS -= \
- qprocess_and_guieventloop
-
android: SUBDIRS += \
android
diff --git a/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp b/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
index 1fcb77c51b..5842d58fab 100644
--- a/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
+++ b/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
@@ -40,9 +40,7 @@ private slots:
void tst_QProcess_and_GuiEventLoop::waitForAndEventLoop()
{
-#if defined(QT_NO_PROCESS)
- QSKIP("QProcess not supported");
-#elif defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID)
QSKIP("Not supported on Android");
#else