Remove references to QT_NO_STL from QtConcurrent

Same as with QtCore, remove the #ifdef and #ifndef and select the side
with STL.

Change-Id: If1440080328c7c51afe35f5944a19dafc4761ee5
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

3 files changed, 0 insertions, 18 deletions

diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index eb1faab94f..c8d4c211a9 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -57,9 +57,7 @@ private slots:
     void resultAt();
     void incrementalResults();
     void noDetach();
-#ifndef QT_NO_STL
     void stlContainers();
-#endif
 };
 
 void tst_QtConcurrentFilter::filter()
@@ -1496,7 +1494,6 @@ void tst_QtConcurrentFilter::noDetach()
     }
 }
 
-#ifndef QT_NO_STL
 void tst_QtConcurrentFilter::stlContainers()
 {
     std::vector<int> vector;
@@ -1523,7 +1520,6 @@ void tst_QtConcurrentFilter::stlContainers()
     QCOMPARE(list2.size(), (std::list<int>::size_type)(1));
     QCOMPARE(*list2.begin(), 1);
 }
-#endif
 
 QTEST_MAIN(tst_QtConcurrentFilter)
 #include "tst_qtconcurrentfilter.moc"
diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 46562b5eb0..538a821535 100644
--- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -65,7 +65,6 @@ struct TestIterator
 };
 
 #include <qiterator.h>
-#ifndef QT_NO_STL
 namespace std {
 template <>
 struct iterator_traits<TestIterator>
@@ -79,7 +78,6 @@ int distance(TestIterator &a, TestIterator &b)
 }
 
 }
-#endif
 
 #include <qtconcurrentiteratekernel.h>
 #include <QtTest/QtTest>
@@ -96,10 +94,8 @@ private slots:
     void stresstest();
     void noIterations();
     void throttling();
-#ifndef QT_NO_STL
     void blockSize();
     void multipleResults();
-#endif
 };
 
 QAtomicInt iterations;
@@ -268,8 +264,6 @@ public:
     }
 };
 
-// Missing stl iterators prevent correct block size calculation.
-#ifndef QT_NO_STL
 void tst_QtConcurrentIterateKernel::blockSize()
 {
     const int expectedMinimumBlockSize = 1024 / QThread::idealThreadCount();
@@ -278,7 +272,6 @@ void tst_QtConcurrentIterateKernel::blockSize()
         qDebug() << "block size" << peakBlockSize;
     QVERIFY(peakBlockSize >= expectedMinimumBlockSize);
 }
-#endif
 
 class MultipleResultsFor : public IterateKernel<TestIterator, int>
 {
@@ -292,8 +285,6 @@ public:
     }
 };
 
-// Missing stl iterators prevent correct summation.
-#ifndef QT_NO_STL
 void tst_QtConcurrentIterateKernel::multipleResults()
 {
     QFuture<int> f = startThreadEngine(new MultipleResultsFor(0, 10)).startAsynchronously();
@@ -303,7 +294,6 @@ void tst_QtConcurrentIterateKernel::multipleResults()
     QCOMPARE(f.resultAt(9), 9);
     f.waitForFinished();
 }
-#endif
 
 QTEST_MAIN(tst_QtConcurrentIterateKernel)
 
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index d0609d00ef..220f28a542 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -72,9 +72,7 @@ private slots:
 #endif
     void incrementalResults();
     void noDetach();
-#ifndef QT_NO_STL
     void stlContainers();
-#endif
     void qFutureAssignmentLeak();
     void stressTest();
 public slots:
@@ -2301,7 +2299,6 @@ void tst_QtConcurrentMap::noDetach()
 
 }
 
-#ifndef QT_NO_STL
 void tst_QtConcurrentMap::stlContainers()
 {
     std::vector<int> vector;
@@ -2322,7 +2319,6 @@ void tst_QtConcurrentMap::stlContainers()
     
     QtConcurrent::blockingMap(list, multiplyBy2Immutable);
 }
-#endif
 
 InstanceCounter ic_fn(const InstanceCounter & ic)
 {