diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 09:36:47 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 09:36:47 (GMT) |
| commit | e02769f81c0d7ca9585b2fd9ba58d901db513f8c (patch) | |
| tree | cb33782a53331cd4d18c863f8b3180124ea304d4 /src/corelib/kernel/qobject.cpp | |
| parent | e81dd49a60f8058b8b142b1c6ed87526671abed9 (diff) | |
| parent | 711f3691231ede6d8bf4e04f4dd8eb528655e115 (diff) | |
| download | Qt-e02769f81c0d7ca9585b2fd9ba58d901db513f8c.zip Qt-e02769f81c0d7ca9585b2fd9ba58d901db513f8c.tar.gz Qt-e02769f81c0d7ca9585b2fd9ba58d901db513f8c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 3902825..2afab1a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -896,10 +896,7 @@ QObject::~QObject() qt_removeObject(this); - QMutexLocker locker2(&d->threadData->postEventList.mutex); - if (d->postedEvents > 0) - QCoreApplicationPrivate::removePostedEvents_unlocked(this, 0, d->threadData); - locker2.unlock(); + QCoreApplication::removePostedEvents(this); if (d->parent) // remove it from parent object d->setParent_helper(0); |