diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 07:20:04 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 07:20:04 (GMT) |
| commit | 0bb6cbbb7aa79294dfc7c98b05224c82095f5e4a (patch) | |
| tree | 2b8126a07ec98e8061503c51e840031b2ffaba85 | |
| parent | 73567f6bb4c730f6d3ba1a84302ae8269c13b158 (diff) | |
| parent | ee91cc1041681654f7a250dc197d0902c53a951f (diff) | |
| download | Qt-0bb6cbbb7aa79294dfc7c98b05224c82095f5e4a.zip Qt-0bb6cbbb7aa79294dfc7c98b05224c82095f5e4a.tar.gz Qt-0bb6cbbb7aa79294dfc7c98b05224c82095f5e4a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 2 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index d7fb17c..7d8faee 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -782,7 +782,7 @@ UiArrayMemberList: UiArrayMemberList T_COMMA UiAnnotation UiObjectDefinition ; case $rule_number: { sym(4).UiObjectMember->attributes = sym(3).UiAttributeList; AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), - sym(1).UiArrayMemberList, sym(3).UiObjectMember); + sym(1).UiArrayMemberList, sym(4).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index 93f9fda..296559b 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -360,7 +360,7 @@ case 35: { case 36: { sym(4).UiObjectMember->attributes = sym(3).UiAttributeList; AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), - sym(1).UiArrayMemberList, sym(3).UiObjectMember); + sym(1).UiArrayMemberList, sym(4).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; |