summaryrefslogtreecommitdiffstats
path: root/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp')
-rw-r--r--tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index 971a6992ff..eb1faab94f 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -51,9 +51,6 @@ class tst_QtConcurrentFilter : public QObject
Q_OBJECT
private slots:
-#ifdef QT_NO_CONCURRENT_FILTER
- void initTestCase();
-#else
void filter();
void filtered();
void filteredReduced();
@@ -63,17 +60,8 @@ private slots:
#ifndef QT_NO_STL
void stlContainers();
#endif
-#endif
};
-#ifdef QT_NO_CONCURRENT_FILTER
-void tst_QtConcurrentFilter::initTestCase()
-{
- QSKIP("This test is skipped for gcc 3.x");
-}
-
-#else
-
void tst_QtConcurrentFilter::filter()
{
// functor
@@ -1537,7 +1525,5 @@ void tst_QtConcurrentFilter::stlContainers()
}
#endif
-#endif
-
QTEST_MAIN(tst_QtConcurrentFilter)
#include "tst_qtconcurrentfilter.moc"