feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Conflicts:
	src/plugins/autotest/qtest/qttestoutputreader.cpp

Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f
This commit is contained in:
Eike Ziller
2016-10-05 15:28:04 +02:00
parent f036877a0d 8902fbc62c
commit 90cf4487a5
10 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/qtest/qttestoutputreader.cpp
View File

@@ -195,7 +195,7 @@ void QtTestOutputReader::processOutput(const QByteArray &outputLine)
m_lineNumber = attributes.value(QStringLiteral("line")).toInt();
} else if (currentTag == QStringLiteral("BenchmarkResult")) {
const QXmlStreamAttributes &attributes = m_xmlReader.attributes();
const QString metric = attributes.value(QStringLiteral("metrics")).toString();
const QString metric = attributes.value(QStringLiteral("metric")).toString();
const double value = attributes.value(QStringLiteral("value")).toDouble();
const int iterations = attributes.value(QStringLiteral("iterations")).toInt();
m_description = constructBenchmarkInformation(metric, value, iterations);