From 4bbd8859624da1cf396c09d5a0dd778c985118c0 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 25 May 2018 10:41:26 +0200 Subject: Fix multi line string literals using backquotes Task-number: QTBUG-67476 Change-Id: Ia8c6863ad35c8a92298e5dffd750d17628200573 Reviewed-by: Simon Hausmann --- src/qml/parser/qqmljslexer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/parser') diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index 69e73f1374..ae016076b8 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -823,7 +823,7 @@ int Lexer::scanString(ScanStringMode mode) if (_engine) { while (_codePtr <= _endPtr) { - if (isLineTerminator()) { + if (isLineTerminator() && quote != QLatin1Char('`')) { if (qmlMode()) break; _errorCode = IllegalCharacter; -- cgit v1.2.3