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/qtconcurrentfilter | |
| 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/qtconcurrentfilter')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 4 |
1 files changed, 0 insertions, 4 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" |