diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 01:00:14 +0200 |
| commit | 800119509837f4dfe3b4de1ecd88938ae6b18b71 (patch) | |
| tree | a2d58870ac1d5a45c78e4da455d26b653758eee3 /tests/auto/other/qobjectrace/tst_qobjectrace.cpp | |
| parent | 093cf19f1efdfbba3edb76547917a51e5b8cdba5 (diff) | |
| parent | 28c9ad199c313444149471e854bfa6cc7c708549 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Idf2bef470663864069bbf7e41af07b534936863a
Diffstat (limited to 'tests/auto/other/qobjectrace/tst_qobjectrace.cpp')
| -rw-r--r-- | tests/auto/other/qobjectrace/tst_qobjectrace.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp index aa78d70716..e6eb51500b 100644 --- a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp +++ b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp @@ -420,11 +420,7 @@ void tst_QObjectRace::disconnectRace() threads[i]->start(); } - QTime timeLimiter; - timeLimiter.start(); - - while (timeLimiter.elapsed() < TimeLimit) - QTest::qWait(10); + QTest::qWait(TimeLimit); for (int i = 0; i < ThreadCount; ++i) { threads[i]->requestInterruption(); @@ -450,11 +446,7 @@ void tst_QObjectRace::disconnectRace() threads[i]->start(); } - QTime timeLimiter; - timeLimiter.start(); - - while (timeLimiter.elapsed() < TimeLimit) - QTest::qWait(10); + QTest::qWait(TimeLimit); senderThread->requestInterruption(); QVERIFY(senderThread->wait(300)); |