diff options
Diffstat (limited to 'tests/auto/corelib/concurrent/qtconcurrentmap')
-rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro | 1 | ||||
-rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 22 |
2 files changed, 2 insertions, 21 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro index 6fc358514e..4edfc64cb3 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro @@ -3,4 +3,3 @@ DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentmap.cpp QT = core CONFIG += parallel_test -CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 4a8a18ba6d..330e6b908e 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -47,7 +47,8 @@ #include <QtTest/QtTest> #include "functions.h" -#include "../qfuture/versioncheck.h" + +#if !defined(QT_NO_CONCURRENT_MAP) Q_DECLARE_METATYPE(QVector<int>); Q_DECLARE_METATYPE(QVector<double>); @@ -82,8 +83,6 @@ public slots: void throttling(); }; -#if !defined (QT_NO_CONCURRENT_TEST) && !defined(QT_NO_CONCURRENT_MAP) - using namespace QtConcurrent; void multiplyBy2Immutable(int x) @@ -2420,23 +2419,6 @@ QTEST_MAIN(tst_QtConcurrentMap) #else -void tst_QtConcurrentMap::map() {} -void tst_QtConcurrentMap::blocking_map() {} -void tst_QtConcurrentMap::mapped() {} -void tst_QtConcurrentMap::blocking_mapped() {} -void tst_QtConcurrentMap::mappedReduced() {} -void tst_QtConcurrentMap::blocking_mappedReduced() {} -void tst_QtConcurrentMap::assignResult() {} -void tst_QtConcurrentMap::functionOverloads() {} -#ifndef QT_NO_EXCEPTIONS -void tst_QtConcurrentMap::exceptions() {} -#endif -void tst_QtConcurrentMap::incrementalResults() {} -void tst_QtConcurrentMap::stressTest() {} -void tst_QtConcurrentMap::throttling() {} -void tst_QtConcurrentMap::stlContainers() {} -void tst_QtConcurrentMap::noDetatch() {} - QTEST_NOOP_MAIN #endif |