diff options
Diffstat (limited to 'tests/auto/concurrent/qtconcurrentmap')
-rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro | 1 | ||||
-rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro index eeb534a0e1..199e5ad4d6 100644 --- a/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro @@ -3,4 +3,3 @@ TARGET = tst_qtconcurrentmap QT = core testlib concurrent SOURCES = tst_qtconcurrentmap.cpp DEFINES += QT_STRICT_ITERATORS -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index eeacf2ccbb..1743ec3459 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2226,12 +2226,12 @@ int mapper(const int &i) void tst_QtConcurrentMap::incrementalResults() { const int count = 200; - QList<int> ints; + QList<int> ints; for (int i=0; i < count; ++i) ints << i; QFuture<int> future = QtConcurrent::mapped(ints, mapper); - + QList<int> results; while (future.isFinished() == false) { @@ -2311,7 +2311,7 @@ void tst_QtConcurrentMap::stlContainers() QCOMPARE(list2.size(), (std::vector<int>::size_type)(2)); QtConcurrent::mapped(list, mapper).waitForFinished(); - + QtConcurrent::blockingMap(list, multiplyBy2Immutable); } |