1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
index 5314a9378d3..6d11097cd03 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@@ -203,6 +203,14 @@ QT_USE_NAMESPACE
                 << "as frontmost application. Activating" << currentApplication << "instead.";
             [NSApplication.sharedApplication activateIgnoringOtherApps:YES];
         }
+
+        // Qt windows are typically shown in main(), at which point the application
+        // is not active yet. When the application is activated, either externally
+        // or via the override above, it will only bring the main and key windows
+        // forward, which differs from the behavior if these windows had been shown
+        // once the application was already active. To work around this, we explicitly
+        // activate the current application again, bringing all windows to the front.
+        [currentApplication activateWithOptions:NSApplicationActivateAllWindows];
     }
 
     QCocoaMenuBar::insertWindowMenu();