Fix FolderListModel path issue on Windows

Task-number: QTBUG-24777
Change-Id: I819c2e07b23e8740f7570f117dafb2340f7c00e9
Reviewed-by: Martin Jones <martin.jones@nokia.com>

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 592d8375c8268931bffd2676449cb046504cc679..f30c2b2097d4fbecb35eea1c340b11e0897cd78a 100644 (file)
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -2,7 +2,7 @@ TARGET  = qmlfolderlistmodelplugin
 TARGETPATH = Qt/labs/folderlistmodel
 include(../qimportbase.pri)
 
-QT += qml
+QT += core-private qml qml-private v8-private
 
 SOURCES += qquickfolderlistmodel.cpp plugin.cpp \
     fileinfothread.cpp

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 294fe184d22dd2bb6b883f0bd8f4c4232abeff75..0aabb7ae74800ab7b00aff5347eb4aa44d1b35d6 100644 (file)
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -43,8 +43,8 @@
 #include "qquickfolderlistmodel.h"
 #include "fileinfothread_p.h"
 #include "fileproperty_p.h"
-#include <QDebug>
 #include <qqmlcontext.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -365,7 +365,8 @@ void QQuickFolderListModel::setFolder(const QUrl &folder)
     if (folder == d->currentDir)
         return;
 
-    QString resolvedPath = QDir::cleanPath(folder.path());
+    QString localPath = QQmlEnginePrivate::urlToLocalFileOrQrc(folder);
+    QString resolvedPath = QDir::cleanPath(QUrl(localPath).path());
 
     beginResetModel();
 
@@ -407,7 +408,8 @@ void QQuickFolderListModel::setRootFolder(const QUrl &path)
     if (path.isEmpty())
         return;
 
-    QString resolvedPath = QDir::cleanPath(path.path());
+    QString localPath = QQmlEnginePrivate::urlToLocalFileOrQrc(path);
+    QString resolvedPath = QDir::cleanPath(QUrl(localPath).path());
 
     QFileInfo info(resolvedPath);
     if (!info.exists() || !info.isDir())

diff --git a/tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro b/tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro
index 68c0d79f923bb842e8a640545d6e691b4ba26fe2..7cda6f1ef42e3aeb126b7e06b68a05f44cae2503 100644 (file)
--- a/tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro
+++ b/tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro
@@ -9,6 +9,4 @@ include (../../shared/util.pri)
 TESTDATA = data/*
 
 CONFIG += parallel_test
-QT += core-private gui-private qml-private testlib
-
-win32:CONFIG += insignificant_test # QTBUG-24777
+QT += core-private gui-private qml-private testlib
\ No newline at end of file