Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1

Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa

2 files changed, 6 insertions, 1 deletions

diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp
index 36eaedf9..9c1eb684 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/imports/platform/qquickplatformfiledialog.cpp
@@ -518,7 +518,9 @@ void QQuickPlatformFileDialog::onShow(QPlatformDialogHelper *dialog)
 {
     m_options->setWindowTitle(title());
     if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(dialog)) {
-        fileDialog->setOptions(m_options);
+        fileDialog->setOptions(m_options); // setOptions only assigns a member and isn't virtual
+        if (m_firstShow && m_options->initialDirectory().isValid())
+            fileDialog->setDirectory(m_options->initialDirectory());
         if (m_selectedNameFilter) {
             const int index = m_selectedNameFilter->index();
             const QString filter = m_options->nameFilters().value(index);
@@ -527,6 +529,8 @@ void QQuickPlatformFileDialog::onShow(QPlatformDialogHelper *dialog)
             connect(fileDialog, &QPlatformFileDialogHelper::filterSelected, m_selectedNameFilter, &QQuickPlatformFileNameFilter::update);
         }
     }
+    if (m_firstShow)
+        m_firstShow = false;
 }
 
 void QQuickPlatformFileDialog::onHide(QPlatformDialogHelper *dialog)
diff --git a/src/imports/platform/qquickplatformfiledialog_p.h b/src/imports/platform/qquickplatformfiledialog_p.h
index d16cc2b4..b867f3c8 100644
--- a/src/imports/platform/qquickplatformfiledialog_p.h
+++ b/src/imports/platform/qquickplatformfiledialog_p.h
@@ -149,6 +149,7 @@ private:
 
     FileMode m_fileMode;
     QList<QUrl> m_files;
+    bool m_firstShow = true;
     QSharedPointer<QFileDialogOptions> m_options;
     mutable QQuickPlatformFileNameFilter *m_selectedNameFilter;
 };