diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-05-31 09:03:24 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-05-31 09:03:44 (GMT) |
| commit | af1b64cec8ed74602fafadade936b1768daa9ff2 (patch) | |
| tree | 7e3f2e0ec8ec61959181f02900654d9f94a044e3 | |
| parent | 3ce123a89cf9b8dfcf4ecb1a4e3f8c2ff5121c45 (diff) | |
| download | Qt-af1b64cec8ed74602fafadade936b1768daa9ff2.zip Qt-af1b64cec8ed74602fafadade936b1768daa9ff2.tar.gz Qt-af1b64cec8ed74602fafadade936b1768daa9ff2.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
| -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) { |