diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-24 07:47:28 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-24 07:47:46 (GMT) |
| commit | 25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05 (patch) | |
| tree | 900ff94e18c32a6a5c9ca835f63e12d4caa138cd /src/gui/kernel | |
| parent | 77a6bea85942cee8e1ffa526a31b75c57756a1f8 (diff) | |
| parent | 4ea54f03174778a4efdcb802f9179b6e1d17fd88 (diff) | |
| download | Qt-25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05.zip Qt-25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05.tar.gz Qt-25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05.tar.bz2 | |
Merge commit '4ea54f03174778a4efdcb802f9179b6e1d17fd88' of oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel')
| -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()) { |