feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make the Qml code model read qmldir files for import resolving.

Browse Source 
However, it still re-reads for each use of Link. Needs to be optimized.

Reviewed-by: Roberto Raggi
This commit is contained in:
Christian Kamm
2010-03-18 12:06:43 +01:00
parent b3001b95f9
commit 4261aca7b0
8 changed files with 723 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/qmljs/qmljslink.cpp
View File

@@ -1,6 +1,7 @@
#include "qmljslink.h"
#include "parser/qmljsast_p.h"
#include "parser/qmldirparser_p.h"
#include "qmljsdocument.h"
#include "qmljsbind.h"
#include "qmljsscopebuilder.h"
@@ -291,10 +292,27 @@ void Link::importNonFile(Interpreter::ObjectValue *typeEnv, Document::Ptr doc, A
if (!dir.exists("qmldir"))
continue;
QFile qmldirFile(dir.filePath("qmldir"));
qmldirFile.open(QFile::ReadOnly);
QString qmldirData = QString::fromUtf8(qmldirFile.readAll());
QmlDirParser qmldirParser;
qmldirParser.setSource(qmldirData);
qmldirParser.parse();
// ### Should read qmldir file and import accordingly.
foreach (Document::Ptr otherDoc, _documentByPath.values(dir.path())) {
namespaceObject->setProperty(componentName(otherDoc->fileName()), otherDoc->bind()->rootObjectValue());
QSet<QString> importedTypes;
foreach (const QmlDirParser::Component &component, qmldirParser.components()) {
if (importedTypes.contains(component.typeName))
continue;
if (component.majorVersion > majorVersion
|| (component.majorVersion == majorVersion
&& component.minorVersion > minorVersion))
continue;
importedTypes.insert(component.typeName);
if (Document::Ptr importedDoc = _snapshot.document(dir.filePath(component.fileName))) {
namespaceObject->setProperty(component.typeName, importedDoc->bind()->rootObjectValue());
}
}
break;