summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp')
-rw-r--r--tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp
index d8fa2230f3..615a4c507f 100644
--- a/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -43,13 +43,10 @@
#include <QtTest/QtTest>
#include <qfuture.h>
-#include "../qfuture/versioncheck.h"
#include <qfuturewatcher.h>
#include <qtconcurrentrun.h>
#include <qtconcurrentmap.h>
#include "../../../../shared/util.h"
-
-#ifndef QT_NO_CONCURRENT_TEST
#include <private/qfutureinterface_p.h>
using namespace QtConcurrent;
@@ -85,8 +82,6 @@ private slots:
void warnRace();
};
-QTEST_MAIN(tst_QFutureWatcher)
-
void sleeper()
{
QTest::qSleep(100);
@@ -923,8 +918,5 @@ void tst_QFutureWatcher::warnRace()
future.waitForFinished();
}
+QTEST_MAIN(tst_QFutureWatcher)
#include "tst_qfuturewatcher.moc"
-
-#else
-QTEST_NOOP_MAIN
-#endif