1 files changed, 15 insertions, 8 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 7e5173f..7105d23 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -2796,9 +2796,12 @@ void QWidgetPrivate::setSubWindowStacking(bool set)
 {
     // This will set/remove a visual relationship between parent and child on screen.
     // The reason for doing this is to ensure that a child always stacks infront of
-    // its parent. Unfortunatly is turns out that [NSWindow addChildWindow] has
+    // its parent (expecially if both windows are modal, and the child blocks input to
+    // the parent while at the same time hiding behind it). Unfortunatly is turns out
+    // that [NSWindow addChildWindow] has
     // several unwanted side-effects, one of them being the moving of a child when
-    // moving the parent, which we choose to accept. A way tougher side-effect is
+    // moving the parent, which we choose to accept (if this is unacceptable, consider
+    // using Qt::WA_MacNoCocoaChildWindow). A way tougher side-effect is
     // that Cocoa will hide the parent if you hide the child. And in the case of
     // a tool window, since it will normally hide when you deactivate the
     // application, Cocoa will hide the parent upon deactivate as well. The result often
@@ -2821,12 +2824,14 @@ void QWidgetPrivate::setSubWindowStacking(bool set)
     if (QWidget *parent = q->parentWidget()) {
         if (NSWindow *pwin = [qt_mac_nativeview_for(parent) window]) {
             if (set) {
-                Qt::WindowType ptype = parent->window()->windowType();
-                if ([pwin isVisible] && (ptype == Qt::Window || ptype == Qt::Dialog) && ![qwin parentWindow]) {
-                    NSInteger level = [qwin level];
-                    [pwin addChildWindow:qwin ordered:NSWindowAbove];
-                    if ([qwin level] < level)
-                        [qwin setLevel:level];
+                if (!q->testAttribute(Qt::WA_MacNoCocoaChildWindow)) {
+                    Qt::WindowType ptype = parent->window()->windowType();
+                    if ([pwin isVisible] && (ptype == Qt::Window || ptype == Qt::Dialog) && ![qwin parentWindow]) {
+                        NSInteger level = [qwin level];
+                        [pwin addChildWindow:qwin ordered:NSWindowAbove];
+                        if ([qwin level] < level)
+                            [qwin setLevel:level];
+                    }
                 }
             } else {
                 [pwin removeChildWindow:qwin];
@@ -2840,6 +2845,8 @@ void QWidgetPrivate::setSubWindowStacking(bool set)
         if (child && child->isWindow()) {
             if (NSWindow *cwin = [qt_mac_nativeview_for(child) window]) {
                 if (set) {
+                    if (child->testAttribute(Qt::WA_MacNoCocoaChildWindow))
+                        continue;
                     Qt::WindowType ctype = child->window()->windowType();
                     if ([cwin isVisible] && (ctype == Qt::Window || ctype == Qt::Dialog) && ![cwin parentWindow]) {
                         NSInteger level = [cwin level];