From 73842034aac7b9788add4f1ba6cf7a9ec6057598 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 23 Jul 2012 10:59:30 +1000 Subject: Fix QML import paths in Qt resources. Allow adding qrc: urls as import paths. Store an import path of the form :/import/path as qrc:/import/path which is expected by other parts of the code. Update documentation for QQmlEngine::addImportPath() to explicitly state what types of paths are supported. Add auto tests to check that importing a module from a Qt resource works. Change-Id: If0e75c75078a608b20d7a5c4080bccf6241e97f6 Reviewed-by: Chris Adams --- src/qml/qml/qqmlengine.cpp | 8 +++++++- src/qml/qml/qqmlimport.cpp | 5 +++++ src/qml/qml/qqmltypeloader.cpp | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 580aaf4899..f9b261b314 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1610,7 +1610,13 @@ void QQmlEnginePrivate::dereferenceScarceResources() /*! Adds \a path as a directory where the engine searches for installed modules in a URL-based directory structure. - The \a path may be a local filesystem directory or a URL. + + The \a path may be a local filesystem directory, a + \l {The Qt Resource System}{Qt Resource} path (\c {:/imports}), a + \l {The Qt Resource System}{Qt Resource} url (\c {qrc:/imports}) or a URL. + + The \a path will be converted into canonical form before it + is added to the import path list. The newly added \a path will be first in the importPathList(). diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 55c07ac35a..20da154673 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1536,6 +1536,11 @@ void QQmlImportDatabase::addImportPath(const QString& path) if (url.scheme() == QLatin1String("file")) { cPath = QQmlFile::urlToLocalFileOrQrc(url); + } else if (path.startsWith(QLatin1Char(':'))) { + // qrc directory, e.g. :/foo + // need to convert to a qrc url, e.g. qrc:/foo + cPath = QStringLiteral("qrc") + path; + cPath.replace(Backslash, Slash); } else if (url.isRelative() || (url.scheme().length() == 1 && QFile::exists(path)) ) { // windows path QDir dir = QDir(path); diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 1d7070675b..c66cd283da 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1633,6 +1633,11 @@ QString QQmlTypeLoader::absoluteFilePath(const QString &path) // qrc resource QFileInfo fileInfo(path); return fileInfo.isFile() ? fileInfo.absoluteFilePath() : QString(); + } else if (path.count() > 3 && path.at(3) == QLatin1Char(':') && + path.startsWith(QLatin1String("qrc"), Qt::CaseInsensitive)) { + // qrc resource url + QFileInfo fileInfo(QQmlFile::urlToLocalFileOrQrc(path)); + return fileInfo.isFile() ? fileInfo.absoluteFilePath() : QString(); } int lastSlash = path.lastIndexOf(QLatin1Char('/')); QStringRef dirPath(&path, 0, lastSlash); -- cgit v1.2.3