diff options
| author | axis <qt-info@nokia.com> | 2009-11-24 13:57:31 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-24 13:57:31 (GMT) |
| commit | 89f81333b1f499d829cc5eeac63f790840c6f574 (patch) | |
| tree | 79bdf0e62e51e6fbe6255082f4daf3afbbd5fff6 /src/gui/kernel | |
| parent | bd2a3643c9796cc938c40c4d340d8cc5346992f4 (diff) | |
| parent | 4817debee23a72f44eedbb8f33b6b611b5161174 (diff) | |
| download | Qt-89f81333b1f499d829cc5eeac63f790840c6f574.zip Qt-89f81333b1f499d829cc5eeac63f790840c6f574.tar.gz Qt-89f81333b1f499d829cc5eeac63f790840c6f574.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2
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()) { |