summaryrefslogtreecommitdiffstats
path: root/src/gui/statemachine
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-01-08 14:32:01 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-01-12 12:49:54 (GMT)
commitaca933dea3858c0b6db4a02063583da24e80b6c3 (patch)
treeb60880ba7c6e0bbb4011fb19fd0be780be7aadfe /src/gui/statemachine
parentab2f88e3cfbf43afd536b9946a40e936c3dcee35 (diff)
downloadQt-aca933dea3858c0b6db4a02063583da24e80b6c3.zip
Qt-aca933dea3858c0b6db4a02063583da24e80b6c3.tar.gz
Qt-aca933dea3858c0b6db4a02063583da24e80b6c3.tar.bz2
Cocoa: application will not quit when using dialogs
When creating a single dialog in the main function, and tell it to exec, we run a modal dialog. But there is really no other window on screen to be modal for. So in that case, since this is a rather common pattern for Qt applications, we allow users to quit the application from the dock. But this action is sendt as an apple event. And and that point in time, cocoa has the the apple event handler, and refuses to close down the application because it detects a modal window. Our solution is to install/overwrite the apple event handler for kAEQuit _after_ cocoa has finished its own installation. But in order to do this, we need to wait until [NSApplication run] has started, otherwise it will not take effect. And that is what this patch essentially does.
Diffstat (limited to 'src/gui/statemachine')
-rw-r--r--src/gui/statemachine/qguistatemachine.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index c3a9228..aeb3dbe 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -469,12 +469,6 @@ static QEvent *cloneEvent(QEvent *e)
case QEvent::UngrabKeyboard:
return new QEvent(*e);
-#ifdef QT_MAC_USE_COCOA
- case QEvent::CocoaRequestModal:
- Q_ASSERT_X(false, "cloneEvent()", "not implemented");
- break;
-#endif
-
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd: