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

Read qmldir files in a thread and cache them in Snapshot.

Browse Source 
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-03-18 15:43:33 +01:00
parent 4261aca7b0
commit 6eadfa3ac0
8 changed files with 104 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
#include "qmljslink.h"
#include "parser/qmljsast_p.h"
#include "parser/qmldirparser_p.h"
#include "qmljsdocument.h"
#include "qmljsbind.h"
#include "qmljsscopebuilder.h"
@@ -289,18 +288,13 @@ void Link::importNonFile(Interpreter::ObjectValue *typeEnv, Document::Ptr doc, A
QDir dir(importPath);
if (!dir.cd(package))
continue;
if (!dir.exists("qmldir"))
const LibraryInfo libraryInfo = _snapshot.libraryInfo(dir.path());
if (!libraryInfo.isValid())
continue;
QFile qmldirFile(dir.filePath("qmldir"));
qmldirFile.open(QFile::ReadOnly);
QString qmldirData = QString::fromUtf8(qmldirFile.readAll());
QmlDirParser qmldirParser;
qmldirParser.setSource(qmldirData);
qmldirParser.parse();
QSet<QString> importedTypes;
foreach (const QmlDirParser::Component &component, qmldirParser.components()) {
foreach (const QmlDirParser::Component &component, libraryInfo.components()) {
if (importedTypes.contains(component.typeName))
continue;