diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-27 12:27:37 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-27 12:27:37 (GMT) |
| commit | fa6b4a76291229f29b21063f1ee8d550aec8c48b (patch) | |
| tree | 53827b4eaeb564d7de37bdcb845c05af30d35f5f /src/corelib/kernel/qeventloop.cpp | |
| parent | 96a27e24eec9356e45f1a6b6ff641a9afab24a39 (diff) | |
| parent | 63a4d6652aa8d84282083e49217120c97bb0bfc8 (diff) | |
| download | Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.zip Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.tar.gz Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/corelib/kernel/qeventloop.cpp')
| -rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 92bdf73..600f787 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -188,8 +188,9 @@ int QEventLoop::exec(ProcessEventsFlags flags) d->threadData->eventLoops.push(this); // remove posted quit events when entering a new event loop - if (qApp->thread() == thread()) - QCoreApplication::removePostedEvents(qApp, QEvent::Quit); + QCoreApplication *app = QCoreApplication::instance(); + if (app && app->thread() == thread()) + QCoreApplication::removePostedEvents(app, QEvent::Quit); #if defined(QT_NO_EXCEPTIONS) while (!d->exit) |