From de3b541e40d9fdb01bc46f472c6032e2a9f45c95 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Mon, 26 Oct 2009 15:41:32 +1000 Subject: qmldir not needed if types are qualified. --- src/declarative/qml/qmlcompositetypemanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index b956c1e..b335d31 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -456,7 +456,7 @@ int QmlCompositeTypeManager::resolveTypes(QmlCompositeTypeData *unit) int dot = imp.version.indexOf(QLatin1Char('.')); if (dot < 0) dot = imp.version.length(); QString qmldir; - if (imp.type == QmlScriptParser::Import::File) { + if (imp.type == QmlScriptParser::Import::File && imp.qualifier.isEmpty()) { QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))); for (int ii = 0; ii < unit->resources.count(); ++ii) { if (unit->resources.at(ii)->url == importUrl) { @@ -577,7 +577,7 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit) QList resourceList = unit->data.referencedResources(); foreach (QmlScriptParser::Import imp, unit->data.imports()) { - if (imp.type == QmlScriptParser::Import::File) { + if (imp.type == QmlScriptParser::Import::File && imp.qualifier.isEmpty()) { QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))); if (toLocalFileOrQrc(importUrl).isEmpty()) { // Import requires remote qmldir -- cgit v0.12