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

QmlJS: Dump builtins per Qt version.

Browse Source 
Change-Id: I7b5179c4b33c24e83baf0536d158dd48d277637f
Reviewed-on: http://codereview.qt.nokia.com/1305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-06-28 12:01:56 +02:00
committed by Fawzi Mohamed
parent 23decd9d34
commit 4285b48455
19 changed files with 230 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljsfindreferences.cpp
View File

@@ -817,7 +817,9 @@ static void find_helper(QFutureInterface<FindReferences::Usage> &future,
if (!doc)
return;
Link link(snapshot, ModelManagerInterface::instance()->importPaths());
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
Link link(snapshot, modelManager->importPaths(), modelManager->builtins(doc));
Context context = link();
ScopeBuilder builder(&context, doc);

4
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

@@ -132,7 +132,9 @@ SemanticInfo SemanticHighlighter::semanticInfo(const SemanticHighlighterSource &
semanticInfo.snapshot = snapshot;
semanticInfo.document = doc;
QmlJS::Link link(snapshot, QmlJS::ModelManagerInterface::instance()->importPaths());
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
QmlJS::Link link(snapshot, modelManager->importPaths(), modelManager->builtins(doc));
QmlJS::Interpreter::Context *ctx = new QmlJS::Interpreter::Context(link(doc, &semanticInfo.semanticMessages));
semanticInfo.m_context = QSharedPointer<const QmlJS::Interpreter::Context>(ctx);