diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-05-18 09:26:13 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-05-18 09:26:13 (GMT) |
| commit | 30a604d0d04785aa9f38fad912e72347facc2bd1 (patch) | |
| tree | 86feeddb384a39cc322802f228be9236fce526f1 /src | |
| parent | dc2cc1e853a3dd98646a4619903ad2086d0fe62d (diff) | |
| download | Qt-30a604d0d04785aa9f38fad912e72347facc2bd1.zip Qt-30a604d0d04785aa9f38fad912e72347facc2bd1.tar.gz Qt-30a604d0d04785aa9f38fad912e72347facc2bd1.tar.bz2 | |
Compile.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/parser/javascript.g | 4 | ||||
| -rw-r--r-- | src/declarative/qml/parser/javascriptparser.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index 7622421..33847f2 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -46,7 +46,7 @@ %decl javascriptparser_p.h %impl javascriptparser.cpp %expect 2 -%expect-rr 1 +%expect-rr 2 %token T_AND "&" T_AND_AND "&&" T_AND_EQ "&=" %token T_BREAK "break" T_CASE "case" T_CATCH "catch" @@ -656,7 +656,7 @@ case $rule_number: { sym(1).Node = 0; diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2), - "Expected a type name after token `:'")); + QLatin1String("Expected a type name after token `:'"))); return false; // ### recover } diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp index cf17c02..5d456c7 100644 --- a/src/declarative/qml/parser/javascriptparser.cpp +++ b/src/declarative/qml/parser/javascriptparser.cpp @@ -299,7 +299,7 @@ case 21: { sym(1).Node = 0; diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2), - "Expected a type name after token `:'")); + QLatin1String("Expected a type name after token `:'"))); return false; // ### recover } |