From bb95b8e3eb464d26ab3e78b49c8276277c929470 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 3 Mar 2015 14:06:39 +0100 Subject: 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 --- src/dialogs/qquickabstractfiledialog.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/dialogs/qquickabstractfiledialog.cpp') diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp index 9e1e605e..233a2db7 100644 --- a/src/dialogs/qquickabstractfiledialog.cpp +++ b/src/dialogs/qquickabstractfiledialog.cpp @@ -194,13 +194,6 @@ QUrl QQuickAbstractFileDialog::fileUrl() const return (urls.count() == 1) ? urls[0] : QUrl(); } -QList QQuickAbstractFileDialog::fileUrls() const -{ - if (m_dlgHelper) - return m_dlgHelper->selectedFiles(); - return QList(); -} - void QQuickAbstractFileDialog::updateModes() { // The 4 possible modes are AnyFile, ExistingFile, Directory, ExistingFiles -- cgit v1.2.1