summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestcase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r--src/testlib/qtestcase.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 41e0b70d21..6799ae1087 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2046,8 +2046,10 @@ class WatchDog : public QThread
public:
WatchDog()
{
+ QMutexLocker locker(&mutex);
timeout.store(-1);
start();
+ waitCondition.wait(&mutex);
}
~WatchDog() {
{
@@ -2072,6 +2074,7 @@ public:
void run() {
QMutexLocker locker(&mutex);
+ waitCondition.wakeAll();
while (1) {
int t = timeout.load();
if (!t)