diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2022-02-17 17:23:10 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-21 07:19:42 +0000 |
commit | 0adc4b6988e51f4700a62d611c61308ada86a422 (patch) | |
tree | 753bef9d4580195afb9ff655cd6f22abe0819959 /src/qmlcompiler | |
parent | 02f9fd8af162532aae8554382ea41e135931a146 (diff) |
QmlCompiler: Do not generate block comments into C++ code
The code we're commenting could again contain block comments. You cannot
nest them.
Fixes: QTBUG-100978
Change-Id: I78685bf29dd30f05e5a3b17abc43ba0b4cb6849e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
(cherry picked from commit 795d7dafe5be5cd48aa8225a1343285b3aca2be7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qmlcompiler')
-rw-r--r-- | src/qmlcompiler/qqmljscodegenerator.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp b/src/qmlcompiler/qqmljscodegenerator.cpp index d87b2a38ad..c879260755 100644 --- a/src/qmlcompiler/qqmljscodegenerator.cpp +++ b/src/qmlcompiler/qqmljscodegenerator.cpp @@ -2268,17 +2268,10 @@ QV4::Moth::ByteCodeHandler::Verdict QQmlJSCodeGenerator::startInstruction( const int currentLine = currentSourceLocation().startLine; if (currentLine != m_lastLineNumberUsed) { const int nextLine = nextJSLine(currentLine); - if (nextLine == currentLine + 1 || nextLine < 1) { + for (auto line = currentLine - 1; line < nextLine - 1; ++line) { m_body += u"// "_qs; - m_body += m_sourceCodeLines.value(currentLine - 1).trimmed(); + m_body += m_sourceCodeLines.value(line).trimmed(); m_body += u'\n'; - } else { - m_body += u"/*\n"_qs; - for (auto line = currentLine - 1; line < nextLine - 1; ++line) { - m_body += m_sourceCodeLines.at(line).trimmed(); - m_body += u'\n'; - } - m_body += u"*/\n"_qs; } m_lastLineNumberUsed = currentLine; } |