X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fimports%2Ffolderlistmodel%2Fqquickfolderlistmodel.cpp;h=0aabb7ae74800ab7b00aff5347eb4aa44d1b35d6;hb=11741f9d778ab1f2221b9b568e16920ad8dca393;hp=294fe184d22dd2bb6b883f0bd8f4c4232abeff75;hpb=87308c93c8a6359377d5546f0ef87d27737787d8;p=profile%2Fivi%2Fqtdeclarative.git

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 294fe18..0aabb7a 100644
--- 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())