From 429566cc2b6feb84c9b41fc918da7cf242e82e64 Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Mon, 31 May 2010 11:03:24 +0200
Subject: Revert the change in applicationShouldTerminate(). It used to fix an
issue during logout but it seems to be fine now.
Related issue: QTBUG-6296
Task-number: QTBUG-10993
Reviewed-by: Morten Sorvig
(cherry picked from commit 4942890f85e5fa74bf8c37cf7f53f6f3eaf40596)
---
src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 5dcf613..7a9dc70 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -196,7 +196,6 @@ static void cleanupCocoaApplicationDelegate()
qAppInstance()->quit();
startedQuit = false;
}
- return NSTerminateNow;
}
if (qtPrivate->threadData->eventLoops.size() == 0) {
--
cgit v0.12