From 257caeec0ab2280124640e195b561435bfee4cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 25 Jan 2021 13:26:31 +0100
Subject: [PATCH] macOS: Don't restrict non-modal file dialogs to open-dialogs
 only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

None of the APIs used for non-modal operation require NSOpenPanel.

Change-Id: I7ea49a8dad6e724a8a0d4321ea443d4cdcc5a6b1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit d7c07578bc02be1f0c3c3c3c3d64b020f2ec50ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../platforms/cocoa/qcocoafiledialoghelper.mm | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
index 541eabd3ed2..e0fc7dd9ceb 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
@@ -191,22 +191,20 @@ static QString strippedText(QString s)
 
 - (void)showModelessPanel
 {
-    if (mOpenPanel){
-        QFileInfo info(*mCurrentSelection);
-        NSString *filepath = info.filePath().toNSString();
-        NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
-        bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
-            || [self panel:mOpenPanel shouldEnableURL:url];
+    QFileInfo info(*mCurrentSelection);
+    NSString *filepath = info.filePath().toNSString();
+    NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
+    bool selectable = (mOptions->acceptMode() == QFileDialogOptions::AcceptSave)
+        || [self panel:mSavePanel shouldEnableURL:url];
 
-        [self updateProperties];
-        [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
+    [self updateProperties];
+    [mSavePanel setNameFieldStringValue:selectable ? info.fileName().toNSString() : @""];
 
-        [mOpenPanel beginWithCompletionHandler:^(NSInteger result){
-            mReturnCode = result;
-            if (mHelper)
-                mHelper->QNSOpenSavePanelDelegate_panelClosed(result == NSModalResponseOK);
-        }];
-    }
+    [mSavePanel beginWithCompletionHandler:^(NSInteger result){
+        mReturnCode = result;
+        if (mHelper)
+            mHelper->QNSOpenSavePanelDelegate_panelClosed(result == NSModalResponseOK);
+    }];
 }
 
 - (BOOL)runApplicationModalPanel