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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
This commit is contained in:
Oswald Buddenhagen
2010-11-01 12:11:03 +01:00
parent 4293ee40ec 36c00b4344
commit a9ff4d3749
39 changed files with 930 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,14 +405,14 @@ protected:
virtual bool visit(AST::UiObjectBinding *ast)
{
if (ast->initializer)
if (ast->initializer && ast->initializer->lbraceToken.length)
_ranges.append(createRange(ast, ast->initializer));
return true;
}
virtual bool visit(AST::UiObjectDefinition *ast)
{
if (ast->initializer)
if (ast->initializer && ast->initializer->lbraceToken.length)
_ranges.append(createRange(ast, ast->initializer));
return true;
}