diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-08-17 15:33:42 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-19 09:49:12 (GMT) |
| commit | 00bc7129d166f8f3e1486b8bf920d77f46400a6e (patch) | |
| tree | 03e395e00e9fdbfcadfe3aa6202eccf383330a5e /src/gui | |
| parent | 5feec6d4433737849243fc862945ed15e63bd152 (diff) | |
| download | Qt-00bc7129d166f8f3e1486b8bf920d77f46400a6e.zip Qt-00bc7129d166f8f3e1486b8bf920d77f46400a6e.tar.gz Qt-00bc7129d166f8f3e1486b8bf920d77f46400a6e.tar.bz2 | |
Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15
The reason is that we tried to fix the stacking order of child windows
while we fixed a crash. But the patch turned out to break an auto-test
Reviewed-by: prasanth
(cherry picked from commit 749ad26d255327c9fa3fe857a30983cc6dfef0d9)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 65128ec..e92519b 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2799,9 +2799,7 @@ void QWidgetPrivate::setSubWindowStacking(bool set) if (set) { if (parent->isVisible()) { NSWindow *childwin = qt_mac_window_for(q); - int childLevel = [childwin level]; [qt_mac_window_for(parent) addChildWindow:childwin ordered:NSWindowAbove]; - [childwin setLevel:childLevel]; } } else { [qt_mac_window_for(parent) removeChildWindow:qt_mac_window_for(q)]; @@ -2815,9 +2813,7 @@ void QWidgetPrivate::setSubWindowStacking(bool set) if (child->isWindow() && child->testAttribute(Qt::WA_WState_Created) && child->isVisibleTo(q)) { if (set) { NSWindow *childwin = qt_mac_window_for(child); - int childLevel = [childwin level]; [qt_mac_window_for(q) addChildWindow:childwin ordered:NSWindowAbove]; - [childwin setLevel:childLevel]; } else { [qt_mac_window_for(q) removeChildWindow:qt_mac_window_for(child)]; } |