summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp')
-rw-r--r--tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
index d81df0d863..495884c806 100644
--- a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
@@ -45,12 +45,9 @@
#include <QtTest/QtTest>
#include <qfuture.h>
-#include "versioncheck.h"
#include <qfuturewatcher.h>
#include <qtconcurrentresultstore.h>
#include <qtconcurrentexception.h>
-
-#ifndef QT_NO_CONCURRENT_TEST
#include <private/qfutureinterface_p.h>
using namespace QtConcurrent;
@@ -90,8 +87,6 @@ private slots:
#endif
};
-QTEST_MAIN(tst_QFuture)
-
void tst_QFuture::resultStore()
{
int int0 = 0;
@@ -1467,8 +1462,5 @@ void tst_QFuture::exceptions_QTBUG18149()
#endif // QT_NO_EXCEPTIONS
+QTEST_MAIN(tst_QFuture)
#include "tst_qfuture.moc"
-
-#else
-QTEST_NOOP_MAIN
-#endif