From 5f49788e3348406f1399e4e911a765f850f5788f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 16 Nov 2018 18:37:01 +0100
Subject: [PATCH] macOS: Allow raising and lowering child windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic598d200e2f774ced489a37c33b7a02767db4402
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/plugins/platforms/cocoa/qcocoawindow.mm | 42 +++++++++++----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 4dc3ea4bd6..df1ad82592 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -897,34 +897,36 @@ void QCocoaWindow::raise()
     qCDebug(lcQpaWindow) << "QCocoaWindow::raise" << window();
 
     // ### handle spaces (see Qt 4 raise_sys in qwidget_mac.mm)
-    if (!isContentView())
-        return;
-
-    if (m_view.window.visible) {
-        {
-            // Clean up autoreleased temp objects from orderFront immediately.
-            // Failure to do so has been observed to cause leaks also beyond any outer
-            // autorelease pool (for example around a complete QWindow
-            // construct-show-raise-hide-delete cyle), counter to expected autoreleasepool
-            // behavior.
-            QMacAutoReleasePool pool;
-            [m_view.window orderFront:m_view.window];
-        }
-        static bool raiseProcess = qt_mac_resolveOption(true, "QT_MAC_SET_RAISE_PROCESS");
-        if (raiseProcess) {
-            [NSApp activateIgnoringOtherApps:YES];
+    if (isContentView()) {
+        if (m_view.window.visible) {
+            {
+                // Clean up auto-released temp objects from orderFront immediately.
+                // Failure to do so has been observed to cause leaks also beyond any outer
+                // autorelease pool (for example around a complete QWindow
+                // construct-show-raise-hide-delete cycle), counter to expected autoreleasepool
+                // behavior.
+                QMacAutoReleasePool pool;
+                [m_view.window orderFront:m_view.window];
+            }
+            static bool raiseProcess = qt_mac_resolveOption(true, "QT_MAC_SET_RAISE_PROCESS");
+            if (raiseProcess)
+                [NSApp activateIgnoringOtherApps:YES];
         }
+    } else {
+        [m_view.superview addSubview:m_view positioned:NSWindowAbove relativeTo:nil];
     }
 }
 
 void QCocoaWindow::lower()
 {
     qCDebug(lcQpaWindow) << "QCocoaWindow::lower" << window();
-    if (!isContentView())
-        return;
 
-    if (m_view.window.visible)
-        [m_view.window orderBack:m_view.window];
+    if (isContentView()) {
+        if (m_view.window.visible)
+            [m_view.window orderBack:m_view.window];
+    } else {
+        [m_view.superview addSubview:m_view positioned:NSWindowBelow relativeTo:nil];
+    }
 }
 
 bool QCocoaWindow::isExposed() const