Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into merge

Change-Id: I5824a3eb624b325de10acfd5109c4c1bdabcf780

6 files changed, 24 insertions, 29 deletions

diff --git a/src/imports/dialogs/DefaultFileDialog.qml b/src/imports/dialogs/DefaultFileDialog.qml
index 2cdb34cc03..fb6996b80c 100644
--- a/src/imports/dialogs/DefaultFileDialog.qml
+++ b/src/imports/dialogs/DefaultFileDialog.qml
@@ -107,11 +107,10 @@ AbstractFileDialog {
             selectedIndices.map(function(idx) {
                 if (view.model.isFolder(idx)) {
                     if (selectFolder)
-                        // TODO after QTBUG-32039: should not need to convert pathToUrl here
-                        addSelection(pathToUrl(view.model.get(idx, "filePath")))
+                        addSelection(view.model.get(idx, "fileURL"))
                 } else {
                     if (!selectFolder)
-                        addSelection(pathToUrl(view.model.get(idx, "filePath")))
+                        addSelection(view.model.get(idx, "fileURL"))
                 }
             })
         }
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()
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 4dbbcf359d..2f9c07cf20 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -325,6 +325,7 @@ QQuickFolderListModel::QQuickFolderListModel(QObject *parent)
     d->roleNames[FileLastModifiedRole] = "fileModified";
     d->roleNames[FileLastReadRole] = "fileAccessed";
     d->roleNames[FileIsDirRole] = "fileIsDir";
+    d->roleNames[FileUrlRole] = "fileURL";
     d->init();
 }
 
@@ -366,6 +367,9 @@ QVariant QQuickFolderListModel::data(const QModelIndex &index, int role) const
         case FileIsDirRole:
             rv = d->data.at(index.row()).isDir();
             break;
+        case FileUrlRole:
+            rv = QUrl::fromLocalFile(d->data.at(index.row()).filePath());
+            break;
         default:
             break;
     }
@@ -402,8 +406,7 @@ QModelIndex QQuickFolderListModel::index(int row, int , const QModelIndex &) con
     The \a folder property holds a URL for the folder that the model is
     currently providing.
 
-    The value is a URL expressed as a string, and must be a \c file: or \c qrc:
-    URL, or a relative URL.
+    The value must be a \c file: or \c qrc: URL, or a relative URL.
 
     By default, the value is an invalid URL.
 */
@@ -443,7 +446,7 @@ void QQuickFolderListModel::setFolder(const QUrl &folder)
 
 
 /*!
-   \qmlproperty string QQuickFolderListModel::rootFolder
+   \qmlproperty url QQuickFolderListModel::rootFolder
 
    When the rootFolder is set, then this folder will
    be threated as the root in the file system, so that
@@ -753,6 +756,7 @@ void QQuickFolderListModel::setShowOnlyReadable(bool on)
     \list
         \li \c fileName
         \li \c filePath
+        \li \c fileURL
         \li \c fileBaseName
         \li \c fileSuffix
         \li \c fileSize
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index 43af77adf5..68541f1735 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -90,7 +90,8 @@ public:
         FileSizeRole = Qt::UserRole + 5,
         FileLastModifiedRole = Qt::UserRole + 6,
         FileLastReadRole = Qt::UserRole +7,
-        FileIsDirRole = Qt::UserRole + 8
+        FileIsDirRole = Qt::UserRole + 8,
+        FileUrlRole = Qt::UserRole + 9
     };
 
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 6fbe8a51b8..7a922a832e 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -10,8 +10,7 @@ qtHaveModule(quick) {
         qtquick2 \
         particles \
         window \
-# disabled to allow file dialog changes to use urls internally (qtbase)
-#        dialogs \
+        dialogs \
         testlib
 }
 
diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp
index 6aab2adbb9..7446887eb8 100644
--- a/src/imports/widgets/qquickqfiledialog.cpp
+++ b/src/imports/widgets/qquickqfiledialog.cpp
@@ -66,12 +66,10 @@ public:
     }
 
     virtual bool defaultNameFilterDisables() const { return true; }
-    virtual void setDirectory(const QString &dir) { m_dialog.setDirectory(dir); }
-    virtual void selectFile(const QString &f) { m_dialog.selectFile(f); }
-    /* TODO after dialog helper switches to URLs
-    virtual QString directory() const { return m_dialog.directory().absolutePath(); }
-    virtual QStringList selectedFiles() const { return m_dialog.selectedFiles(); }
-    */
+    virtual void setDirectory(const QUrl &dir) { m_dialog.setDirectoryUrl(dir); }
+    virtual QUrl directory() const { return m_dialog.directoryUrl(); }
+    virtual void selectFile(const QUrl &f) { m_dialog.selectUrl(f); }
+    virtual QList<QUrl> selectedFiles() const;
 
     virtual void setFilter() {
         m_dialog.setWindowTitle(QPlatformFileDialogHelper::options()->windowTitle());
@@ -190,7 +188,6 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper()
     if (parentItem)
         m_parentWindow = parentItem->window();
 
-    /* TODO after dialog helper switches to URLs
     if (!m_dlgHelper) {
         m_dlgHelper = new QFileDialogHelper();
         connect(m_dlgHelper, SIGNAL(directoryEntered(QString)), this, SIGNAL(folderChanged()));
@@ -198,9 +195,13 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper()
         connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept()));
         connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject()));
     }
-    */
 
     return m_dlgHelper;
 }
 
+QList<QUrl> QFileDialogHelper::selectedFiles() const
+{
+    return m_dialog.selectedUrls();
+}
+
 QT_END_NAMESPACE