diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-26 05:41:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-26 05:41:32 (GMT) |
| commit | de3b541e40d9fdb01bc46f472c6032e2a9f45c95 (patch) | |
| tree | 5a5e6c638cbcc000f98f95df29e39063891aa0ee /src | |
| parent | 64ca67183569a1a3b9dc1410dac5bbe8d5f56bb5 (diff) | |
| download | Qt-de3b541e40d9fdb01bc46f472c6032e2a9f45c95.zip Qt-de3b541e40d9fdb01bc46f472c6032e2a9f45c95.tar.gz Qt-de3b541e40d9fdb01bc46f472c6032e2a9f45c95.tar.bz2 | |
qmldir not needed if types are qualified.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmlcompositetypemanager.cpp | 4 |
1 files 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<QUrl> 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 |