diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-23 10:56:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-23 10:56:52 +0100 |
| commit | 7c3cfa166d6b54c792f1c452a162bd7842becd52 (patch) | |
| tree | 404f58894cfebcf6fb62e9eab60b3fb33a3f6f44 /src/plugins/autotest/qtest/qttestoutputreader.cpp | |
| parent | 31a55b02477fa0c6b9b9fca7e26ebc6951c3be30 (diff) | |
| parent | 09a7247bfc08e5d8e027493909c2acb448a0bd8e (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/coreplugin/helpmanager.cpp
Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
Diffstat (limited to 'src/plugins/autotest/qtest/qttestoutputreader.cpp')
| -rw-r--r-- | src/plugins/autotest/qtest/qttestoutputreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/autotest/qtest/qttestoutputreader.cpp b/src/plugins/autotest/qtest/qttestoutputreader.cpp index 05bea3a3cfc..a6b22a7b190 100644 --- a/src/plugins/autotest/qtest/qttestoutputreader.cpp +++ b/src/plugins/autotest/qtest/qttestoutputreader.cpp @@ -326,7 +326,7 @@ void QtTestOutputReader::processPlainTextOutput(const QByteArray &outputLine) static QRegExp finish("^[*]{9} Finished testing of (.*) [*]{9}$"); static QRegExp result("^(PASS |FAIL! |XFAIL |XPASS |SKIP |BPASS |BFAIL |RESULT " - "|INFO |QWARN |WARNING|QDEBUG ): (.*)$"); + "|INFO |QWARN |WARNING|QDEBUG |QSYSTEM): (.*)$"); static QRegExp benchDetails("^\\s+([\\d,.]+ .* per iteration \\(total: [\\d,.]+, iterations: \\d+\\))$"); static QRegExp locationUnix("^ Loc: \\[(.*)\\]$"); |