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/qquickplatformfolderdialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

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);
 }
 
 /*!
-- 
cgit v1.2.3