From ffe9f4b839da5bc2758845a5eb6ddc78776b06df Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 19 Apr 2010 14:14:30 +1000
Subject: Partial revert of 348d1f6d421a6e23b769af99608fa6d81631a6c3
 (accidentally committed changes)

---
 src/testlib/qtestlightxmlstreamer.cpp | 3 +--
 src/testlib/qtestlogger.cpp           | 3 ---
 src/testlib/qtestxmlstreamer.cpp      | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/testlib/qtestlightxmlstreamer.cpp b/src/testlib/qtestlightxmlstreamer.cpp
index 8c22a4f..0ac9ea8 100644
--- a/src/testlib/qtestlightxmlstreamer.cpp
+++ b/src/testlib/qtestlightxmlstreamer.cpp
@@ -87,13 +87,12 @@ void QTestLightXmlStreamer::formatStart(const QTestElement *element, QTestCharBu
         QXmlTestLogger::xmlQuote(&quotedFile, 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    <DataTag>%s</DataTag><Description><![CDATA[%s]]></Description>\n</Message>\n",
+        QTest::qt_asprintf(formatted, "<Message type=\"%s\" %s=\"%s\" %s=\"%s\">\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;
     }
diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp
index 79bb84c..6c76388 100644
--- a/src/testlib/qtestlogger.cpp
+++ b/src/testlib/qtestlogger.cpp
@@ -318,9 +318,6 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char
         break;
     }
 
-    const char *tag = QTestResult::currentDataTag();
-    if (tag)
-        errorElement->addAttribute(QTest::AI_Tag, tag);
     errorElement->addAttribute(QTest::AI_Type, typeBuf);
     errorElement->addAttribute(QTest::AI_Description, message);
 
diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp
index 9addb31..b9946e5 100644
--- a/src/testlib/qtestxmlstreamer.cpp
+++ b/src/testlib/qtestxmlstreamer.cpp
@@ -111,13 +111,12 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, QTestCharBuffer
         QXmlTestLogger::xmlQuote(&quotedFile, 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    <DataTag>%s</DataTag>\n    <Description><![CDATA[%s]]></Description>\n</Message>\n",
+        QTest::qt_asprintf(formatted, "<Message type=\"%s\" %s=\"%s\" %s=\"%s\">\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;
     }
-- 
cgit v0.12