diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-12 11:33:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-12 11:33:02 +0100 |
commit | 1e6db9fc4f9cfd52ea96b1b8576ba19a1442638e (patch) | |
tree | 7b5d5ca5a775eac8a526132301ff8632b5e8d24b /src/dialogs/qquickabstractfiledialog.cpp | |
parent | 84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48 (diff) | |
parent | fccb5baf490b9a8c561a01f30b4992236e3a2060 (diff) | |
download | qtquickcontrols-1e6db9fc4f9cfd52ea96b1b8576ba19a1442638e.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.75.7.1
Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de
Diffstat (limited to 'src/dialogs/qquickabstractfiledialog.cpp')
-rw-r--r-- | src/dialogs/qquickabstractfiledialog.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp index 3bc79570..4303ac3a 100644 --- a/src/dialogs/qquickabstractfiledialog.cpp +++ b/src/dialogs/qquickabstractfiledialog.cpp @@ -115,20 +115,32 @@ QUrl QQuickAbstractFileDialog::folder() const return m_options->initialDirectory(); } -void QQuickAbstractFileDialog::setFolder(const QUrl &f) +static QUrl fixupFolder(const QUrl &f) { QString lf = f.toLocalFile(); while (lf.startsWith("//")) lf.remove(0, 1); if (lf.isEmpty()) lf = QDir::currentPath(); - QUrl u = QUrl::fromLocalFile(lf); + return QUrl::fromLocalFile(lf); +} + +void QQuickAbstractFileDialog::setFolder(const QUrl &f) +{ + QUrl u = fixupFolder(f); if (m_dlgHelper) m_dlgHelper->setDirectory(u); m_options->setInitialDirectory(u); emit folderChanged(); } +void QQuickAbstractFileDialog::updateFolder(const QUrl &f) +{ + QUrl u = fixupFolder(f); + m_options->setInitialDirectory(u); + emit folderChanged(); +} + void QQuickAbstractFileDialog::setNameFilters(const QStringList &f) { m_options->setNameFilters(f); |