diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-02-02 10:52:40 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-02-02 10:52:40 (GMT) |
| commit | c8b6b3f47e5e677f603b12af2fc6198697030ce2 (patch) | |
| tree | a6cd6da7454c7e28aac1f8cc87bb116fa9dec951 /src/gui/kernel/qeventdispatcher_mac.mm | |
| parent | ec4eeb8f52b4a5841a3345db415b496adae2dee2 (diff) | |
| parent | 364ecfa36d6d4dc0aa917a223e88869028d8219c (diff) | |
| download | Qt-c8b6b3f47e5e677f603b12af2fc6198697030ce2.zip Qt-c8b6b3f47e5e677f603b12af2fc6198697030ce2.tar.gz Qt-c8b6b3f47e5e677f603b12af2fc6198697030ce2.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_mac.mm')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_mac.mm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index 2a1da41..c7d042d 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -579,7 +579,6 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags) // [NSApp run], which is the normal code path for cocoa applications. if (NSModalSession session = d->currentModalSession()) { QBoolBlocker execGuard(d->currentExecIsNSAppRun, false); - while ([NSApp runModalSession:session] == NSRunContinuesResponse && !d->interrupt) qt_mac_waitForMoreModalSessionEvents(); |