3 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 7e7848467c..7a21f7a8d3 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -271,6 +271,7 @@ public: // for QNSView
     bool m_windowUnderMouse;
 
     bool m_inConstructor;
+    bool m_inSetVisible;
     QCocoaGLContext *m_glContext;
     QCocoaMenuBar *m_menubar;
     NSCursor *m_windowCursor;
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 39ca1ff636..4d0458a4aa 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -372,6 +372,7 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
     , m_windowModality(Qt::NonModal)
     , m_windowUnderMouse(false)
     , m_inConstructor(true)
+    , m_inSetVisible(false)
     , m_glContext(0)
     , m_menubar(0)
     , m_windowCursor(0)
@@ -618,6 +619,8 @@ void QCocoaWindow::setVisible(bool visible)
     if (m_isNSWindowChild && m_hiddenByClipping)
         return;
 
+    m_inSetVisible = true;
+
     QCocoaAutoReleasePool pool;
     QCocoaWindow *parentCocoaWindow = 0;
     if (window()->transientParent())
@@ -755,6 +758,8 @@ void QCocoaWindow::setVisible(bool visible)
                 [parentCocoaWindow->m_nsWindow setStyleMask:[parentCocoaWindow->m_nsWindow styleMask] | NSResizableWindowMask];
         }
     }
+
+    m_inSetVisible = false;
 }
 
 NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags)
@@ -1790,6 +1795,12 @@ bool QCocoaWindow::shouldRefuseKeyWindowAndFirstResponder()
     if (window()->flags() & Qt::WindowDoesNotAcceptFocus)
         return true;
 
+    if (m_inSetVisible) {
+        QVariant showWithoutActivating = window()->property("_q_showWithoutActivating");
+        if (showWithoutActivating.isValid() && showWithoutActivating.toBool())
+            return true;
+    }
+
     return false;
 }
 
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 17ed4ca477..70d274796b 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -115,6 +115,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
             win->setProperty(propertyName, q->property(propertyName));
     }
 
+#ifdef Q_OS_OSX
+    if (q->testAttribute(Qt::WA_ShowWithoutActivating))
+        win->setProperty("_q_showWithoutActivating", QVariant(true));
+#endif
     win->setFlags(data.window_flags);
     fixPosIncludesFrame();
     if (q->testAttribute(Qt::WA_Moved)