From 32382540f8c8cc7808b5c75ea098bda19b92034f Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Sun, 14 Aug 2016 12:06:30 +0200
Subject: File|FolderDialog: fill in and use the initial values in the options

Change-Id: I5805e03327cea6cba8083f636e061b561e87f215
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/imports/platform/qquickplatformfiledialog.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/imports/platform/qquickplatformfiledialog.cpp')

diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp
index 466b33ed..d46a1aac 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/imports/platform/qquickplatformfiledialog.cpp
@@ -217,15 +217,12 @@ void QQuickPlatformFileDialog::setFiles(const QList<QUrl> &files)
 */
 QUrl QQuickPlatformFileDialog::currentFile() const
 {
-    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
-        return fileDialog->selectedFiles().value(0);
-    return QUrl();
+    return currentFiles().value(0);
 }
 
 void QQuickPlatformFileDialog::setCurrentFile(const QUrl &file)
 {
-    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
-        fileDialog->selectFile(file);
+    setCurrentFiles(QList<QUrl>() << file);
 }
 
 /*!
@@ -243,7 +240,7 @@ QList<QUrl> QQuickPlatformFileDialog::currentFiles() const
 {
     if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
         return fileDialog->selectedFiles();
-    return QList<QUrl>();
+    return m_options->initiallySelectedFiles();
 }
 
 void QQuickPlatformFileDialog::setCurrentFiles(const QList<QUrl> &files)
@@ -252,6 +249,7 @@ void QQuickPlatformFileDialog::setCurrentFiles(const QList<QUrl> &files)
         for (const QUrl &file : files)
             fileDialog->selectFile(file);
     }
+    m_options->setInitiallySelectedFiles(files);
 }
 
 /*!
@@ -266,7 +264,7 @@ QUrl QQuickPlatformFileDialog::folder() const
 {
     if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
         return fileDialog->directory();
-    return QUrl();
+    return m_options->initialDirectory();
 }
 
 void QQuickPlatformFileDialog::setFolder(const QUrl &folder)
-- 
cgit v1.2.3