summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qthread_unix.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-30 00:21:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-30 00:21:46 (GMT)
commit856711caba2736ca9330f086635b418322462c3a (patch)
tree9f2b40f9899813a331f2114cc7770c46f127dab1 /src/corelib/thread/qthread_unix.cpp
parent967afc717ffd411e22ce94de77cf54284815b27e (diff)
parent1cb7e3503a907719aebb98096c302a8327e9804d (diff)
downloadQt-856711caba2736ca9330f086635b418322462c3a.zip
Qt-856711caba2736ca9330f086635b418322462c3a.tar.gz
Qt-856711caba2736ca9330f086635b418322462c3a.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
Diffstat (limited to 'src/corelib/thread/qthread_unix.cpp')
-rw-r--r--src/corelib/thread/qthread_unix.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index daf1a93..f508c0a 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -345,6 +345,7 @@ void QThreadPrivate::finish(void *arg)
emit thr->terminated();
d->terminated = false;
emit thr->finished();
+ QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
if (d->data->eventDispatcher) {
d->data->eventDispatcher->closingDown();