summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-24 15:22:19 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-24 15:22:19 (GMT)
commit97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0 (patch)
treedd3645a6afc426a804e73df378c3d47906a8bcf9 /src/gui/kernel/qcocoaapplicationdelegate_mac.mm
parent8eea9828289b842c8a300f1f4309d059b15fd7b0 (diff)
parent792e43aa2607d21deeada4b9f14bb82dc96ad4ec (diff)
downloadQt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.zip
Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.gz
Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel/qcocoaapplicationdelegate_mac.mm')
-rw-r--r--src/gui/kernel/qcocoaapplicationdelegate_mac.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 37dcc67..304e5d3 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -178,6 +178,9 @@ static void cleanupCocoaApplicationDelegate()
return [[qtMenuLoader retain] autorelease];
}
+// This function will only be called when NSApp is actually running. Before
+// that, the kAEQuitApplication apple event will be sendt to
+// QApplicationPrivate::globalAppleEventProcessor in qapplication_mac.mm
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{
Q_UNUSED(sender);