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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
This commit is contained in:
Eike Ziller
2014-09-16 15:17:21 +02:00
parent 11f89ece8d a4db6db358
commit 914adeab82
77 changed files with 3943 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,12 @@ protected:
}
if (ast->identifierToken.isValid())
addUse(ast->identifierToken, SemanticHighlighter::BindingNameType);
scopedAccept(ast, ast->statement);
if (ast->statement)
scopedAccept(ast, ast->statement);
if (ast->binding)
// this is not strictly correct for Components, as their context depends from where they
// are instantiated, but normally not too bad as approximation
scopedAccept(ast, ast->binding);
return false;
}