diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /src/imports | |
parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index b937fbdbc3..218d7955e1 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -44,7 +44,7 @@ #include "fileinfothread_p.h" #include "fileproperty_p.h" #include <qqmlcontext.h> -#include <private/qqmlengine_p.h> +#include <qqmlfile.h> QT_BEGIN_NAMESPACE @@ -369,7 +369,7 @@ void QQuickFolderListModel::setFolder(const QUrl &folder) if (folder == d->currentDir) return; - QString localPath = QQmlEnginePrivate::urlToLocalFileOrQrc(folder); + QString localPath = QQmlFile::urlToLocalFileOrQrc(folder); QString resolvedPath = QDir::cleanPath(QUrl(localPath).path()); beginResetModel(); @@ -412,7 +412,7 @@ void QQuickFolderListModel::setRootFolder(const QUrl &path) if (path.isEmpty()) return; - QString localPath = QQmlEnginePrivate::urlToLocalFileOrQrc(path); + QString localPath = QQmlFile::urlToLocalFileOrQrc(path); QString resolvedPath = QDir::cleanPath(QUrl(localPath).path()); QFileInfo info(resolvedPath); |