diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-04-16 05:40:36 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-04-16 05:40:36 (GMT) |
commit | 8e71476a262bc3dedaecba29235d19cbe24fa17a (patch) | |
tree | 47d113938d97f3a56d2f701c655403ab3664e430 /src/testlib/qtestxmlstreamer.cpp | |
parent | daa12d2d6658924aae22cfbb93cfbc77240f26ba (diff) | |
parent | 34a1a6b5d6399e7bcad136fdaa9a050a0f8bb2dc (diff) | |
download | Qt-8e71476a262bc3dedaecba29235d19cbe24fa17a.zip Qt-8e71476a262bc3dedaecba29235d19cbe24fa17a.tar.gz Qt-8e71476a262bc3dedaecba29235d19cbe24fa17a.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/testlib/qtestxmlstreamer.cpp')
-rw-r--r-- | src/testlib/qtestxmlstreamer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp index b9946e5..9addb31 100644 --- a/src/testlib/qtestxmlstreamer.cpp +++ b/src/testlib/qtestxmlstreamer.cpp @@ -111,12 +111,13 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, QTestCharBuffer QXmlTestLogger::xmlQuote("edFile, element->attributeValue(QTest::AI_File)); QXmlTestLogger::xmlCdata(&cdataDesc, element->attributeValue(QTest::AI_Description)); - QTest::qt_asprintf(formatted, "<Message type=\"%s\" %s=\"%s\" %s=\"%s\">\n <Description><![CDATA[%s]]></Description>\n</Message>\n", + QTest::qt_asprintf(formatted, "<Message type=\"%s\" %s=\"%s\" %s=\"%s\">\n <DataTag>%s</DataTag>\n <Description><![CDATA[%s]]></Description>\n</Message>\n", element->attributeValue(QTest::AI_Type), element->attributeName(QTest::AI_File), quotedFile.constData(), element->attributeName(QTest::AI_Line), element->attributeValue(QTest::AI_Line), + element->attributeValue(QTest::AI_Tag) ? element->attributeValue(QTest::AI_Tag) : "", cdataDesc.constData()); break; } |