Restore Qt 4.6 behaviour: exec() always enters the event loop.

In Qt 4.6 as well as 4.7's QCoreApplication and QEventLoop, calling
exec() always enters the event loop, even if you had tried to
quit()/exit() it before entering, with one exception (noted in the
unit tests; this difference has been in Qt since at least Qt 4.2).

Add unit tests to ensure all of the three classes have the same
behaviour.

Decide if we want to match the behaviours in Qt 4.8.

Reviewed-by: Bradley T. Hughes

1 files changed, 1 insertions, 4 deletions

diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index f368192..f4bfa5d 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -482,10 +482,7 @@ int QThread::exec()
     Q_D(QThread);
     QMutexLocker locker(&d->mutex);
     d->data->quitNow = false;
-    if (d->exited) {
-        d->exited = false;
-        return d->returnCode;
-    }
+    d->exited = false;
     locker.unlock();
 
     QEventLoop eventLoop;