Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I94576b77aaa6021bbb2adb1279b3ae0918eefa54

2 files changed, 7 insertions, 1 deletions

diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index 2d99ae1e..ab228d1f 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -213,7 +213,6 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper()
         if (!m_dlgHelper)
             return m_dlgHelper;
         m_dlgHelper->setOptions(m_options);
-        connect(m_dlgHelper, SIGNAL(directoryEntered(QUrl)), this, SLOT(updateFolder(QUrl)));
         connect(m_dlgHelper, SIGNAL(filterSelected(QString)), this, SIGNAL(filterSelected()));
         connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept()));
         connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject()));
@@ -222,6 +221,12 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper()
     return m_dlgHelper;
 }
 
+void QQuickPlatformFileDialog::accept()
+{
+    updateFolder(folder());
+    QQuickFileDialog::accept();
+}
+
 /*!
     \qmlproperty bool FileDialog::visible
 
diff --git a/src/dialogs/qquickplatformfiledialog_p.h b/src/dialogs/qquickplatformfiledialog_p.h
index 42e59332..419843f4 100644
--- a/src/dialogs/qquickplatformfiledialog_p.h
+++ b/src/dialogs/qquickplatformfiledialog_p.h
@@ -67,6 +67,7 @@ public:
 
 protected:
     QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE;
+    virtual void accept() override;
 
     Q_DISABLE_COPY(QQuickPlatformFileDialog)
 };