diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 16:34:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 16:34:05 (GMT) |
| commit | badecb80cb5458105fb5d113560e83b881e6412a (patch) | |
| tree | 0a4fa874baacd1efe9f4311c3cfd3c12d7e54261 | |
| parent | 4567766cb696d9900c628fe19a174a42570eed5c (diff) | |
| parent | 4d66a933837ffc51fdef01f9485be58d5788b787 (diff) | |
| download | Qt-badecb80cb5458105fb5d113560e83b881e6412a.zip Qt-badecb80cb5458105fb5d113560e83b881e6412a.tar.gz Qt-badecb80cb5458105fb5d113560e83b881e6412a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Cocoa: remove 'double' content view from window"
Cocoa: fix broken drawers after content view structure change
Cocoa: remove 'double' content view from window
Revert the change in applicationShouldTerminate().
| -rw-r--r-- | src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
2 files changed, 2 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) { diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index f12c956..5bb3f1c 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -223,6 +223,8 @@ static NSDrawer *qt_mac_drawer_for(const QWidget *widget) for (NSWindow *window in windows) { NSArray *drawers = [window drawers]; for (NSDrawer *drawer in drawers) { + if ([drawer contentView] == widgetView) + return drawer; NSArray *views = [[drawer contentView] subviews]; for (NSView *view in views) { if (view == widgetView) |