diff options
author | Tobias Koenig <tobias.koenig@kdab.com> | 2014-01-06 09:45:37 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 19:21:17 +0100 |
commit | d7ea71586c550c2c98f4ebb1caed83f69dc21e6f (patch) | |
tree | 2ab57d9231e101d93c22e93aca10a6be3d7c83cc | |
parent | cf2b04f6da6fb4d6a7da924a0796bfa8fda25398 (diff) |
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 <tobias.koenig.qnx@kdab.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
-rw-r--r-- | src/imports/widgets/qquickqfiledialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |