diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-07-22 12:06:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-22 16:45:01 +0200 |
| commit | 6499098a04c7a8a1193413500cd562f781df38bb (patch) | |
| tree | 6fdcfe6c6b94a3aef7b664226b4ae6dbddcdeea1 /src/imports/dialogs | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
QtQuick.Dialogs: use URLs for interface with QPlatformFileDialogHelper
Depends on f5dbc876378ae58a7bdfe1e9664fc81caca18dfb and
5069e203d7aff7fb49bf746071f66bfd41c1ae89
Reverts commits 17ded06804576dfde1b19f82f168f7ceb09ec92c and
and d9751bc29d2f80b86eb237226ce832bf2e372f1d
Change-Id: Ibe2347f3b57e4e569bc4966735e9623dfd274628
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/imports/dialogs')
| -rw-r--r-- | src/imports/dialogs/qquickabstractfiledialog.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/imports/dialogs/qquickabstractfiledialog.cpp b/src/imports/dialogs/qquickabstractfiledialog.cpp index ec5a7f6926..e415ebc7e4 100644 --- a/src/imports/dialogs/qquickabstractfiledialog.cpp +++ b/src/imports/dialogs/qquickabstractfiledialog.cpp @@ -108,12 +108,9 @@ void QQuickAbstractFileDialog::setSelectFolder(bool selectFolder) QUrl QQuickAbstractFileDialog::folder() { - return QUrl(); - /* TODO after dialog helper switches to URLs if (m_dlgHelper && !m_dlgHelper->directory().isEmpty()) - return QUrl::fromLocalFile(m_dlgHelper->directory()); - return QUrl::fromLocalFile(m_options->initialDirectory()); - */ + return m_dlgHelper->directory(); + return m_options->initialDirectory(); } void QQuickAbstractFileDialog::setFolder(const QUrl &f) @@ -162,13 +159,7 @@ QUrl QQuickAbstractFileDialog::fileUrl() QList<QUrl> QQuickAbstractFileDialog::fileUrls() { - QList<QUrl> ret; - /* TODO after dialog helper switches to URLs - if (m_dlgHelper) - foreach (QString path, m_dlgHelper->selectedFiles()) - ret << QUrl::fromLocalFile(path); - */ - return ret; + return m_dlgHelper->selectedFiles(); } void QQuickAbstractFileDialog::updateModes() |