diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-05-31 09:03:24 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-07-28 09:19:32 (GMT) |
| commit | 429566cc2b6feb84c9b41fc918da7cf242e82e64 (patch) | |
| tree | 6dd6c2fe79f0fea985017c7adf6848e98d4a1f7b /src | |
| parent | e50db476e3fb32a68ea3cceab8198ef47613d88a (diff) | |
| download | Qt-429566cc2b6feb84c9b41fc918da7cf242e82e64.zip Qt-429566cc2b6feb84c9b41fc918da7cf242e82e64.tar.gz Qt-429566cc2b6feb84c9b41fc918da7cf242e82e64.tar.bz2 | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 1 |
1 files changed, 0 insertions, 1 deletions
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) { |