summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-09-21 10:29:21 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2011-09-21 10:30:58 +0200
commit98f44af8a22125dc54c5f21911411941a5fe5123 (patch)
treee5a5e24086b3168b141e1ead68c1b40a18618326 /src
parent859d80961d204231e07bc9832276c589e15cf321 (diff)
downloadqt-creator-98f44af8a22125dc54c5f21911411941a5fe5123.tar.gz
QmlJS: Lexer apply fix from Qt5.
Change-Id: Ic11e6bad2868f56b5d7c2c063b72fb3d25c5417f Reviewed-on: http://codereview.qt-project.org/5294 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/qmljs/parser/qmljslexer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index a35f552b6a..7ec825679e 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -465,7 +465,7 @@ again:
scanChar();
if (_terminator && !_delimited && !_prohibitAutomaticSemicolon) {
- _stackToken = T_PLUS_PLUS;
+ _stackToken = T_MINUS_MINUS;
return T_SEMICOLON;
}