summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-02-11 01:12:32 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-02-11 01:18:44 (GMT)
commitddcfc5cd767001aaeeb532ac8f7b10ad9cf891d8 (patch)
treeb6b13e64b04d78d103de847d8119a7bda0667143
parentf8c0873871afc0a17bc4c3da446d86a9cc6ff92f (diff)
downloadQt-ddcfc5cd767001aaeeb532ac8f7b10ad9cf891d8.zip
Qt-ddcfc5cd767001aaeeb532ac8f7b10ad9cf891d8.tar.gz
Qt-ddcfc5cd767001aaeeb532ac8f7b10ad9cf891d8.tar.bz2
Fixed qmldebug* tests crashing.
Tests would crash with `QThread: Destroyed while thread is still running' one in a billion runs, since wait() was not called on the test thread. Reviewed-by: leo
-rw-r--r--tests/auto/declarative/shared/debugutil.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index 936adda..98243d5 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -169,6 +169,8 @@ int QmlDebugTest::runTests(QmlTestFactory *factory, const QList<QByteArray> &qml
loop.exec();
+ thread.wait();
+
return data.exitCode;
}