diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-25 09:51:25 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-25 09:51:25 (GMT) |
| commit | 447576ef99f57c6a03850a7ed5bf598f33a64802 (patch) | |
| tree | 8b4c690034e6ae78479b94f19bce62a98aabc418 /src/gui/kernel/qapplication_mac.mm | |
| parent | d51c590b8443d5d6dadf76a678439c990213d848 (diff) | |
| parent | b2a87b03bdad9f3f038ce6d19db71eb6074842e2 (diff) | |
| download | Qt-447576ef99f57c6a03850a7ed5bf598f33a64802.zip Qt-447576ef99f57c6a03850a7ed5bf598f33a64802.tar.gz Qt-447576ef99f57c6a03850a7ed5bf598f33a64802.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/gui/kernel/qapplication_mac.mm')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 84da56e..22a0959 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -2449,7 +2449,7 @@ OSStatus QApplicationPrivate::globalAppleEventProcessor(const AppleEvent *ae, Ap switch(aeID) { case kAEQuitApplication: { extern bool qt_mac_quit_menu_item_enabled; // qmenu_mac.cpp - if(!QApplicationPrivate::modalState() && qt_mac_quit_menu_item_enabled) { + if (qt_mac_quit_menu_item_enabled) { QCloseEvent ev; QApplication::sendSpontaneousEvent(app, &ev); if(ev.isAccepted()) { |