3 files changed, 43 insertions, 33 deletions
diff --git a/src/plugins/platforms/ios/qiosapplicationdelegate.mm b/src/plugins/platforms/ios/qiosapplicationdelegate.mm
index 380c5a588e6..7cbb4fc40f5 100644
--- a/src/plugins/platforms/ios/qiosapplicationdelegate.mm
+++ b/src/plugins/platforms/ios/qiosapplicationdelegate.mm
@@ -16,6 +16,8 @@
 
 #include <QtCore/QtCore>
 
+#include <QtCore/private/qdarwinsecurityscopedfileengine_p.h>
+
 @interface QIOSWindowSceneDelegate : NSObject<UIWindowSceneDelegate>
 @property (nullable, nonatomic, strong) UIWindow *window;
 @end
@@ -112,7 +114,7 @@
     QIOSServices *iosServices = static_cast<QIOSServices *>(iosIntegration->services());
 
     for (UIOpenURLContext *urlContext in URLContexts) {
-        QUrl url = QUrl::fromNSURL(urlContext.URL);
+        QUrl url = qt_apple_urlFromPossiblySecurityScopedURL(urlContext.URL);
         if (url.isLocalFile())
             QWindowSystemInterface::handleFileOpenEvent(url);
         else
diff --git a/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm b/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm
index c173aa426fc..57a5e100c9e 100644
--- a/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm
+++ b/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm
@@ -8,6 +8,7 @@
 #include "qiosdocumentpickercontroller.h"
 
 #include <QtCore/qpointer.h>
+#include <QtCore/private/qdarwinsecurityscopedfileengine_p.h>
 
 @implementation QIOSDocumentPickerController {
     QPointer<QIOSFileDialog> m_fileDialog;
@@ -17,9 +18,11 @@
 {
     NSMutableArray <UTType *> *docTypes = [[[NSMutableArray alloc] init] autorelease];
 
-    QStringList nameFilters = fileDialog->options()->nameFilters();
-    if (!nameFilters.isEmpty() && (fileDialog->options()->fileMode() != QFileDialogOptions::Directory
-                               || fileDialog->options()->fileMode() != QFileDialogOptions::DirectoryOnly))
+    const auto options = fileDialog->options();
+
+    const QStringList nameFilters = options->nameFilters();
+    if (!nameFilters.isEmpty() && (options->fileMode() != QFileDialogOptions::Directory
+                               || options->fileMode() != QFileDialogOptions::DirectoryOnly))
     {
         QStringList results;
         for (const QString &filter : nameFilters)
@@ -28,21 +31,8 @@
         docTypes = [self computeAllowedFileTypes:results];
     }
 
-    // FIXME: Handle security scoped URLs instead of copying resource
-    bool asCopy = [&]{
-        switch (fileDialog->options()->fileMode()) {
-        case QFileDialogOptions::AnyFile:
-        case QFileDialogOptions::ExistingFile:
-        case QFileDialogOptions::ExistingFiles:
-            return true;
-        default:
-            // Folders can't be imported
-            return false;
-        }
-    }();
-
     if (!docTypes.count) {
-        switch (fileDialog->options()->fileMode()) {
+        switch (options->fileMode()) {
         case QFileDialogOptions::AnyFile:
         case QFileDialogOptions::ExistingFile:
         case QFileDialogOptions::ExistingFiles:
@@ -58,17 +48,39 @@
         }
     }
 
-    if (self = [super initForOpeningContentTypes:docTypes asCopy:asCopy]) {
-        m_fileDialog = fileDialog;
-        self.modalPresentationStyle = UIModalPresentationFormSheet;
-        self.delegate = self;
-        self.presentationController.delegate = self;
+    if (options->acceptMode() == QFileDialogOptions::AcceptSave) {
+        auto selectedUrls = options->initiallySelectedFiles();
+        auto suggestedFileName = !selectedUrls.isEmpty() ? selectedUrls.first().fileName() : "Untitled";
 
-        if (m_fileDialog->options()->fileMode() == QFileDialogOptions::ExistingFiles)
+        // Create an empty dummy file, so that the export dialog will allow us
+        // to choose the export destination, which we are then given access to
+        // write to.
+        NSURL *dummyExportFile = [NSFileManager.defaultManager.temporaryDirectory
+            URLByAppendingPathComponent:suggestedFileName.toNSString()];
+        [NSFileManager.defaultManager createFileAtPath:dummyExportFile.path contents:nil attributes:nil];
+
+        if (!(self = [super initForExportingURLs:@[dummyExportFile]]))
+            return nil;
+
+        // Note, we don't set the directoryURL, as if the directory can't be
+        // accessed, or written to, the file dialog is shown but is empty.
+        // FIXME: See comment below for open dialogs as well
+    } else {
+        if (!(self = [super initForOpeningContentTypes:docTypes asCopy:NO]))
+            return nil;
+
+        if (options->fileMode() == QFileDialogOptions::ExistingFiles)
             self.allowsMultipleSelection = YES;
 
-        self.directoryURL = m_fileDialog->options()->initialDirectory().toNSURL();
+        // FIXME: This doesn't seem to have any effect
+        self.directoryURL = options->initialDirectory().toNSURL();
     }
+
+    m_fileDialog = fileDialog;
+    self.modalPresentationStyle = UIModalPresentationFormSheet;
+    self.delegate = self;
+    self.presentationController.delegate = self;
+
     return self;
 }
 
@@ -81,7 +93,7 @@
 
     QList<QUrl> files;
     for (NSURL* url in urls)
-        files.append(QUrl::fromNSURL(url));
+        files.append(qt_apple_urlFromPossiblySecurityScopedURL(url));
 
     m_fileDialog->selectedFilesChanged(files);
     emit m_fileDialog->accept();
diff --git a/src/plugins/platforms/ios/qiosfiledialog.mm b/src/plugins/platforms/ios/qiosfiledialog.mm
index b7d3e488bbb..6e7c10117ed 100644
--- a/src/plugins/platforms/ios/qiosfiledialog.mm
+++ b/src/plugins/platforms/ios/qiosfiledialog.mm
@@ -49,14 +49,10 @@ bool QIOSFileDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality window
     // when converted to QUrl, it becames a scheme.
     const QString scheme = initialDir.scheme();
 
-    if (acceptOpen) {
-        if (directory.startsWith("assets-library:"_L1) || scheme == "assets-library"_L1)
-            return showImagePickerDialog(parent);
-        else
-            return showNativeDocumentPickerDialog(parent);
-    }
+    if (acceptOpen && (directory.startsWith("assets-library:"_L1) || scheme == "assets-library"_L1))
+        return showImagePickerDialog(parent);
 
-    return false;
+    return showNativeDocumentPickerDialog(parent);
 }
 
 void QIOSFileDialog::showImagePickerDialog_helper(QWindow *parent)