aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/testlib
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-03-19 12:15:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-19 19:14:06 +0100
commit3ce2063cfa36a4165445c6e41a4add198a78aa06 (patch)
tree9841cb977c6a8b5b67fe7f06665db02e71867551 /src/imports/testlib
parentc831a8e85afee6b257f8b3b1c5d86e4375b41e8c (diff)
Finish QML test cases after waiting for deletion
Otherwise messages triggered by the waiting (and the event loop that's run in QTest::qWait()) won't be correctly attributed to the test function being run. Task-number: QTBUG-37609 Change-Id: Iccc13d8caa021fc26fbf76da0056cb0dd870ec0e Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'src/imports/testlib')
-rw-r--r--src/imports/testlib/TestCase.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 71c87224d7..37addd1d7d 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -1323,10 +1323,10 @@ Item {
} else {
qtest_runFunction(prop, null, isBenchmark)
}
- qtest_results.finishTestFunction()
// wait(0) will call processEvents() so objects marked for deletion
// in the test function will be deleted.
wait(0)
+ qtest_results.finishTestFunction()
qtest_results.skipped = false
}