Fix FolderListModel path issue on Windows
Task-number: QTBUG-24777 Change-Id: I819c2e07b23e8740f7570f117dafb2340f7c00e9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
This commit is contained in:
parent
87308c93c8
commit
11741f9d77
|
@ -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
|
||||
|
|
|
@ -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())
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue