diff options
| author | Charles Yin <charles.yin@nokia.com> | 2012-03-20 13:49:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 05:37:59 +0100 |
| commit | 11741f9d778ab1f2221b9b568e16920ad8dca393 (patch) | |
| tree | 451d66a25867593f57b4fe59583426710b2bf590 | |
| parent | 87308c93c8a6359377d5546f0ef87d27737787d8 (diff) | |
Fix FolderListModel path issue on Windows
Task-number: QTBUG-24777
Change-Id: I819c2e07b23e8740f7570f117dafb2340f7c00e9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 592d8375c8..f30c2b2097 100644 --- 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 294fe184d2..0aabb7ae74 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()) diff --git a/tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro b/tests/auto/qml/qquickfolderlistmodel/qquickfolderlistmodel.pro index 68c0d79f92..7cda6f1ef4 100644 --- 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 |