diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-30 03:48:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-30 03:48:37 (GMT) |
| commit | e5974b024828578945bd4c349f5f87f82a635225 (patch) | |
| tree | 7e6700c6d6a0a7cd32ae8422d0a35cfe21c14a41 /src/corelib/thread | |
| parent | 8bf770a1c9c28781aa8bfdea13df5194fac13573 (diff) | |
| parent | 84b81d47829d56cbd5568034161bf25898ab0824 (diff) | |
| download | Qt-e5974b024828578945bd4c349f5f87f82a635225.zip Qt-e5974b024828578945bd4c349f5f87f82a635225.tar.gz Qt-e5974b024828578945bd4c349f5f87f82a635225.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix potential networking crash due to null-pointer dereference
Revert "Improve timer ID safety by using a serial counter per ID."
Invalidate QScriptPrograms when engine is destroyed
Fix alignment issue causing crash in QtScript/JavaScriptCore
Restore Qt 4.6 behaviour: exec() always enters the event loop.
Make syncqt not complain about missing header macros.
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 5 |
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; |