2 files changed, 1 insertions, 11 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
index 24576048e9..dfccf06de9 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
+++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro
@@ -2,4 +2,3 @@ load(qttest_p4)
 SOURCES += tst_qtconcurrentrun.cpp
 QT = core
 CONFIG += parallel_test
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index b29e0fabd5..14a7edb735 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -43,9 +43,6 @@
 #include <qfuture.h>
 #include <QString>
 #include <QtTest/QtTest>
-#include "../qfuture/versioncheck.h"
-
-#ifndef QT_NO_CONCURRENT_TEST
 
 using namespace QtConcurrent;
 
@@ -81,9 +78,6 @@ private slots:
 # define F(X) X
 #endif
 
-
-QTEST_MAIN(tst_QtConcurrentRun)
-
 void light()
 {
     qDebug("in function");
@@ -507,8 +501,5 @@ void tst_QtConcurrentRun::lambda()
 }
 #endif
 
+QTEST_MAIN(tst_QtConcurrentRun)
 #include "tst_qtconcurrentrun.moc"
-
-#else
-QTEST_NOOP_MAIN
-#endif