diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 16:07:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 16:07:11 (GMT) |
| commit | 1aba4fde2e407764cafe39520cc52dc9a3b8dd31 (patch) | |
| tree | 80ac962bf6720de4d1f14376401621e3e60eefe5 /src/declarative/qml/parser | |
| parent | 27b07b4794b8773b00f4cab8898ba00c125498cb (diff) | |
| parent | 96beb59dc7fb303debbbf06beb192158ab3476c2 (diff) | |
| download | Qt-1aba4fde2e407764cafe39520cc52dc9a3b8dd31.zip Qt-1aba4fde2e407764cafe39520cc52dc9a3b8dd31.tar.gz Qt-1aba4fde2e407764cafe39520cc52dc9a3b8dd31.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/qml/parser')
| -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; |