summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-11-23 10:33:25 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-11-23 12:18:15 (GMT)
commit4ea54f03174778a4efdcb802f9179b6e1d17fd88 (patch)
treeb71ad0938aa523f4e1894f86afcc1e8b99d0906e /src/gui/kernel
parent7faa417e1a2c0e85e5ac2c647c099c3f972141a5 (diff)
downloadQt-4ea54f03174778a4efdcb802f9179b6e1d17fd88.zip
Qt-4ea54f03174778a4efdcb802f9179b6e1d17fd88.tar.gz
Qt-4ea54f03174778a4efdcb802f9179b6e1d17fd88.tar.bz2
Cocoa: apps with dialogs hangs on exit
This happends because we refuse to exit if we have a modal dialog showing on screen. After some discussion, we decided that we need to allow to exit if the quit menu item is enabled. Some of the reason behind this is the way developers tend to (mis)use dialogs as normal windows in Qt. So, if you don't want your app to exit when showing a modal dialog, disable quit menuitem, or handle QCloseEvent. Task-number: 5613 Reviewed-by: MortenS
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qapplication_mac.mm2
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()) {