summaryrefslogtreecommitdiffstats
path: root/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp')
-rw-r--r--tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 960511d87b..35ee0be326 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -59,9 +59,6 @@ class tst_QtConcurrentMap: public QObject
{
Q_OBJECT
private slots:
-#ifdef QT_NO_CONCURRENT_MAP
- void initTestCase()
-#else
void map();
void blocking_map();
void mapped();
@@ -82,17 +79,8 @@ private slots:
void stressTest();
public slots:
void throttling();
-#endif
};
-#ifdef QT_NO_CONCURRENT_FILTER
-void tst_QtConcurrentFilter::initTestCase()
-{
- QSKIP("This test is skipped for gcc 3.x");
-}
-
-#else
-
using namespace QtConcurrent;
void multiplyBy2Immutable(int x)
@@ -2420,7 +2408,5 @@ void tst_QtConcurrentMap::stressTest()
}
}
-#endif
-
QTEST_MAIN(tst_QtConcurrentMap)
#include "tst_qtconcurrentmap.moc"