diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 18:00:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 18:00:17 (GMT) |
| commit | 7285c09ef777569514e73dffa22ecfdb7df6ba8f (patch) | |
| tree | 1b45d3adfe7fb3fcb0e394ef687f25289987c3d5 /src | |
| parent | 282d2a2aef76d13f5c493e77907c5122ab54f3af (diff) | |
| parent | f30bcbd8409efdb48790ec09f603887d5763ea7c (diff) | |
| download | Qt-7285c09ef777569514e73dffa22ecfdb7df6ba8f.zip Qt-7285c09ef777569514e73dffa22ecfdb7df6ba8f.tar.gz Qt-7285c09ef777569514e73dffa22ecfdb7df6ba8f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Set the location of the closing brace.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejs.g | 4 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejsparser.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 1b66ba0..c84f0b3 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -1254,7 +1254,7 @@ case $rule_number: { else node = makeAstNode<AST::ObjectLiteral> (driver->nodePool()); node->lbraceToken = loc(1); - node->lbraceToken = loc(3); + node->rbraceToken = loc(3); sym(1).Node = node; } break; ./ @@ -1265,7 +1265,7 @@ case $rule_number: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); - node->lbraceToken = loc(4); + node->rbraceToken = loc(4); sym(1).Node = node; } break; ./ diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index 8afb93d..28ef17d 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -679,7 +679,7 @@ case 85: { else node = makeAstNode<AST::ObjectLiteral> (driver->nodePool()); node->lbraceToken = loc(1); - node->lbraceToken = loc(3); + node->rbraceToken = loc(3); sym(1).Node = node; } break; @@ -687,7 +687,7 @@ case 86: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); - node->lbraceToken = loc(4); + node->rbraceToken = loc(4); sym(1).Node = node; } break; |