summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@theqtcompany.com>2015-04-10 11:22:39 +0200
committerDavid Schulz <david.schulz@theqtcompany.com>2015-04-10 13:52:20 +0300
commit97a8806417af7ed048d7dd0f2ea07098d64bd99f (patch)
tree2bf9ef29cbe32b0eab7138cf9116be46c84a3282
parent475c6cea1e5bb30b4853f389c043bb9b08770d03 (diff)
downloadqt-creator-97a8806417af7ed048d7dd0f2ea07098d64bd99f.tar.gz
Don't reset class name for empty lines.
Change-Id: Ib8ae9244bb282a10f1696de8f82469474fb0498d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r--plugins/autotest/testxmloutputreader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/autotest/testxmloutputreader.cpp b/plugins/autotest/testxmloutputreader.cpp
index fb71f56881..d8b3400d6b 100644
--- a/plugins/autotest/testxmloutputreader.cpp
+++ b/plugins/autotest/testxmloutputreader.cpp
@@ -176,12 +176,12 @@ void TestXmlOutputReader::processOutput()
while (m_testApplication->canReadLine()) {
// TODO Qt5 uses UTF-8 - while Qt4 uses ISO-8859-1 - could this be a problem?
const QString line = QString::fromUtf8(m_testApplication->readLine()).trimmed();
- if (line.isEmpty() || line.startsWith(QLatin1String("<?xml version"))) {
+ if (line.isEmpty() || xmlStartsWith(line, QLatin1String("<TestCase name=\""), className))
+ continue;
+ if (line.startsWith(QLatin1String("<?xml version"))) {
className = QString();
continue;
}
- if (xmlStartsWith(line, QLatin1String("<TestCase name=\""), className))
- continue;
if (xmlStartsWith(line, QLatin1String("<TestFunction name=\""), testCase)) {
dataTag = QString();
description = QString();