summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2011-03-10 09:55:25 (GMT)
committermread <qt-info@nokia.com>2011-03-10 10:09:45 (GMT)
commitf5190b12af6dbeb3f98831276a0bd4e49467500a (patch)
treed12c4971eb0de74b3d3ece90d9bd3a4b51d66c1f /src/corelib
parente496be83f0ba8849cace30078223eb0fd40f004e (diff)
downloadQt-f5190b12af6dbeb3f98831276a0bd4e49467500a.zip
Qt-f5190b12af6dbeb3f98831276a0bd4e49467500a.tar.gz
Qt-f5190b12af6dbeb3f98831276a0bd4e49467500a.tar.bz2
Copying change to unix and Windows QThread implementation to Symbian
During merge of SymbianLite branch, it was found that windows and unix QThread implementations had an identical change to locking on thread start. This change is now also applied to Symbian. Reviewed-by: iain
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/thread/qthread_symbian.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index 02d671b..40764b2 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -289,7 +289,10 @@ void *QThreadPrivate::start(void *arg)
set_thread_data(data);
- data->quitNow = false;
+ {
+ QMutexLocker locker(&thr->d_func()->mutex);
+ data->quitNow = thr->d_func()->exited;
+ }
// ### TODO: allow the user to create a custom event dispatcher
createEventDispatcher(data);