diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/projectexplorer/linuxiccparser.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/outputparser_test.cpp | 5 | ||||
-rw-r--r-- | src/plugins/qtsupport/qtoutputformatter.cpp | 1 |
3 files changed, 4 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; } diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index 8975328dd0..01036dbaaa 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -511,6 +511,7 @@ void QtSupportPlugin::testQtOutputFormatter_appendMixedAssertAndAnsi() "Blue\n"; formatter.appendMessage(inputText, StdOutFormat); + formatter.flush(); QCOMPARE(edit.toPlainText(), outputText); |