aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser/qqmljslexer.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-11-19 13:52:08 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-19 14:39:18 +0000
commit64ee4968b46019b8e4cb7523a6e41833fc4cf665 (patch)
tree66554a3705ae388aa30d7b8aa9ea44aa90052db9 /src/qml/parser/qqmljslexer.cpp
parentec290770ff56791a62fde6f532e1b38e80f5b9bd (diff)
QML Lexer: Stop scanning template literals on closing '`'v5.12.0-rc2v5.12.0-rc1v5.12.0
Fixes: QTBUG-71812 Change-Id: I93b99496a7572c0f5128c69b865bb2b4f87d29af Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljslexer.cpp')
-rw-r--r--src/qml/parser/qqmljslexer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index b98bb8bac5..71885c533d 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -866,7 +866,7 @@ int Lexer::scanString(ScanStringMode mode)
if (sequenceLength == 2)
_tokenText += *_codePtr;
scanChar();
- } else if (_char == mode) {
+ } else if (_char == quote) {
scanChar();
if (_engine)