diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-02 01:25:49 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-02 01:25:49 (GMT) |
| commit | 93b624c74f0486330c1e8f3aa3fe2b24d95f54b5 (patch) | |
| tree | 1845655a9228da064d7e6e3630f073de37f77a65 /src/declarative/qml/parser/qmljs.g | |
| parent | 837f5d2385e413b89e78cd487f5a3f818c179292 (diff) | |
| parent | d01db18696a7729b0d54af76f5224aed6750f3bb (diff) | |
| download | Qt-93b624c74f0486330c1e8f3aa3fe2b24d95f54b5.zip Qt-93b624c74f0486330c1e8f3aa3fe2b24d95f54b5.tar.gz Qt-93b624c74f0486330c1e8f3aa3fe2b24d95f54b5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/parser/qmljs.g')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index eb9a8ab..70cf06a 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -105,7 +105,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -159,7 +159,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -2949,7 +2949,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; const int errorState = state_stack[tos]; // automatic insertion of `;' - if (t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) { + if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) { SavedToken &tk = token_buffer[0]; tk.token = yytoken; tk.dval = yylval; |