From 64ee4968b46019b8e4cb7523a6e41833fc4cf665 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Nov 2018 13:52:08 +0100
Subject: QML Lexer: Stop scanning template literals on closing '`'

Fixes: QTBUG-71812
Change-Id: I93b99496a7572c0f5128c69b865bb2b4f87d29af
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
---
 src/qml/parser/qqmljslexer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qml/parser/qqmljslexer.cpp')

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)
-- 
cgit v1.2.3