Fix a race where QThread::exit() is "lost" when called after start()

This reverts commit 9aa4538b219ed759a47e8d1f93c2797bf07b5e2f and fixes
the bug in a different way. If the QThreadData::quitNow flag is set when
entering QThread::exec(), allow QEventLoop::exec() to bail out and reset
quitNow after QEventLoop::exec() has returned (not before).

Task-number: QTBUG-1184
Reviewed-by: olivier

1 files changed, 1 insertions, 1 deletions

diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 6b34b5f..bd31d9c 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -253,7 +253,6 @@ void *QThreadPrivate::start(void *arg)
     pthread_setspecific(current_thread_data_key, data);
 
     data->ref();
-    data->quitNow = false;
 
     // ### TODO: allow the user to create a custom event dispatcher
     createEventDispatcher(data);
@@ -495,6 +494,7 @@ void QThread::start(Priority priority)
     d->running = true;
     d->finished = false;
     d->terminated = false;
+    d->data->quitNow = false;
 
     pthread_attr_t attr;
     pthread_attr_init(&attr);