From 9dde45722b9ab760e8c14722904cfa4eca5663e9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 26 Mar 2012 15:29:34 -0300
Subject: Remove references to QT_NO_STL from QtConcurrent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tests/auto/concurrent/qtconcurrentmap')

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