diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-30 04:30:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-30 04:30:40 (GMT) |
| commit | 28936246e547234f727a923d2542d92f766fb2e0 (patch) | |
| tree | 34393ef0a7afcc95a0ef4cb45ce1b0560f9edd84 /src/declarative/qml/parser/javascriptlexer.cpp | |
| parent | d107f39df40990d4cbd1fc5983c5de7ae46bb374 (diff) | |
| parent | 7e95bf13d72b28c87dab4b346fd96de6e8a4c046 (diff) | |
| download | Qt-28936246e547234f727a923d2542d92f766fb2e0.zip Qt-28936246e547234f727a923d2542d92f766fb2e0.tar.gz Qt-28936246e547234f727a923d2542d92f766fb2e0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/parser/javascriptlexer.cpp')
| -rw-r--r-- | src/declarative/qml/parser/javascriptlexer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/parser/javascriptlexer.cpp b/src/declarative/qml/parser/javascriptlexer.cpp index 80a558d..81f0983 100644 --- a/src/declarative/qml/parser/javascriptlexer.cpp +++ b/src/declarative/qml/parser/javascriptlexer.cpp @@ -311,7 +311,7 @@ int JavaScript::Lexer::findReservedWord(const QChar *c, int size) const else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('u') && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('l') && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c')) - return JavaScriptGrammar::T_RESERVED_WORD; + return JavaScriptGrammar::T_PUBLIC; else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('a') && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('i') && c[4] == QLatin1Char('v') && c[5] == QLatin1Char('e')) |