diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-26 15:29:34 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-07 05:19:50 +0200 |
| commit | 9dde45722b9ab760e8c14722904cfa4eca5663e9 (patch) | |
| tree | 752fe2c80621bae6e190c246f42c64e439c9e603 /tests/auto/concurrent/qtconcurrentmap | |
| parent | 6f51fee995cf6f4a746077209f4dbb729c463769 (diff) | |
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>
Diffstat (limited to 'tests/auto/concurrent/qtconcurrentmap')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
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) { |