diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-12-07 11:32:23 +0100 |
| commit | 4fec5c428e580d0f2622bbe878349899e5f93c62 (patch) | |
| tree | e5bc6c0231ed79b8066cdee6de9bcbac1c3a3c50 /src/qml/parser/qqmljslexer.cpp | |
| parent | b55b3692f6cc57f8a7ef972388504b5133331ceb (diff) | |
| parent | 64ee4968b46019b8e4cb7523a6e41833fc4cf665 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Conflicts:
src/qml/jsruntime/qv4script.cpp
src/qml/parser/qqmljslexer.cpp
Change-Id: I82252a8c504a4b77c45f4f8efe849ff9acb949fd
Diffstat (limited to 'src/qml/parser/qqmljslexer.cpp')
| -rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index e5b8894fb1..c53b13f64d 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -884,7 +884,7 @@ int Lexer::scanString(ScanStringMode mode) scanChar(); while (_codePtr <= _endPtr) { - if (_char == mode) { + if (_char == quote) { scanChar(); if (_engine) { |