Add tst_filePicker.qml test for UIDelegate

Testing single, multiple file and directory upload.

Change-Id: I9da9e1f780a7f97a300fcaa38738ea781b85a4a7
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp
index 81893f5bc..18896c6b4 100644
--- a/src/core/file_picker_controller.cpp
+++ b/src/core/file_picker_controller.cpp
@@ -63,8 +63,15 @@ void FilePickerController::accepted(const QStringList &files)
 void FilePickerController::accepted(const QVariant &files)
 {
     QStringList stringList;
-    Q_FOREACH (const QUrl &url, files.value<QList<QUrl> >())
-        stringList.append(url.toLocalFile());
+
+    if (files.canConvert(QVariant::StringList)) {
+        stringList = files.toStringList();
+    } else if (files.canConvert<QList<QUrl> >()) {
+        Q_FOREACH (const QUrl &url, files.value<QList<QUrl> >())
+            stringList.append(url.toLocalFile());
+    } else {
+        qWarning("An unhandled type '%s' was provided in FilePickerController::accepted(QVariant)", files.typeName());
+    }
 
     FilePickerController::filesSelectedInChooser(stringList, m_contents);
 }