aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2020-04-20 15:23:12 +0200
committerChristian Stenger <christian.stenger@qt.io>2020-05-01 20:56:26 +0000
commitdc56e57cc52de79668ab0612534de527f5fea75a (patch)
treec57f9df36e003537b3f57dc9a4fc1476b69df998 /src/qml/parser
parent0e393fa01fd86e7ffeb35f25c9644f47d99d811a (diff)
Fix lexer handling of escape sequences in string
The lexer handled escape sequences inside string literals wrongly which could led to follow-up problems like wrong offsets or even lines of tokens. Change-Id: Ief14dda77f9079931a7d19ea549017a1d59c2d0b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/parser')
-rw-r--r--src/qml/parser/qqmljslexer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 4f694447bb..73e6893786 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -925,6 +925,7 @@ int Lexer::scanString(ScanStringMode mode)
// rewind by one char, so things gets scanned correctly
--_codePtr;
+ --_currentColumnNumber;
_validTokenText = true;
_tokenText = QString(startCode, _codePtr - startCode);