From d7ea71586c550c2c98f4ebb1caed83f69dc21e6f Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Mon, 6 Jan 2014 09:45:37 +0100 Subject: Fix usage of FileDialog.folder property in QtQuick The content of the FileDialog.folder property has not been applied to the native QFileDialog, so it was not possible to pre-select a folder for the file dialog. Change-Id: Iaadd6aa71bc37739c16a2e7c5bff2d0050f15f3a Task-number: QTBUG-35973 Reviewed-by: Tobias Koenig Reviewed-by: Liang Qi --- src/imports/widgets/qquickqfiledialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp index c3991b4f3c..403577fabe 100644 --- a/src/imports/widgets/qquickqfiledialog.cpp +++ b/src/imports/widgets/qquickqfiledialog.cpp @@ -172,6 +172,10 @@ void QFileDialogHelper::setFilter() { m_dialog.setFileMode(QFileDialog::FileMode(QPlatformFileDialogHelper::options()->fileMode())); m_dialog.setOptions((QFileDialog::Options)((int)(QPlatformFileDialogHelper::options()->options()))); m_dialog.setAcceptMode(QFileDialog::AcceptMode(QPlatformFileDialogHelper::options()->acceptMode())); + + const QUrl initialDirectory = QPlatformFileDialogHelper::options()->initialDirectory(); + if (initialDirectory.isValid() && initialDirectory.isLocalFile()) + m_dialog.setDirectory(initialDirectory.toLocalFile()); } bool QFileDialogHelper::show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) { -- cgit v1.2.3