diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 09:44:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 09:44:58 (GMT) |
| commit | cccec8ba26b8c5b5f82c3ea9affc3b74b7d177fe (patch) | |
| tree | 3395fb94e4437dce133c81a45fe3942304aa6e84 | |
| parent | 09d2b70f8a23b6c7809117a3c3a77f1ad188957b (diff) | |
| parent | 48fdd3facb4d67b29452281c2d43577a2f0cdac3 (diff) | |
| download | Qt-cccec8ba26b8c5b5f82c3ea9affc3b74b7d177fe.zip Qt-cccec8ba26b8c5b5f82c3ea9affc3b74b7d177fe.tar.gz Qt-cccec8ba26b8c5b5f82c3ea9affc3b74b7d177fe.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: add support for QEventLoop::ExcludeUserInputEvents
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_mac.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index dc926e0..62c22a5 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -588,7 +588,10 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags) // manually (rather than from a QEventLoop), we cannot enter a tight // loop and block this call, but instead we need to return after one flush: const bool canExec_3rdParty = d->nsAppRunCalledByQt || ![NSApp isRunning]; - const bool canExec_Qt = flags & QEventLoop::DialogExec || flags & QEventLoop::EventLoopExec; + const bool canExec_Qt = + (flags & QEventLoop::DialogExec || flags & QEventLoop::EventLoopExec) + && !(flags & QEventLoop::ExcludeUserInputEvents); + if (canExec_Qt && canExec_3rdParty) { // We can use exec-mode, meaning that we can stay in a tight loop until |