diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-04 16:51:38 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-07 08:35:15 +0000 |
commit | b0cad9e9c7aad209756fb2409520c0d048614dd9 (patch) | |
tree | 1cd9e91cfa0278ce35f3f3d272635d390d866e00 /src/plugins/projectexplorer | |
parent | f73f11d8c6418141581a77b97fc3c479a1bbaae5 (diff) |
OutputFormatter: Fix visual glitchqds/v4.3.2qds/v1.6.0-rc1qds/1.6.0-rc1
When inserting a line into an output window, we have to delay appending
the line feed character. Otherwise strange visual effects appear under
certain circumstances.
I have no idea why.
Fixes: QTCREATORBUG-24411
Change-Id: If8842ae4d9db36d514996b1f34dcca0432fafbfc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/linuxiccparser.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/outputparser_test.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index 82799fecd6..41d46a3522 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -57,7 +57,7 @@ LinuxIccParser::LinuxIccParser() : // ".pch/Qt5Core.pchi.cpp": creating precompiled header file ".pch/Qt5Core.pchi" // "animation/qabstractanimation.cpp": using precompiled header file ".pch/Qt5Core.pchi" - m_pchInfoLine.setPattern(QLatin1String("^\".*?\": (creating|using) precompiled header file \".*?\"\n$")); + m_pchInfoLine.setPattern(QLatin1String("^\".*?\": (creating|using) precompiled header file \".*?\"$")); QTC_CHECK(m_pchInfoLine.isValid()); } diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp index 99d241bf13..319ae18e44 100644 --- a/src/plugins/projectexplorer/outputparser_test.cpp +++ b/src/plugins/projectexplorer/outputparser_test.cpp @@ -111,11 +111,10 @@ TestTerminator::TestTerminator(OutputParserTester *t) : Utils::OutputLineParser::Result TestTerminator::handleLine(const QString &line, Utils::OutputFormat type) { - QTC_CHECK(line.endsWith('\n')); if (type == Utils::StdOutFormat) - m_tester->m_receivedStdOutChildLine.append(line); + m_tester->m_receivedStdOutChildLine.append(line + '\n'); else - m_tester->m_receivedStdErrChildLine.append(line); + m_tester->m_receivedStdErrChildLine.append(line + '\n'); return Status::Done; } |