diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
| commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
| tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp index 3613e8df60..33133e876f 100644 --- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp +++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp @@ -112,7 +112,7 @@ public: return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } @@ -132,7 +132,7 @@ public: return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } }; @@ -166,7 +166,7 @@ public: return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } }; @@ -217,13 +217,13 @@ public: if (100 >= begin && 100 < end) { throttling = true; } - + QTest::qWait(1); return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } |