From 1cd7cbf6179692fc824dc3ba15580372493a4355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 5 Jun 2020 12:50:43 +0200
Subject: [PATCH] macOS: Respect window type when determining main window
 status

Fixes: QTBUG-84405
Pick-to: 5.15 5.12
Change-Id: I3fc6b15b07a81e7e7e417a5767c2853083c13516
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/plugins/platforms/cocoa/qnswindow.mm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
index 2e0a1f2277..e7c7f6dc5d 100644
--- a/src/plugins/platforms/cocoa/qnswindow.mm
+++ b/src/plugins/platforms/cocoa/qnswindow.mm
@@ -300,14 +300,12 @@ OSStatus CGSClearWindowTags(const CGSConnectionID, const CGSWindowID, int *, int
 
 - (BOOL)canBecomeMainWindow
 {
-    BOOL canBecomeMain = YES; // By default, windows can become the main window
-
     // Windows with a transient parent (such as combobox popup windows)
     // cannot become the main window:
     if (!m_platformWindow || m_platformWindow->window()->transientParent())
-        canBecomeMain = NO;
+        return NO;
 
-    return canBecomeMain;
+    return [super canBecomeMainWindow];
 }
 
 - (BOOL)isOpaque