More QUrl/QString conversion in FileDialog implementation

Followup to 6499098a04c7a8a1193413500cd562f781df38bb :
because the signals in QPlatformFileDialogHelper emit URLs and
QFileDialog does not provide compatible signals, the bridge class
QFileDialogHelper must provide slots to convert strings to URLs and
emit the signals.  Therefore QFileDialogHelper needs the Q_OBJECT
macro, and therefore it helps to move its declaration to the private
header to avoid confusing moc.

Change-Id: I088ff73d107a460af3f8695401276b45a66b5d59
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/imports/dialogs/qquickabstractfiledialog.cpp b/src/imports/dialogs/qquickabstractfiledialog.cpp
index e415ebc7e4..3a0d5baa83 100644
--- a/src/imports/dialogs/qquickabstractfiledialog.cpp
+++ b/src/imports/dialogs/qquickabstractfiledialog.cpp
@@ -115,10 +115,9 @@ QUrl QQuickAbstractFileDialog::folder()
 
 void QQuickAbstractFileDialog::setFolder(const QUrl &f)
 {
-    QString dir = f.path();
     if (m_dlgHelper)
-        m_dlgHelper->setDirectory(dir);
-    m_options->setInitialDirectory(dir);
+        m_dlgHelper->setDirectory(f);
+    m_options->setInitialDirectory(f);
     emit folderChanged();
 }
 
@@ -159,7 +158,9 @@ QUrl QQuickAbstractFileDialog::fileUrl()
 
 QList<QUrl> QQuickAbstractFileDialog::fileUrls()
 {
-    return m_dlgHelper->selectedFiles();
+    if (m_dlgHelper)
+        return m_dlgHelper->selectedFiles();
+    return QList<QUrl>();
 }
 
 void QQuickAbstractFileDialog::updateModes()