From 074508c2caf0417bf2cde7d1a55aadbbc88aa742 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 9 Mar 2012 13:50:19 +1000
Subject: Remove gcc 3.x-specific code from QtConcurrent and its tests.

Change-Id: I4dd0ce50b70a47a0a00f4c7ec18077a1bcbe5705
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 .../qtconcurrentfilter/tst_qtconcurrentfilter.cpp          | 14 --------------
 .../concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp     | 14 --------------
 2 files changed, 28 deletions(-)

(limited to 'tests/auto')

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"
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"
-- 
cgit v1.2.3