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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: I190d4f4b54aae95e9ce889a7af7b27562d54b80e
This commit is contained in:
Eike Ziller
2015-12-07 15:55:59 +01:00
parent 1bfee1252f 7eab6a53b1
commit 9d9adcc87b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/autotest/testxmloutputreader.cpp
View File

@@ -142,6 +142,7 @@ enum CDATAMode {
DataTag, DataTag,
Description, Description,
QtVersion, QtVersion,
QtBuild,
QTestVersion QTestVersion
}; };
@@ -153,6 +154,7 @@ void TestXmlOutputReader::processOutput()
QStringLiteral("Message"), QStringLiteral("Message"),
QStringLiteral("BenchmarkResult"), QStringLiteral("BenchmarkResult"),
QStringLiteral("QtVersion"), QStringLiteral("QtVersion"),
QStringLiteral("QtBuild"),
QStringLiteral("QTestVersion") }; QStringLiteral("QTestVersion") };
static CDATAMode cdataMode = None; static CDATAMode cdataMode = None;
static QString className; static QString className;
@@ -226,6 +228,9 @@ void TestXmlOutputReader::processOutput()
} else if (currentTag == QStringLiteral("QtVersion")) { } else if (currentTag == QStringLiteral("QtVersion")) {
result = Result::MESSAGE_INTERNAL; result = Result::MESSAGE_INTERNAL;
cdataMode = QtVersion; cdataMode = QtVersion;
} else if (currentTag == QStringLiteral("QtBuild")) {
result = Result::MESSAGE_INTERNAL;
cdataMode = QtBuild;
} else if (currentTag == QStringLiteral("QTestVersion")) { } else if (currentTag == QStringLiteral("QTestVersion")) {
result = Result::MESSAGE_INTERNAL; result = Result::MESSAGE_INTERNAL;
cdataMode = QTestVersion; cdataMode = QTestVersion;
@@ -249,6 +254,10 @@ void TestXmlOutputReader::processOutput()
case QtVersion: case QtVersion:
description = tr("Qt version: %1").arg(text.toString()); description = tr("Qt version: %1").arg(text.toString());
break; break;
case QtBuild:
// FIXME due to string freeze this is not a tr()
description = QString::fromLatin1("Qt build: %1").arg(text.toString());
break;
case QTestVersion: case QTestVersion:
description = tr("QTest version: %1").arg(text.toString()); description = tr("QTest version: %1").arg(text.toString());
break; break;