diff options
| author | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2015-03-03 14:06:39 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2015-03-18 09:20:40 +0000 |
| commit | bb95b8e3eb464d26ab3e78b49c8276277c929470 (patch) | |
| tree | ad9f5343e35089a2ad7fdb7e4f693a41958ccbb7 /src/dialogs/qquickplatformfiledialog.cpp | |
| parent | cbd066616b0b24fb8003323b467a3269b7edb602 (diff) | |
Dialogs: override selectedUrls in QQPlatformfiledialog
Rather than checking if a dialog helper is in use in QAbstractFileDialog, we
override selectedUrls in QQuickPlatformFileDialog. Otherwise the version in
QQuickFileDialog will be called first, which tries to return selectedUrls from
the QML version (which might not be in use).
Change-Id: If61647078ed2dd535384dcea67767bfc729edfe0
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/dialogs/qquickplatformfiledialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformfiledialog.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp index dcdeeadd1..aacccc727 100644 --- a/src/dialogs/qquickplatformfiledialog.cpp +++ b/src/dialogs/qquickplatformfiledialog.cpp @@ -175,6 +175,13 @@ QQuickPlatformFileDialog::~QQuickPlatformFileDialog() delete m_dlgHelper; } +QList<QUrl> QQuickPlatformFileDialog::fileUrls() const +{ + if (m_dialogHelperInUse) + return m_dlgHelper->selectedFiles(); + return QQuickFileDialog::fileUrls(); +} + void QQuickPlatformFileDialog::setModality(Qt::WindowModality m) { #ifdef Q_OS_WIN |