File|FolderDialog: fill in and use the initial values in the options

Change-Id: I5805e03327cea6cba8083f636e061b561e87f215
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp
index 7aa0a7e9..29a7bf0d 100644
--- a/src/imports/platform/qquickplatformfolderdialog.cpp
+++ b/src/imports/platform/qquickplatformfolderdialog.cpp
@@ -152,13 +152,14 @@ QUrl QQuickPlatformFolderDialog::currentFolder() const
 {
     if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
         return fileDialog->directory();
-    return QUrl();
+    return m_options->initialDirectory();
 }
 
 void QQuickPlatformFolderDialog::setCurrentFolder(const QUrl &folder)
 {
     if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
         fileDialog->setDirectory(folder);
+    m_options->setInitialDirectory(folder);
 }
 
 /*!