From 67c877562b18ea5c591d2884d2b14f7bf3a39149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 22 Jul 2020 01:38:42 +0200
Subject: testlib: Output JUnitXML attributes in right order

The attributes are, like the elements, maintained in reverse
order in the underlying QTestCoreList, so we need to iterate
them backwards when printing out the resulting XML to reflect
the order they were added.

This results in e.g.:

  <testcase name="passingBenchmark" result="pass">

Instead of:

  <testcase result="pass" name="passingBenchmark">

Change-Id: Ic2eeab8de05ffedd0c41977358d5b40ff77878b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../testlib/selftests/expected_assert.junitxml     |   18 +-
 .../testlib/selftests/expected_badxml.junitxml     |   56 +-
 .../selftests/expected_benchlibcallgrind.junitxml  |   14 +-
 .../selftests/expected_benchlibcounting.junitxml   |   20 +-
 .../expected_benchlibeventcounter.junitxml         |   14 +-
 .../selftests/expected_benchliboptions.junitxml    |   42 +-
 .../expected_benchlibtickcounter.junitxml          |   14 +-
 .../selftests/expected_benchlibwalltime.junitxml   |   18 +-
 .../selftests/expected_blacklisted.junitxml        |   36 +-
 .../testlib/selftests/expected_cmptest.junitxml    |  230 +-
 .../selftests/expected_commandlinedata.junitxml    |   28 +-
 .../testlib/selftests/expected_counting.junitxml   |   72 +-
 .../testlib/selftests/expected_datatable.junitxml  |   54 +-
 .../testlib/selftests/expected_datetime.junitxml   |   28 +-
 .../selftests/expected_exceptionthrow.junitxml     |   14 +-
 .../testlib/selftests/expected_expectfail.junitxml |   74 +-
 .../selftests/expected_failcleanup.junitxml        |   16 +-
 .../selftests/expected_faildatatype.junitxml       |   18 +-
 .../selftests/expected_failfetchtype.junitxml      |   16 +-
 .../testlib/selftests/expected_failinit.junitxml   |   14 +-
 .../selftests/expected_failinitdata.junitxml       |   12 +-
 .../testlib/selftests/expected_fetchbogus.junitxml |   16 +-
 .../selftests/expected_findtestdata.junitxml       |   16 +-
 .../auto/testlib/selftests/expected_float.junitxml |  404 +-
 .../testlib/selftests/expected_globaldata.junitxml |  102 +-
 .../testlib/selftests/expected_keyboard.junitxml   |   14 +-
 .../testlib/selftests/expected_longstring.junitxml |   18 +-
 .../selftests/expected_maxwarnings.junitxml        | 4018 ++++++++++----------
 .../testlib/selftests/expected_multiexec.junitxml  |   70 +-
 .../selftests/expected_pairdiagnostics.junitxml    |   24 +-
 .../auto/testlib/selftests/expected_pass.junitxml  |   18 +-
 .../selftests/expected_qexecstringlist.junitxml    |   18 +-
 .../selftests/expected_signaldumper.junitxml       |  282 +-
 .../testlib/selftests/expected_silent.junitxml     |   44 +-
 .../testlib/selftests/expected_singleskip.junitxml |   14 +-
 .../auto/testlib/selftests/expected_skip.junitxml  |   22 +-
 .../selftests/expected_skipcleanup.junitxml        |   14 +-
 .../testlib/selftests/expected_skipinit.junitxml   |   12 +-
 .../selftests/expected_skipinitdata.junitxml       |   10 +-
 .../auto/testlib/selftests/expected_sleep.junitxml |   16 +-
 .../testlib/selftests/expected_strcmp.junitxml     |   50 +-
 .../testlib/selftests/expected_subtest.junitxml    |   88 +-
 .../testlib/selftests/expected_testlib.junitxml    |   20 +-
 .../selftests/expected_tuplediagnostics.junitxml   |   26 +-
 .../testlib/selftests/expected_verbose1.junitxml   |   72 +-
 .../testlib/selftests/expected_verbose2.junitxml   |  108 +-
 .../expected_verifyexceptionthrown.junitxml        |   42 +-
 .../testlib/selftests/expected_warnings.junitxml   |   62 +-
 .../testlib/selftests/expected_watchdog.junitxml   |   16 +-
 .../auto/testlib/selftests/expected_xunit.junitxml |   42 +-
 .../testlib/selftests/generate_expected_output.py  |    2 +-
 tests/auto/testlib/selftests/tst_selftests.cpp     |    2 +-
 52 files changed, 3235 insertions(+), 3235 deletions(-)

(limited to 'tests/auto/testlib/selftests')

diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml
index 2250293597..96ece2a851 100644
--- a/tests/auto/testlib/selftests/expected_assert.junitxml
+++ b/tests/auto/testlib/selftests/expected_assert.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="1" tests="3" name="tst_Assert">
+<testsuite name="tst_Assert" tests="3" failures="1" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testNumber1"/>
-  <testcase result="fail" name="testNumber2">
-    <!-- message="ASSERT: &quot;false&quot; in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0" type="qfatal" -->
-    <failure message="Received a fatal error." result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testNumber1" result="pass"/>
+  <testcase name="testNumber2" result="fail">
+    <!-- type="qfatal" message="ASSERT: &quot;false&quot; in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0" -->
+    <failure result="fail" message="Received a fatal error."/>
   </testcase>
   <system-err>
 <![CDATA[ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0]]>
diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml
index 49048fdad6..de8fcb67f7 100644
--- a/tests/auto/testlib/selftests/expected_badxml.junitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.junitxml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="13" failures="5" tests="6" name="tst_BadXml">
+<testsuite name="tst_BadXml" tests="6" failures="5" errors="13">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="badDataTag">
-    <!-- tag="fail end cdata ]]&gt; text ]]&gt; more text" message="a message" type="qdebug" -->
-    <failure tag="fail end cdata ]]&gt; text ]]&gt; more text" message="a failure" result="fail"/>
-    <!-- tag="pass end cdata ]]&gt; text ]]&gt; more text" message="a message" type="qdebug" -->
-    <!-- tag="fail quotes &quot; text&quot; more text" message="a message" type="qdebug" -->
-    <failure tag="fail quotes &quot; text&quot; more text" message="a failure" result="fail"/>
-    <!-- tag="pass quotes &quot; text&quot; more text" message="a message" type="qdebug" -->
-    <!-- tag="fail xml close &gt; open &lt; tags &lt; text" message="a message" type="qdebug" -->
-    <failure tag="fail xml close &gt; open &lt; tags &lt; text" message="a failure" result="fail"/>
-    <!-- tag="pass xml close &gt; open &lt; tags &lt; text" message="a message" type="qdebug" -->
-    <!-- tag="fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" message="a message" type="qdebug" -->
-    <failure tag="fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" message="a failure" result="fail"/>
-    <!-- tag="pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" message="a message" type="qdebug" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="badDataTag" result="fail">
+    <!-- type="qdebug" message="a message" tag="fail end cdata ]]&gt; text ]]&gt; more text" -->
+    <failure result="fail" message="a failure" tag="fail end cdata ]]&gt; text ]]&gt; more text"/>
+    <!-- type="qdebug" message="a message" tag="pass end cdata ]]&gt; text ]]&gt; more text" -->
+    <!-- type="qdebug" message="a message" tag="fail quotes &quot; text&quot; more text" -->
+    <failure result="fail" message="a failure" tag="fail quotes &quot; text&quot; more text"/>
+    <!-- type="qdebug" message="a message" tag="pass quotes &quot; text&quot; more text" -->
+    <!-- type="qdebug" message="a message" tag="fail xml close &gt; open &lt; tags &lt; text" -->
+    <failure result="fail" message="a failure" tag="fail xml close &gt; open &lt; tags &lt; text"/>
+    <!-- type="qdebug" message="a message" tag="pass xml close &gt; open &lt; tags &lt; text" -->
+    <!-- type="qdebug" message="a message" tag="fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" -->
+    <failure result="fail" message="a failure" tag="fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs"/>
+    <!-- type="qdebug" message="a message" tag="pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" -->
   </testcase>
-  <testcase result="pass" name="badMessage">
-    <!-- tag="string 0" message="end cdata ]]&gt; text ]]&gt; more text" type="qdebug" -->
-    <!-- tag="string 1" message="quotes &quot; text&quot; more text" type="qdebug" -->
-    <!-- tag="string 2" message="xml close &gt; open &lt; tags &lt; text" type="qdebug" -->
-    <!-- tag="string 3" message="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" type="qdebug" -->
+  <testcase name="badMessage" result="pass">
+    <!-- type="qdebug" message="end cdata ]]&gt; text ]]&gt; more text" tag="string 0" -->
+    <!-- type="qdebug" message="quotes &quot; text&quot; more text" tag="string 1" -->
+    <!-- type="qdebug" message="xml close &gt; open &lt; tags &lt; text" tag="string 2" -->
+    <!-- type="qdebug" message="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" tag="string 3" -->
   </testcase>
-  <testcase result="fail" name="failWithNoFile">
-    <failure message="failure message" result="fail"/>
+  <testcase name="failWithNoFile" result="fail">
+    <failure result="fail" message="failure message"/>
   </testcase>
-  <testcase result="pass" name="encoding">
-    <!-- message="&quot;Ülrich Ümläut&quot;" type="qdebug" -->
+  <testcase name="encoding" result="pass">
+    <!-- type="qdebug" message="&quot;Ülrich Ümläut&quot;" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[a message]]>
 <![CDATA[a message]]>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
index 8f1b2ebfea..8fe792a4a8 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="0" tests="3" name="tst_BenchlibCallgrind">
+<testsuite name="tst_BenchlibCallgrind" tests="3" failures="0" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
   <testcase name="twoHundredMillionInstructions">
-    <!-- message="This test is only defined for gcc and x86." type="skip" -->
+    <!-- type="skip" message="This test is only defined for gcc and x86." -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[This test is only defined for gcc and x86.]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
index 05d1da9874..a9708bf36e 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="1" tests="5" name="tst_BenchlibCounting">
+<testsuite name="tst_BenchlibCounting" tests="5" failures="1" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="passingBenchmark">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="passingBenchmark" result="pass">
   </testcase>
   <testcase name="skippingBenchmark">
-    <!-- message="This is a skipping benchmark" type="skip" -->
+    <!-- type="skip" message="This is a skipping benchmark" -->
   </testcase>
-  <testcase result="fail" name="failingBenchmark">
-    <failure message="This is a failing benchmark" result="fail"/>
+  <testcase name="failingBenchmark" result="fail">
+    <failure result="fail" message="This is a failing benchmark"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[This is a skipping benchmark]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
index ce0a81110d..2945a67b06 100644
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibEventCounter">
+<testsuite name="tst_BenchlibEventCounter" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="events">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="events" result="pass">
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
index 370d1c7c5c..cfb5a142b0 100644
--- a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibOptions">
+<testsuite name="tst_BenchlibOptions" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="threeEvents">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="threeEvents" result="pass">
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibFifteenIterations">
+<testsuite name="tst_BenchlibFifteenIterations" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="threeEvents">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="threeEvents" result="pass">
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibOneHundredMinimum">
+<testsuite name="tst_BenchlibOneHundredMinimum" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="threeEvents">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="threeEvents" result="pass">
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
index 779d3bdcbc..f32060b1b0 100644
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibTickCounter">
+<testsuite name="tst_BenchlibTickCounter" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="threeBillionTicks">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="threeBillionTicks" result="pass">
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
index 6a0510c4c9..9f42e25ee2 100644
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="5" name="tst_BenchlibWalltime">
+<testsuite name="tst_BenchlibWalltime" tests="5" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="waitForOneThousand">
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="waitForOneThousand" result="pass">
   </testcase>
-  <testcase result="pass" name="waitForFourThousand">
+  <testcase name="waitForFourThousand" result="pass">
   </testcase>
-  <testcase result="pass" name="qbenchmark_once">
+  <testcase name="qbenchmark_once" result="pass">
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
index 6e192687fb..67204946a7 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="8" failures="3" tests="7" name="tst_Blacklisted">
+<testsuite name="tst_Blacklisted" tests="7" failures="3" errors="8">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="bpass" name="pass"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="pass" result="bpass"/>
   <testcase name="skip">
-    <!-- message="This test should SKIP" type="skip" -->
+    <!-- type="skip" message="This test should SKIP" -->
   </testcase>
-  <testcase result="bfail" name="fail"/>
-  <testcase result="bxfail" name="xfail"/>
-  <testcase result="bxpass" name="xpass"/>
-  <testcase result="bfail" name="messages">
-    <!-- message="This is a warning that should not appear in silent test output" type="qwarn" -->
-    <!-- message="This is an internal testlib warning that should not appear in silent test output" type="warn" -->
-    <!-- message="This is a debug message that should not appear in silent test output" type="qdebug" -->
-    <!-- message="This is a critical message that should not appear in silent test output" type="system" -->
-    <!-- message="This is an info message that should not appear in silent test output" type="qinfo" -->
-    <!-- message="This is an internal testlib info message that should not appear in silent test output" type="info" -->
-    <!-- message="This is a fatal error message that should still appear in silent test output" type="qfatal" -->
+  <testcase name="fail" result="bfail"/>
+  <testcase name="xfail" result="bxfail"/>
+  <testcase name="xpass" result="bxpass"/>
+  <testcase name="messages" result="bfail">
+    <!-- type="qwarn" message="This is a warning that should not appear in silent test output" -->
+    <!-- type="warn" message="This is an internal testlib warning that should not appear in silent test output" -->
+    <!-- type="qdebug" message="This is a debug message that should not appear in silent test output" -->
+    <!-- type="system" message="This is a critical message that should not appear in silent test output" -->
+    <!-- type="qinfo" message="This is an info message that should not appear in silent test output" -->
+    <!-- type="info" message="This is an internal testlib info message that should not appear in silent test output" -->
+    <!-- type="qfatal" message="This is a fatal error message that should still appear in silent test output" -->
   </testcase>
   <system-err>
 <![CDATA[This test should SKIP]]>
diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml
index 937003466e..2bdfabd9bb 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.junitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml
@@ -1,180 +1,180 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="45" tests="28" name="tst_Cmptest">
+<testsuite name="tst_Cmptest" tests="28" failures="45" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="compare_unregistered_enums">
-    <failure message="Compared values are not the same" result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="compare_unregistered_enums" result="fail">
+    <failure result="fail" message="Compared values are not the same"/>
   </testcase>
-  <testcase result="fail" name="compare_registered_enums">
-    <failure message="Compared values are not the same
+  <testcase name="compare_registered_enums" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (Qt::Monday): Monday
-   Expected (Qt::Sunday): Sunday" result="fail"/>
+   Expected (Qt::Sunday): Sunday"/>
   </testcase>
-  <testcase result="fail" name="compare_class_enums">
-    <failure message="Compared values are not the same
+  <testcase name="compare_class_enums" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
-   Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2" result="fail"/>
+   Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2"/>
   </testcase>
-  <testcase result="fail" name="test_windowflags">
-    <failure tag="fail1" message="Compared values are not the same
+  <testcase name="test_windowflags" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (actualWindowFlags)  : Window|WindowSystemMenuHint|WindowStaysOnBottomHint
-   Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint" result="fail"/>
-    <failure tag="fail2" message="Compared values are not the same
+   Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint" tag="fail1"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (actualWindowFlags)  : Window
-   Expected (expectedWindowFlags): Window|FramelessWindowHint" result="fail"/>
+   Expected (expectedWindowFlags): Window|FramelessWindowHint" tag="fail2"/>
   </testcase>
-  <testcase result="fail" name="test_unregistered_flags">
-    <failure tag="fail1" message="Compared values are not the same
+  <testcase name="test_unregistered_flags" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (actualFlags)  : 0x3
-   Expected (expectedFlags): 0x5" result="fail"/>
-    <failure tag="fail2" message="Compared values are not the same
+   Expected (expectedFlags): 0x5" tag="fail1"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (actualFlags)  : 0x1
-   Expected (expectedFlags): 0x5" result="fail"/>
+   Expected (expectedFlags): 0x5" tag="fail2"/>
   </testcase>
-  <testcase result="pass" name="compare_boolfuncs"/>
-  <testcase result="pass" name="compare_to_nullptr"/>
-  <testcase result="pass" name="compare_pointerfuncs"/>
-  <testcase result="fail" name="compare_tostring">
-    <failure tag="int, string" message="Compared values are not the same
+  <testcase name="compare_boolfuncs" result="pass"/>
+  <testcase name="compare_to_nullptr" result="pass"/>
+  <testcase name="compare_pointerfuncs" result="pass"/>
+  <testcase name="compare_tostring" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (actual)  : QVariant(int,123)
-   Expected (expected): QVariant(QString,hi)" result="fail"/>
-    <failure tag="null hash, invalid" message="Compared values are not the same
+   Expected (expected): QVariant(QString,hi)" tag="int, string"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (actual)  : QVariant(QVariantHash)
-   Expected (expected): QVariant()" result="fail"/>
-    <failure tag="string, null user type" message="Compared values are not the same
+   Expected (expected): QVariant()" tag="null hash, invalid"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (actual)  : QVariant(QString,A simple string)
-   Expected (expected): QVariant(PhonyClass)" result="fail"/>
-    <failure tag="both non&#x002D;null user type" message="Compared values are not the same
+   Expected (expected): QVariant(PhonyClass)" tag="string, null user type"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (actual)  : QVariant(PhonyClass,&lt;value not representable as string&gt;)
-   Expected (expected): QVariant(PhonyClass,&lt;value not representable as string&gt;)" result="fail"/>
+   Expected (expected): QVariant(PhonyClass,&lt;value not representable as string&gt;)" tag="both non&#x002D;null user type"/>
   </testcase>
-  <testcase result="fail" name="compareQStringLists">
-    <failure tag="last item different" message="Compared lists differ at index 2.
+  <testcase name="compareQStringLists" result="fail">
+    <failure result="fail" message="Compared lists differ at index 2.
    Actual   (opA): &quot;string3&quot;
-   Expected (opB): &quot;DIFFERS&quot;" result="fail"/>
-    <failure tag="second&#x002D;last item different" message="Compared lists differ at index 2.
+   Expected (opB): &quot;DIFFERS&quot;" tag="last item different"/>
+    <failure result="fail" message="Compared lists differ at index 2.
    Actual   (opA): &quot;string3&quot;
-   Expected (opB): &quot;DIFFERS&quot;" result="fail"/>
-    <failure tag="prefix" message="Compared lists have different sizes.
+   Expected (opB): &quot;DIFFERS&quot;" tag="second&#x002D;last item different"/>
+    <failure result="fail" message="Compared lists have different sizes.
    Actual   (opA) size: 2
-   Expected (opB) size: 1" result="fail"/>
-    <failure tag="short list second" message="Compared lists have different sizes.
+   Expected (opB) size: 1" tag="prefix"/>
+    <failure result="fail" message="Compared lists have different sizes.
    Actual   (opA) size: 12
-   Expected (opB) size: 1" result="fail"/>
-    <failure tag="short list first" message="Compared lists have different sizes.
+   Expected (opB) size: 1" tag="short list second"/>
+    <failure result="fail" message="Compared lists have different sizes.
    Actual   (opA) size: 1
-   Expected (opB) size: 12" result="fail"/>
+   Expected (opB) size: 12" tag="short list first"/>
   </testcase>
-  <testcase result="fail" name="compareQListInt">
-    <failure tag="size mismatch" message="Compared lists have different sizes.
+  <testcase name="compareQListInt" result="fail">
+    <failure result="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
-   Expected (expected) size: 3" result="fail"/>
-    <failure tag="value mismatch" message="Compared lists differ at index 2.
+   Expected (expected) size: 3" tag="size mismatch"/>
+    <failure result="fail" message="Compared lists differ at index 2.
    Actual   (actual): 4
-   Expected (expected): 3" result="fail"/>
+   Expected (expected): 3" tag="value mismatch"/>
   </testcase>
-  <testcase result="fail" name="compareQListIntToArray">
-    <failure tag="size mismatch" message="Compared lists have different sizes.
+  <testcase name="compareQListIntToArray" result="fail">
+    <failure result="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
-   Expected (expected) size: 3" result="fail"/>
-    <failure tag="value mismatch" message="Compared lists differ at index 2.
+   Expected (expected) size: 3" tag="size mismatch"/>
+    <failure result="fail" message="Compared lists differ at index 2.
    Actual   (actual): 4
-   Expected (expected): 3" result="fail"/>
+   Expected (expected): 3" tag="value mismatch"/>
   </testcase>
-  <testcase result="fail" name="compareQListIntToInitializerList">
-    <failure tag="size mismatch" message="Compared lists have different sizes.
+  <testcase name="compareQListIntToInitializerList" result="fail">
+    <failure result="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
-   Expected (ARG({1, 2, 3})) size: 3" result="fail"/>
-    <failure tag="value mismatch" message="Compared lists differ at index 2.
+   Expected (ARG({1, 2, 3})) size: 3" tag="size mismatch"/>
+    <failure result="fail" message="Compared lists differ at index 2.
    Actual   (actual): 4
-   Expected (ARG({1, 2, 3})): 3" result="fail"/>
+   Expected (ARG({1, 2, 3})): 3" tag="value mismatch"/>
   </testcase>
-  <testcase result="fail" name="compareQListDouble">
-    <failure message="Compared lists differ at index 0.
+  <testcase name="compareQListDouble" result="fail">
+    <failure result="fail" message="Compared lists differ at index 0.
    Actual   (double1): 1.5
-   Expected (double2): 1" result="fail"/>
+   Expected (double2): 1"/>
   </testcase>
-  <testcase result="fail" name="compareQColor">
-    <failure tag="Qt::yellow vs Qt::green" message="Compared values are not the same
+  <testcase name="compareQColor" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (colorA): #ffffff00
-   Expected (colorB): #ff00ff00" result="fail"/>
-    <failure tag="0x88ff0000 vs 0xffff0000" message="Compared values are not the same
+   Expected (colorB): #ff00ff00" tag="Qt::yellow vs Qt::green"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (colorA): #88ff0000
-   Expected (colorB): #ffff0000" result="fail"/>
+   Expected (colorB): #ffff0000" tag="0x88ff0000 vs 0xffff0000"/>
   </testcase>
-  <testcase result="fail" name="compareQPixmaps">
-    <failure tag="one null" message="Compared QPixmaps differ.
+  <testcase name="compareQPixmaps" result="fail">
+    <failure result="fail" message="Compared QPixmaps differ.
    Actual   (opA).isNull(): 1
-   Expected (opB).isNull(): 0" result="fail"/>
-    <failure tag="other null" message="Compared QPixmaps differ.
+   Expected (opB).isNull(): 0" tag="one null"/>
+    <failure result="fail" message="Compared QPixmaps differ.
    Actual   (opA).isNull(): 0
-   Expected (opB).isNull(): 1" result="fail"/>
-    <failure tag="different size" message="Compared QPixmaps differ in size.
+   Expected (opB).isNull(): 1" tag="other null"/>
+    <failure result="fail" message="Compared QPixmaps differ in size.
    Actual   (opA): 11x20
-   Expected (opB): 20x20" result="fail"/>
-    <failure tag="different pixels" message="Compared values are not the same" result="fail"/>
-    <failure tag="different dpr" message="Compared QPixmaps differ in device pixel ratio.
+   Expected (opB): 20x20" tag="different size"/>
+    <failure result="fail" message="Compared values are not the same" tag="different pixels"/>
+    <failure result="fail" message="Compared QPixmaps differ in device pixel ratio.
    Actual   (opA): 1
-   Expected (opB): 2" result="fail"/>
+   Expected (opB): 2" tag="different dpr"/>
   </testcase>
-  <testcase result="fail" name="compareQImages">
-    <failure tag="one null" message="Compared QImages differ.
+  <testcase name="compareQImages" result="fail">
+    <failure result="fail" message="Compared QImages differ.
    Actual   (opA).isNull(): 1
-   Expected (opB).isNull(): 0" result="fail"/>
-    <failure tag="other null" message="Compared QImages differ.
+   Expected (opB).isNull(): 0" tag="one null"/>
+    <failure result="fail" message="Compared QImages differ.
    Actual   (opA).isNull(): 0
-   Expected (opB).isNull(): 1" result="fail"/>
-    <failure tag="different size" message="Compared QImages differ in size.
+   Expected (opB).isNull(): 1" tag="other null"/>
+    <failure result="fail" message="Compared QImages differ in size.
    Actual   (opA): 11x20
-   Expected (opB): 20x20" result="fail"/>
-    <failure tag="different format" message="Compared QImages differ in format.
+   Expected (opB): 20x20" tag="different size"/>
+    <failure result="fail" message="Compared QImages differ in format.
    Actual   (opA): 6
-   Expected (opB): 3" result="fail"/>
-    <failure tag="different pixels" message="Compared values are not the same" result="fail"/>
-    <failure tag="different dpr" message="Compared QImages differ in device pixel ratio.
+   Expected (opB): 3" tag="different format"/>
+    <failure result="fail" message="Compared values are not the same" tag="different pixels"/>
+    <failure result="fail" message="Compared QImages differ in device pixel ratio.
    Actual   (opA): 1
-   Expected (opB): 2" result="fail"/>
+   Expected (opB): 2" tag="different dpr"/>
   </testcase>
-  <testcase result="fail" name="compareQRegion">
-    <failure tag="1&#x002D;empty" message="Compared values are not the same
+  <testcase name="compareQRegion" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (rA): QRegion(200x50+10+10)
-   Expected (rB): QRegion(null)" result="fail"/>
-    <failure tag="different lists" message="Compared values are not the same
+   Expected (rB): QRegion(null)" tag="1&#x002D;empty"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (rA): QRegion(200x50+10+10)
-   Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" result="fail"/>
+   Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" tag="different lists"/>
   </testcase>
-  <testcase result="fail" name="compareQVector2D">
-    <failure message="Compared values are not the same
+  <testcase name="compareQVector2D" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (v2a): QVector2D(1, 2)
-   Expected (v2b): QVector2D(1, 3)" result="fail"/>
+   Expected (v2b): QVector2D(1, 3)"/>
   </testcase>
-  <testcase result="fail" name="compareQVector3D">
-    <failure message="Compared values are not the same
+  <testcase name="compareQVector3D" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (v3a): QVector3D(1, 2, 3)
-   Expected (v3b): QVector3D(1, 3, 3)" result="fail"/>
+   Expected (v3b): QVector3D(1, 3, 3)"/>
   </testcase>
-  <testcase result="fail" name="compareQVector4D">
-    <failure message="Compared values are not the same
+  <testcase name="compareQVector4D" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (v4a): QVector4D(1, 2, 3, 4)
-   Expected (v4b): QVector4D(1, 3, 3, 4)" result="fail"/>
+   Expected (v4b): QVector4D(1, 3, 3, 4)"/>
   </testcase>
-  <testcase result="fail" name="verify">
-    <failure message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="verify" result="fail">
+    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase result="fail" name="verify2">
-    <failure message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)" result="fail"/>
+  <testcase name="verify2" result="fail">
+    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
   </testcase>
-  <testcase result="fail" name="tryVerify">
-    <failure message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="tryVerify" result="fail">
+    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase result="fail" name="tryVerify2">
-    <failure message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)" result="fail"/>
+  <testcase name="tryVerify2" result="fail">
+    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
   </testcase>
-  <testcase result="pass" name="verifyExplicitOperatorBool"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="verifyExplicitOperatorBool" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
index 5072a7e6f4..2a8df68568 100644
--- a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="6" failures="0" tests="4" name="tst_DataTable">
+<testsuite name="tst_DataTable" tests="4" failures="0" errors="6">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="fiveTablePasses">
-    <!-- tag="fiveTablePasses_data1" message="QVERIFY(test)" type="info" -->
-    <!-- tag="fiveTablePasses_data2" message="QVERIFY(test)" type="info" -->
-    <!-- tag="fiveTablePasses_data3" message="QVERIFY(test)" type="info" -->
-    <!-- tag="fiveTablePasses_data4" message="QVERIFY(test)" type="info" -->
-    <!-- tag="fiveTablePasses_data5" message="QVERIFY(test)" type="info" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="fiveTablePasses" result="pass">
+    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data1" -->
+    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data2" -->
+    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data3" -->
+    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data4" -->
+    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data5" -->
   </testcase>
-  <testcase result="pass" name="fiveTablePasses">
-    <!-- tag="fiveTablePasses_data1" message="QVERIFY(test)" type="info" -->
+  <testcase name="fiveTablePasses" result="pass">
+    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data1" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[QVERIFY(test)]]>
 <![CDATA[QVERIFY(test)]]>
diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml
index cb3a7815af..d0b7552555 100644
--- a/tests/auto/testlib/selftests/expected_counting.junitxml
+++ b/tests/auto/testlib/selftests/expected_counting.junitxml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="10" failures="8" tests="15" name="tst_Counting">
+<testsuite name="tst_Counting" tests="15" failures="8" errors="10">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testPassPass"/>
-  <testcase result="pass" name="testPassSkip">
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testPassPass" result="pass"/>
+  <testcase name="testPassSkip" result="pass">
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testPassFail">
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testPassFail" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="pass" name="testSkipPass">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
+  <testcase name="testSkipPass" result="pass">
+    <!-- type="skip" message="Skipping" tag="row 1" -->
   </testcase>
   <testcase name="testSkipSkip">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testSkipFail">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testSkipFail" result="fail">
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="fail" name="testFailPass">
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testFailPass" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
   </testcase>
-  <testcase result="fail" name="testFailSkip">
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+  <testcase name="testFailSkip" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testFailFail">
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testFailFail" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="fail" name="testFailInInit">
-    <failure tag="fail" message="Fail in init()" result="fail"/>
+  <testcase name="testFailInInit" result="fail">
+    <failure result="fail" message="Fail in init()" tag="fail"/>
   </testcase>
-  <testcase result="fail" name="testFailInCleanup">
-    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" -->
-    <failure tag="fail" message="Fail in cleanup()" result="fail"/>
+  <testcase name="testFailInCleanup" result="fail">
+    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" -->
+    <failure result="fail" message="Fail in cleanup()" tag="fail"/>
   </testcase>
-  <testcase result="pass" name="testSkipInInit">
-    <!-- tag="skip" message="Skip in init()" type="skip" -->
+  <testcase name="testSkipInInit" result="pass">
+    <!-- type="skip" message="Skip in init()" tag="skip" -->
   </testcase>
-  <testcase result="pass" name="testSkipInCleanup">
-    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" -->
-    <!-- tag="skip" message="Skip in cleanup()" type="skip" -->
+  <testcase name="testSkipInCleanup" result="pass">
+    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" -->
+    <!-- type="skip" message="Skip in cleanup()" tag="skip" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
diff --git a/tests/auto/testlib/selftests/expected_datatable.junitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml
index 89fc7ee819..0857cb5593 100644
--- a/tests/auto/testlib/selftests/expected_datatable.junitxml
+++ b/tests/auto/testlib/selftests/expected_datatable.junitxml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="13" tests="10" name="tst_DataTable">
+<testsuite name="tst_DataTable" tests="10" failures="13" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="singleTestFunction1"/>
-  <testcase result="pass" name="singleTestFunction2"/>
-  <testcase result="pass" name="fiveTablePasses"/>
-  <testcase result="fail" name="fiveTableFailures">
-    <failure tag="fiveTableFailures_data 1" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveTableFailures_data 2" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveTableFailures_data 3" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveTableFailures_data 4" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveTableFailures_data 5" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="singleTestFunction1" result="pass"/>
+  <testcase name="singleTestFunction2" result="pass"/>
+  <testcase name="fiveTablePasses" result="pass"/>
+  <testcase name="fiveTableFailures" result="fail">
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 1"/>
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 2"/>
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 3"/>
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 4"/>
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 5"/>
   </testcase>
-  <testcase result="fail" name="startsWithFailure">
-    <failure tag="startsWithFailure_data 1" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="startsWithFailure" result="fail">
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="startsWithFailure_data 1"/>
   </testcase>
-  <testcase result="fail" name="endsWithFailure">
-    <failure tag="endsWithFailure 5" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="endsWithFailure" result="fail">
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="endsWithFailure 5"/>
   </testcase>
-  <testcase result="fail" name="failureInMiddle">
-    <failure tag="failureInMiddle_data 3" message="&apos;test&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="failureInMiddle" result="fail">
+    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="failureInMiddle_data 3"/>
   </testcase>
-  <testcase result="fail" name="fiveIsolatedFailures">
-    <failure tag="fiveIsolatedFailures_data 1" message="&apos;!test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveIsolatedFailures_data 2" message="&apos;!test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveIsolatedFailures_data 3" message="&apos;!test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveIsolatedFailures_data 4" message="&apos;!test&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="fiveIsolatedFailures_data 5" message="&apos;!test&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="fiveIsolatedFailures" result="fail">
+    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 1"/>
+    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 2"/>
+    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 3"/>
+    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 4"/>
+    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 5"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml
index 6fc95719f3..a95cc57faf 100644
--- a/tests/auto/testlib/selftests/expected_datetime.junitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.junitxml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="3" tests="4" name="tst_DateTime">
+<testsuite name="tst_DateTime" tests="4" failures="3" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="dateTime">
-    <failure message="Compared values are not the same
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="dateTime" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (local): 2000/05/03 04:03:04.000[UTC+00:02]
-   Expected (utc)  : 2000/05/03 04:03:04.000[UTC]" result="fail"/>
+   Expected (utc)  : 2000/05/03 04:03:04.000[UTC]"/>
   </testcase>
-  <testcase result="fail" name="qurl">
-    <failure tag="empty rhs" message="Compared values are not the same
+  <testcase name="qurl" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (operandA): http://example.com
-   Expected (operandB): Invalid URL: " result="fail"/>
-    <failure tag="empty lhs" message="Compared values are not the same
+   Expected (operandB): Invalid URL: " tag="empty rhs"/>
+    <failure result="fail" message="Compared values are not the same
    Actual   (operandA): Invalid URL: 
-   Expected (operandB): http://example.com" result="fail"/>
+   Expected (operandB): http://example.com" tag="empty lhs"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
index 7d10bf6f04..f4f920ca6f 100644
--- a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="1" tests="2" name="tst_Exception">
+<testsuite name="tst_Exception" tests="2" failures="1" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="throwException">
-    <failure message="Caught unhandled exception" result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="throwException" result="fail">
+    <failure result="fail" message="Caught unhandled exception"/>
   </testcase>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml
index 47483d71bf..03d9b2c32d 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.junitxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="13" failures="6" tests="14" name="tst_ExpectFail">
+<testsuite name="tst_ExpectFail" tests="14" failures="6" errors="13">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="xfail" name="xfailAndContinue">
-    <!-- message="begin" type="qdebug" -->
-    <!-- message="This should xfail" type="info" -->
-    <!-- message="after" type="qdebug" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="xfailAndContinue" result="xfail">
+    <!-- type="qdebug" message="begin" -->
+    <!-- type="info" message="This should xfail" -->
+    <!-- type="qdebug" message="after" -->
   </testcase>
-  <testcase result="xfail" name="xfailAndAbort">
-    <!-- message="begin" type="qdebug" -->
-    <!-- message="This should xfail" type="info" -->
+  <testcase name="xfailAndAbort" result="xfail">
+    <!-- type="qdebug" message="begin" -->
+    <!-- type="info" message="This should xfail" -->
   </testcase>
-  <testcase result="fail" name="xfailTwice">
-    <failure message="Already expecting a fail" result="fail"/>
+  <testcase name="xfailTwice" result="fail">
+    <failure result="fail" message="Already expecting a fail"/>
   </testcase>
-  <testcase result="xfail" name="xfailWithQString">
-    <!-- message="A string" type="info" -->
-    <!-- message="Bug 5 (The message)" type="info" -->
+  <testcase name="xfailWithQString" result="xfail">
+    <!-- type="info" message="A string" -->
+    <!-- type="info" message="Bug 5 (The message)" -->
   </testcase>
-  <testcase result="xfail" name="xfailDataDrivenWithQVerify">
-    <!-- tag="Abort" message="This test should xfail" type="info" -->
-    <!-- tag="Continue" message="This test should xfail" type="info" -->
+  <testcase name="xfailDataDrivenWithQVerify" result="xfail">
+    <!-- type="info" message="This test should xfail" tag="Abort" -->
+    <!-- type="info" message="This test should xfail" tag="Continue" -->
   </testcase>
-  <testcase result="xfail" name="xfailDataDrivenWithQCompare">
-    <!-- tag="Abort" message="This test should xfail" type="info" -->
-    <!-- tag="Continue" message="This test should xfail" type="info" -->
+  <testcase name="xfailDataDrivenWithQCompare" result="xfail">
+    <!-- type="info" message="This test should xfail" tag="Abort" -->
+    <!-- type="info" message="This test should xfail" tag="Continue" -->
   </testcase>
-  <testcase result="pass" name="xfailOnWrongRow"/>
-  <testcase result="xfail" name="xfailOnAnyRow">
-    <!-- tag="first row" message="This test should xfail" type="info" -->
-    <!-- tag="second row" message="This test should xfail" type="info" -->
+  <testcase name="xfailOnWrongRow" result="pass"/>
+  <testcase name="xfailOnAnyRow" result="xfail">
+    <!-- type="info" message="This test should xfail" tag="first row" -->
+    <!-- type="info" message="This test should xfail" tag="second row" -->
   </testcase>
-  <testcase result="fail" name="xfailWithoutVerify">
-    <failure tag="first row" message="QEXPECT_FAIL was called without any subsequent verification statements" result="fail"/>
-    <failure tag="second row" message="QEXPECT_FAIL was called without any subsequent verification statements" result="fail"/>
+  <testcase name="xfailWithoutVerify" result="fail">
+    <failure result="fail" message="QEXPECT_FAIL was called without any subsequent verification statements" tag="first row"/>
+    <failure result="fail" message="QEXPECT_FAIL was called without any subsequent verification statements" tag="second row"/>
   </testcase>
-  <testcase result="xpass" name="xpass">
-    <failure message="&apos;true&apos; returned TRUE unexpectedly. ()" result="xpass"/>
+  <testcase name="xpass" result="xpass">
+    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
   </testcase>
-  <testcase result="xpass" name="xpassDataDrivenWithQVerify">
-    <failure tag="XPass" message="&apos;true&apos; returned TRUE unexpectedly. ()" result="xpass"/>
+  <testcase name="xpassDataDrivenWithQVerify" result="xpass">
+    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()" tag="XPass"/>
   </testcase>
-  <testcase result="xpass" name="xpassDataDrivenWithQCompare">
-    <failure tag="XPass" message="QCOMPARE(1, 1) returned TRUE unexpectedly." result="xpass"/>
+  <testcase name="xpassDataDrivenWithQCompare" result="xpass">
+    <failure result="xpass" message="QCOMPARE(1, 1) returned TRUE unexpectedly." tag="XPass"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[begin]]>
 <![CDATA[This should xfail]]>
diff --git a/tests/auto/testlib/selftests/expected_failcleanup.junitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml
index 813e284ee0..6481c96066 100644
--- a/tests/auto/testlib/selftests/expected_failcleanup.junitxml
+++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="1" tests="3" name="tst_FailCleanup">
+<testsuite name="tst_FailCleanup" tests="3" failures="1" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="aTestFunction"/>
-  <testcase result="fail" name="cleanupTestCase">
-    <failure message="&apos;false&apos; returned FALSE. (Fail inside cleanupTestCase)" result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="aTestFunction" result="pass"/>
+  <testcase name="cleanupTestCase" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. (Fail inside cleanupTestCase)"/>
   </testcase>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
index 320ece4994..105452238c 100644
--- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml
+++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="2" failures="1" tests="2" name="tst_FailDataType">
+<testsuite name="tst_FailDataType" tests="2" failures="1" errors="2">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="value">
-    <!-- message="expected data of type &apos;QString&apos;, got &apos;bool&apos; for element 0 of data with tag &apos;bool&#x002D;as&#x002D;string&apos;" type="qdebug" -->
-    <!-- message="ASSERT: &quot;false&quot; in file qtbase/src/testlib/qtestdata.cpp, line 0" type="qfatal" -->
-    <failure message="Received a fatal error." result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="value" result="fail">
+    <!-- type="qdebug" message="expected data of type &apos;QString&apos;, got &apos;bool&apos; for element 0 of data with tag &apos;bool&#x002D;as&#x002D;string&apos;" -->
+    <!-- type="qfatal" message="ASSERT: &quot;false&quot; in file qtbase/src/testlib/qtestdata.cpp, line 0" -->
+    <failure result="fail" message="Received a fatal error."/>
   </testcase>
   <system-err>
 <![CDATA[expected data of type 'QString', got 'bool' for element 0 of data with tag 'bool-as-string']]>
diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
index a54a37a913..1c177edd78 100644
--- a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
+++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="1" tests="2" name="tst_FailFetchType">
+<testsuite name="tst_FailFetchType" tests="2" failures="1" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="fetch">
-    <!-- tag="bool" message="Requested type &apos;QString&apos; does not match available type &apos;bool&apos;." type="qfatal" -->
-    <failure tag="bool" message="Received a fatal error." result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="fetch" result="fail">
+    <!-- type="qfatal" message="Requested type &apos;QString&apos; does not match available type &apos;bool&apos;." tag="bool" -->
+    <failure result="fail" message="Received a fatal error." tag="bool"/>
   </testcase>
   <system-err>
 <![CDATA[Requested type 'QString' does not match available type 'bool'.]]>
diff --git a/tests/auto/testlib/selftests/expected_failinit.junitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml
index 3715725ea5..cc57286c9e 100644
--- a/tests/auto/testlib/selftests/expected_failinit.junitxml
+++ b/tests/auto/testlib/selftests/expected_failinit.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="1" tests="2" name="tst_FailInit">
+<testsuite name="tst_FailInit" tests="2" failures="1" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="fail" name="initTestCase">
-    <failure message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="initTestCase" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_failinitdata.junitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml
index d245bc0dff..5a446c24c6 100644
--- a/tests/auto/testlib/selftests/expected_failinitdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="1" tests="1" name="tst_FailInitData">
+<testsuite name="tst_FailInitData" tests="1" failures="1" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="fail" name="initTestCase">
-    <failure message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="initTestCase" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
index 77ccbd896a..a921649e1e 100644
--- a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="1" tests="2" name="tst_FetchBogus">
+<testsuite name="tst_FetchBogus" tests="2" failures="1" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="fetchBogus">
-    <!-- tag="foo" message="QFETCH: Requested testdata &apos;bubu&apos; not available, check your _data function." type="qfatal" -->
-    <failure tag="foo" message="Received a fatal error." result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="fetchBogus" result="fail">
+    <!-- type="qfatal" message="QFETCH: Requested testdata &apos;bubu&apos; not available, check your _data function." tag="foo" -->
+    <failure result="fail" message="Received a fatal error." tag="foo"/>
   </testcase>
   <system-err>
 <![CDATA[QFETCH: Requested testdata 'bubu' not available, check your _data function.]]>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
index c1138da6cb..4cec09b8c9 100644
--- a/tests/auto/testlib/selftests/expected_findtestdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="0" tests="3" name="FindTestData">
+<testsuite name="FindTestData" tests="3" failures="0" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="paths">
-    <!-- message="testdata testfile could not be located!" type="warn" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="paths" result="pass">
+    <!-- type="warn" message="testdata testfile could not be located!" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[testdata testfile could not be located!]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_float.junitxml b/tests/auto/testlib/selftests/expected_float.junitxml
index 51a711efb7..fa361d96d1 100644
--- a/tests/auto/testlib/selftests/expected_float.junitxml
+++ b/tests/auto/testlib/selftests/expected_float.junitxml
@@ -1,307 +1,307 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="96" tests="6" name="tst_float">
+<testsuite name="tst_float" tests="6" failures="96" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="doubleComparisons">
-    <failure tag="should FAIL 1" message="Compared doubles are not the same (fuzzy compare)
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="doubleComparisons" result="fail">
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): 3" result="fail"/>
-    <failure tag="should FAIL 2" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 3" tag="should FAIL 1"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1e&#x002D;07
-   Expected (operandRight): 3e&#x002D;07" result="fail"/>
-    <failure tag="should FAIL 3" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 3e&#x002D;07" tag="should FAIL 2"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 999999999999
-   Expected (operandRight): 999999999998" result="fail"/>
-    <failure tag="should FAIL 4" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 999999999998" tag="should FAIL 3"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1e&#x002D;12
-   Expected (operandRight): 9.99999999999e&#x002D;13" result="fail"/>
-    <failure tag="should FAIL 5" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 9.99999999999e&#x002D;13" tag="should FAIL 4"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 9.99999999999e+306
-   Expected (operandRight): 9.99999999997e+306" result="fail"/>
-    <failure tag="should FAIL: NaN != 0" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 9.99999999997e+306" tag="should FAIL 5"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != NaN" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: NaN != 0"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: NaN != 1" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: 0 != NaN"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != NaN" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: NaN != 1"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: inf != &#x002D;inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: 1 != NaN"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: inf != &#x002D;inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: inf != nan" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: &#x002D;inf != inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: nan != inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: inf != nan"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != nan" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: nan != inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: nan != &#x002D;inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: &#x002D;inf != nan"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != 0" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: nan != &#x002D;inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: inf != 0"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != 0" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: 0 != inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != &#x002D;inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: &#x002D;inf != 0"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != 1" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: 0 != &#x002D;inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: inf != 1"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != 1" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: 1 != inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != &#x002D;inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: &#x002D;inf != 1"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != max" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: 1 != &#x002D;inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 1.79769313486e+308" result="fail"/>
-    <failure tag="should FAIL: inf != &#x002D;max" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 1.79769313486e+308" tag="should FAIL: inf != max"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): &#x002D;1.79769313486e+308" result="fail"/>
-    <failure tag="should FAIL: max != inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;1.79769313486e+308" tag="should FAIL: inf != &#x002D;max"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1.79769313486e+308
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;max != inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: max != inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;1.79769313486e+308
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != max" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: &#x002D;max != inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 1.79769313486e+308" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != &#x002D;max" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): 1.79769313486e+308" tag="should FAIL: &#x002D;inf != max"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): &#x002D;1.79769313486e+308" result="fail"/>
-    <failure tag="should FAIL: max != &#x002D;inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;1.79769313486e+308" tag="should FAIL: &#x002D;inf != &#x002D;max"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : 1.79769313486e+308
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;max != &#x002D;inf" message="Compared doubles are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: max != &#x002D;inf"/>
+    <failure result="fail" message="Compared doubles are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;1.79769313486e+308
-   Expected (operandRight): &#x002D;inf" result="fail"/>
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: &#x002D;max != &#x002D;inf"/>
   </testcase>
-  <testcase result="fail" name="floatComparisons">
-    <failure tag="should FAIL 1" message="Compared floats are not the same (fuzzy compare)
+  <testcase name="floatComparisons" result="fail">
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): 3" result="fail"/>
-    <failure tag="should FAIL 2" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 3" tag="should FAIL 1"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 1e&#x002D;05
-   Expected (operandRight): 3e&#x002D;05" result="fail"/>
-    <failure tag="should FAIL 3" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 3e&#x002D;05" tag="should FAIL 2"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 99999
-   Expected (operandRight): 99998" result="fail"/>
-    <failure tag="should FAIL 4" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 99998" tag="should FAIL 3"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 1.00001e&#x002D;05
-   Expected (operandRight): 9.9999e&#x002D;06" result="fail"/>
-    <failure tag="should FAIL 5" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 9.9999e&#x002D;06" tag="should FAIL 4"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 9.9999e+37
-   Expected (operandRight): 9.9997e+37" result="fail"/>
-    <failure tag="should FAIL: NaN != 0" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 9.9997e+37" tag="should FAIL 5"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != NaN" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: NaN != 0"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: NaN != 1" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: 0 != NaN"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != NaN" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: NaN != 1"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: inf != &#x002D;inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: 1 != NaN"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: inf != &#x002D;inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: inf != nan" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: &#x002D;inf != inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: nan != inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: inf != nan"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != nan" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: nan != inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: nan != &#x002D;inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: &#x002D;inf != nan"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != 0" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: nan != &#x002D;inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: inf != 0"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != 0" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: 0 != inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != &#x002D;inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: &#x002D;inf != 0"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != 1" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: 0 != &#x002D;inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: inf != 1"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != 1" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: 1 != inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != &#x002D;inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: &#x002D;inf != 1"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != max" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: 1 != &#x002D;inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 3.40282e+38" result="fail"/>
-    <failure tag="should FAIL: inf != &#x002D;max" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 3.40282e+38" tag="should FAIL: inf != max"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): &#x002D;3.40282e+38" result="fail"/>
-    <failure tag="should FAIL: max != inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;3.40282e+38" tag="should FAIL: inf != &#x002D;max"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 3.40282e+38
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;max != inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: max != inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;3.40282e+38
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != max" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: &#x002D;max != inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 3.40282e+38" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != &#x002D;max" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): 3.40282e+38" tag="should FAIL: &#x002D;inf != max"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): &#x002D;3.40282e+38" result="fail"/>
-    <failure tag="should FAIL: max != &#x002D;inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;3.40282e+38" tag="should FAIL: &#x002D;inf != &#x002D;max"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : 3.40282e+38
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;max != &#x002D;inf" message="Compared floats are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: max != &#x002D;inf"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;3.40282e+38
-   Expected (operandRight): &#x002D;inf" result="fail"/>
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: &#x002D;max != &#x002D;inf"/>
   </testcase>
-  <testcase result="fail" name="float16Comparisons">
-    <failure tag="should FAIL 1" message="Compared qfloat16s are not the same (fuzzy compare)
+  <testcase name="float16Comparisons" result="fail">
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): 3" result="fail"/>
-    <failure tag="should FAIL 2" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 3" tag="should FAIL 1"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0.000999
-   Expected (operandRight): 0.003" result="fail"/>
-    <failure tag="should FAIL 3" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 0.003" tag="should FAIL 2"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 98
-   Expected (operandRight): 99" result="fail"/>
-    <failure tag="should FAIL 4" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 99" tag="should FAIL 3"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0.00101
-   Expected (operandRight): 0.00099" result="fail"/>
-    <failure tag="should FAIL 5" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 0.00099" tag="should FAIL 4"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 5.94e+04
-   Expected (operandRight): 5.88e+04" result="fail"/>
-    <failure tag="should FAIL: NaN != 0" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 5.88e+04" tag="should FAIL 5"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != NaN" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: NaN != 0"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: NaN != 1" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: 0 != NaN"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != NaN" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: NaN != 1"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: inf != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: 1 != NaN"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: inf != &#x002D;inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: inf != nan" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: &#x002D;inf != inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: nan != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: inf != nan"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != nan" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: nan != inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): nan" result="fail"/>
-    <failure tag="should FAIL: nan != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): nan" tag="should FAIL: &#x002D;inf != nan"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : nan
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != 0" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: nan != &#x002D;inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: inf != 0"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != 0" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: 0 != inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 0" result="fail"/>
-    <failure tag="should FAIL: 0 != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 0" tag="should FAIL: &#x002D;inf != 0"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != 1" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: 0 != &#x002D;inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: inf != 1"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != 1" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: 1 != inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 1" result="fail"/>
-    <failure tag="should FAIL: 1 != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 1" tag="should FAIL: &#x002D;inf != 1"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: inf != max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: 1 != &#x002D;inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): 6.55e+04" result="fail"/>
-    <failure tag="should FAIL: inf != &#x002D;max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 6.55e+04" tag="should FAIL: inf != max"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : inf
-   Expected (operandRight): &#x002D;6.55e+04" result="fail"/>
-    <failure tag="should FAIL: max != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;6.55e+04" tag="should FAIL: inf != &#x002D;max"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 6.55e+04
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;max != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: max != inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;6.55e+04
-   Expected (operandRight): inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): inf" tag="should FAIL: &#x002D;max != inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): 6.55e+04" result="fail"/>
-    <failure tag="should FAIL: &#x002D;inf != &#x002D;max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): 6.55e+04" tag="should FAIL: &#x002D;inf != max"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;inf
-   Expected (operandRight): &#x002D;6.55e+04" result="fail"/>
-    <failure tag="should FAIL: max != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;6.55e+04" tag="should FAIL: &#x002D;inf != &#x002D;max"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 6.55e+04
-   Expected (operandRight): &#x002D;inf" result="fail"/>
-    <failure tag="should FAIL: &#x002D;max != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: max != &#x002D;inf"/>
+    <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : &#x002D;6.55e+04
-   Expected (operandRight): &#x002D;inf" result="fail"/>
+   Expected (operandRight): &#x002D;inf" tag="should FAIL: &#x002D;max != &#x002D;inf"/>
   </testcase>
-  <testcase result="fail" name="compareFloatTests">
-    <failure tag="1e0" message="Compared floats are not the same (fuzzy compare)
+  <testcase name="compareFloatTests" result="fail">
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (t1): 1
-   Expected (t3): 3" result="fail"/>
-    <failure tag="1e&#x002D;5" message="Compared floats are not the same (fuzzy compare)
+   Expected (t3): 3" tag="1e0"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (t1): 1e&#x002D;05
-   Expected (t3): 3e&#x002D;05" result="fail"/>
-    <failure tag="1e+7" message="Compared floats are not the same (fuzzy compare)
+   Expected (t3): 3e&#x002D;05" tag="1e&#x002D;5"/>
+    <failure result="fail" message="Compared floats are not the same (fuzzy compare)
    Actual   (t1): 1e+07
-   Expected (t3): 3e+07" result="fail"/>
+   Expected (t3): 3e+07" tag="1e+7"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml
index de184c2fdd..2ce288720f 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.junitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="43" failures="0" tests="6" name="tst_globaldata">
+<testsuite name="tst_globaldata" tests="6" failures="0" errors="43">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase">
-    <!-- message="initTestCase initTestCase (null)" type="qdebug" -->
+  <testcase name="initTestCase" result="pass">
+    <!-- type="qdebug" message="initTestCase initTestCase (null)" -->
   </testcase>
-  <testcase result="pass" name="testGlobal">
-    <!-- tag="global=false:local=false" message="init testGlobal local=false" type="qdebug" -->
-    <!-- tag="global=false:local=false" message="global: false" type="qdebug" -->
-    <!-- tag="global=false:local=false" message="local: false" type="qdebug" -->
-    <!-- tag="global=false:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="init testGlobal local=true" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="global: false" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="local: true" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="init testGlobal local=false" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="global: true" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="local: false" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="init testGlobal local=true" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="global: true" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="local: true" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
+  <testcase name="testGlobal" result="pass">
+    <!-- type="qdebug" message="init testGlobal local=false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="global: false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="local: false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="init testGlobal local=true" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="global: false" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="local: true" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=true" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="init testGlobal local=false" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="global: true" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="local: false" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=false" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="init testGlobal local=true" tag="global=true:local=true" -->
+    <!-- type="qdebug" message="global: true" tag="global=true:local=true" -->
+    <!-- type="qdebug" message="local: true" tag="global=true:local=true" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=true" tag="global=true:local=true" -->
   </testcase>
   <testcase name="skip">
-    <!-- tag="global=false" message="skipping" type="skip" -->
+    <!-- type="skip" message="skipping" tag="global=false" -->
   </testcase>
   <testcase name="skipLocal">
-    <!-- tag="global=false:local=false" message="init skipLocal local=false" type="qdebug" -->
-    <!-- tag="global=false:local=false" message="skipping" type="skip" -->
-    <!-- tag="global=false:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="init skipLocal local=true" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="skipping" type="skip" -->
-    <!-- tag="global=false:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="init skipLocal local=false" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="skipping" type="skip" -->
-    <!-- tag="global=true:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="init skipLocal local=true" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="skipping" type="skip" -->
-    <!-- tag="global=true:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
+    <!-- type="qdebug" message="init skipLocal local=false" tag="global=false:local=false" -->
+    <!-- type="skip" message="skipping" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="init skipLocal local=true" tag="global=false:local=true" -->
+    <!-- type="skip" message="skipping" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=true" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="init skipLocal local=false" tag="global=true:local=false" -->
+    <!-- type="skip" message="skipping" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=false" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="init skipLocal local=true" tag="global=true:local=true" -->
+    <!-- type="skip" message="skipping" tag="global=true:local=true" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=true" tag="global=true:local=true" -->
   </testcase>
-  <testcase result="pass" name="skipSingle">
-    <!-- tag="global=false:local=false" message="init skipSingle local=false" type="qdebug" -->
-    <!-- tag="global=false:local=false" message="global: false local: false" type="qdebug" -->
-    <!-- tag="global=false:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="init skipSingle local=true" type="qdebug" -->
-    <!-- tag="global=false:local=true" message="Skipping" type="skip" -->
-    <!-- tag="global=false:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="init skipSingle local=false" type="qdebug" -->
-    <!-- tag="global=true:local=false" message="Skipping" type="skip" -->
-    <!-- tag="global=true:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="init skipSingle local=true" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="global: true local: true" type="qdebug" -->
-    <!-- tag="global=true:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
+  <testcase name="skipSingle" result="pass">
+    <!-- type="qdebug" message="init skipSingle local=false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="global: false local: false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=false" tag="global=false:local=false" -->
+    <!-- type="qdebug" message="init skipSingle local=true" tag="global=false:local=true" -->
+    <!-- type="skip" message="Skipping" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=true" tag="global=false:local=true" -->
+    <!-- type="qdebug" message="init skipSingle local=false" tag="global=true:local=false" -->
+    <!-- type="skip" message="Skipping" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=false" tag="global=true:local=false" -->
+    <!-- type="qdebug" message="init skipSingle local=true" tag="global=true:local=true" -->
+    <!-- type="qdebug" message="global: true local: true" tag="global=true:local=true" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=true" tag="global=true:local=true" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase">
-    <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
+  <testcase name="cleanupTestCase" result="pass">
+    <!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" -->
   </testcase>
   <system-err>
 <![CDATA[initTestCase initTestCase (null)]]>
diff --git a/tests/auto/testlib/selftests/expected_keyboard.junitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml
index 93b5f7bfff..66d8e80e58 100644
--- a/tests/auto/testlib/selftests/expected_keyboard.junitxml
+++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_Keyboard">
+<testsuite name="tst_Keyboard" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="keyPressAndRelease"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="keyPressAndRelease" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml
index 269c06fe08..045aebc9bb 100644
--- a/tests/auto/testlib/selftests/expected_longstring.junitxml
+++ b/tests/auto/testlib/selftests/expected_longstring.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="1" tests="3" name="tst_LongString">
+<testsuite name="tst_LongString" tests="3" failures="1" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="failWithLongString">
-    <failure message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="failWithLongString" result="fail">
+    <failure result="fail" message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
 
 Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.
 
@@ -15,8 +15,8 @@ Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, impe
 
 Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis.
 
-Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas." result="fail"/>
+Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas."/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
index 329fae5f1d..cec2c459fa 100644
--- a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
@@ -1,2016 +1,2016 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="2002" failures="0" tests="3" name="MaxWarnings">
+<testsuite name="MaxWarnings" tests="3" failures="0" errors="2002">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="warn">
-    <!-- message="0" type="qwarn" -->
-    <!-- message="1" type="qwarn" -->
-    <!-- message="2" type="qwarn" -->
-    <!-- message="3" type="qwarn" -->
-    <!-- message="4" type="qwarn" -->
-    <!-- message="5" type="qwarn" -->
-    <!-- message="6" type="qwarn" -->
-    <!-- message="7" type="qwarn" -->
-    <!-- message="8" type="qwarn" -->
-    <!-- message="9" type="qwarn" -->
-    <!-- message="10" type="qwarn" -->
-    <!-- message="11" type="qwarn" -->
-    <!-- message="12" type="qwarn" -->
-    <!-- message="13" type="qwarn" -->
-    <!-- message="14" type="qwarn" -->
-    <!-- message="15" type="qwarn" -->
-    <!-- message="16" type="qwarn" -->
-    <!-- message="17" type="qwarn" -->
-    <!-- message="18" type="qwarn" -->
-    <!-- message="19" type="qwarn" -->
-    <!-- message="20" type="qwarn" -->
-    <!-- message="21" type="qwarn" -->
-    <!-- message="22" type="qwarn" -->
-    <!-- message="23" type="qwarn" -->
-    <!-- message="24" type="qwarn" -->
-    <!-- message="25" type="qwarn" -->
-    <!-- message="26" type="qwarn" -->
-    <!-- message="27" type="qwarn" -->
-    <!-- message="28" type="qwarn" -->
-    <!-- message="29" type="qwarn" -->
-    <!-- message="30" type="qwarn" -->
-    <!-- message="31" type="qwarn" -->
-    <!-- message="32" type="qwarn" -->
-    <!-- message="33" type="qwarn" -->
-    <!-- message="34" type="qwarn" -->
-    <!-- message="35" type="qwarn" -->
-    <!-- message="36" type="qwarn" -->
-    <!-- message="37" type="qwarn" -->
-    <!-- message="38" type="qwarn" -->
-    <!-- message="39" type="qwarn" -->
-    <!-- message="40" type="qwarn" -->
-    <!-- message="41" type="qwarn" -->
-    <!-- message="42" type="qwarn" -->
-    <!-- message="43" type="qwarn" -->
-    <!-- message="44" type="qwarn" -->
-    <!-- message="45" type="qwarn" -->
-    <!-- message="46" type="qwarn" -->
-    <!-- message="47" type="qwarn" -->
-    <!-- message="48" type="qwarn" -->
-    <!-- message="49" type="qwarn" -->
-    <!-- message="50" type="qwarn" -->
-    <!-- message="51" type="qwarn" -->
-    <!-- message="52" type="qwarn" -->
-    <!-- message="53" type="qwarn" -->
-    <!-- message="54" type="qwarn" -->
-    <!-- message="55" type="qwarn" -->
-    <!-- message="56" type="qwarn" -->
-    <!-- message="57" type="qwarn" -->
-    <!-- message="58" type="qwarn" -->
-    <!-- message="59" type="qwarn" -->
-    <!-- message="60" type="qwarn" -->
-    <!-- message="61" type="qwarn" -->
-    <!-- message="62" type="qwarn" -->
-    <!-- message="63" type="qwarn" -->
-    <!-- message="64" type="qwarn" -->
-    <!-- message="65" type="qwarn" -->
-    <!-- message="66" type="qwarn" -->
-    <!-- message="67" type="qwarn" -->
-    <!-- message="68" type="qwarn" -->
-    <!-- message="69" type="qwarn" -->
-    <!-- message="70" type="qwarn" -->
-    <!-- message="71" type="qwarn" -->
-    <!-- message="72" type="qwarn" -->
-    <!-- message="73" type="qwarn" -->
-    <!-- message="74" type="qwarn" -->
-    <!-- message="75" type="qwarn" -->
-    <!-- message="76" type="qwarn" -->
-    <!-- message="77" type="qwarn" -->
-    <!-- message="78" type="qwarn" -->
-    <!-- message="79" type="qwarn" -->
-    <!-- message="80" type="qwarn" -->
-    <!-- message="81" type="qwarn" -->
-    <!-- message="82" type="qwarn" -->
-    <!-- message="83" type="qwarn" -->
-    <!-- message="84" type="qwarn" -->
-    <!-- message="85" type="qwarn" -->
-    <!-- message="86" type="qwarn" -->
-    <!-- message="87" type="qwarn" -->
-    <!-- message="88" type="qwarn" -->
-    <!-- message="89" type="qwarn" -->
-    <!-- message="90" type="qwarn" -->
-    <!-- message="91" type="qwarn" -->
-    <!-- message="92" type="qwarn" -->
-    <!-- message="93" type="qwarn" -->
-    <!-- message="94" type="qwarn" -->
-    <!-- message="95" type="qwarn" -->
-    <!-- message="96" type="qwarn" -->
-    <!-- message="97" type="qwarn" -->
-    <!-- message="98" type="qwarn" -->
-    <!-- message="99" type="qwarn" -->
-    <!-- message="100" type="qwarn" -->
-    <!-- message="101" type="qwarn" -->
-    <!-- message="102" type="qwarn" -->
-    <!-- message="103" type="qwarn" -->
-    <!-- message="104" type="qwarn" -->
-    <!-- message="105" type="qwarn" -->
-    <!-- message="106" type="qwarn" -->
-    <!-- message="107" type="qwarn" -->
-    <!-- message="108" type="qwarn" -->
-    <!-- message="109" type="qwarn" -->
-    <!-- message="110" type="qwarn" -->
-    <!-- message="111" type="qwarn" -->
-    <!-- message="112" type="qwarn" -->
-    <!-- message="113" type="qwarn" -->
-    <!-- message="114" type="qwarn" -->
-    <!-- message="115" type="qwarn" -->
-    <!-- message="116" type="qwarn" -->
-    <!-- message="117" type="qwarn" -->
-    <!-- message="118" type="qwarn" -->
-    <!-- message="119" type="qwarn" -->
-    <!-- message="120" type="qwarn" -->
-    <!-- message="121" type="qwarn" -->
-    <!-- message="122" type="qwarn" -->
-    <!-- message="123" type="qwarn" -->
-    <!-- message="124" type="qwarn" -->
-    <!-- message="125" type="qwarn" -->
-    <!-- message="126" type="qwarn" -->
-    <!-- message="127" type="qwarn" -->
-    <!-- message="128" type="qwarn" -->
-    <!-- message="129" type="qwarn" -->
-    <!-- message="130" type="qwarn" -->
-    <!-- message="131" type="qwarn" -->
-    <!-- message="132" type="qwarn" -->
-    <!-- message="133" type="qwarn" -->
-    <!-- message="134" type="qwarn" -->
-    <!-- message="135" type="qwarn" -->
-    <!-- message="136" type="qwarn" -->
-    <!-- message="137" type="qwarn" -->
-    <!-- message="138" type="qwarn" -->
-    <!-- message="139" type="qwarn" -->
-    <!-- message="140" type="qwarn" -->
-    <!-- message="141" type="qwarn" -->
-    <!-- message="142" type="qwarn" -->
-    <!-- message="143" type="qwarn" -->
-    <!-- message="144" type="qwarn" -->
-    <!-- message="145" type="qwarn" -->
-    <!-- message="146" type="qwarn" -->
-    <!-- message="147" type="qwarn" -->
-    <!-- message="148" type="qwarn" -->
-    <!-- message="149" type="qwarn" -->
-    <!-- message="150" type="qwarn" -->
-    <!-- message="151" type="qwarn" -->
-    <!-- message="152" type="qwarn" -->
-    <!-- message="153" type="qwarn" -->
-    <!-- message="154" type="qwarn" -->
-    <!-- message="155" type="qwarn" -->
-    <!-- message="156" type="qwarn" -->
-    <!-- message="157" type="qwarn" -->
-    <!-- message="158" type="qwarn" -->
-    <!-- message="159" type="qwarn" -->
-    <!-- message="160" type="qwarn" -->
-    <!-- message="161" type="qwarn" -->
-    <!-- message="162" type="qwarn" -->
-    <!-- message="163" type="qwarn" -->
-    <!-- message="164" type="qwarn" -->
-    <!-- message="165" type="qwarn" -->
-    <!-- message="166" type="qwarn" -->
-    <!-- message="167" type="qwarn" -->
-    <!-- message="168" type="qwarn" -->
-    <!-- message="169" type="qwarn" -->
-    <!-- message="170" type="qwarn" -->
-    <!-- message="171" type="qwarn" -->
-    <!-- message="172" type="qwarn" -->
-    <!-- message="173" type="qwarn" -->
-    <!-- message="174" type="qwarn" -->
-    <!-- message="175" type="qwarn" -->
-    <!-- message="176" type="qwarn" -->
-    <!-- message="177" type="qwarn" -->
-    <!-- message="178" type="qwarn" -->
-    <!-- message="179" type="qwarn" -->
-    <!-- message="180" type="qwarn" -->
-    <!-- message="181" type="qwarn" -->
-    <!-- message="182" type="qwarn" -->
-    <!-- message="183" type="qwarn" -->
-    <!-- message="184" type="qwarn" -->
-    <!-- message="185" type="qwarn" -->
-    <!-- message="186" type="qwarn" -->
-    <!-- message="187" type="qwarn" -->
-    <!-- message="188" type="qwarn" -->
-    <!-- message="189" type="qwarn" -->
-    <!-- message="190" type="qwarn" -->
-    <!-- message="191" type="qwarn" -->
-    <!-- message="192" type="qwarn" -->
-    <!-- message="193" type="qwarn" -->
-    <!-- message="194" type="qwarn" -->
-    <!-- message="195" type="qwarn" -->
-    <!-- message="196" type="qwarn" -->
-    <!-- message="197" type="qwarn" -->
-    <!-- message="198" type="qwarn" -->
-    <!-- message="199" type="qwarn" -->
-    <!-- message="200" type="qwarn" -->
-    <!-- message="201" type="qwarn" -->
-    <!-- message="202" type="qwarn" -->
-    <!-- message="203" type="qwarn" -->
-    <!-- message="204" type="qwarn" -->
-    <!-- message="205" type="qwarn" -->
-    <!-- message="206" type="qwarn" -->
-    <!-- message="207" type="qwarn" -->
-    <!-- message="208" type="qwarn" -->
-    <!-- message="209" type="qwarn" -->
-    <!-- message="210" type="qwarn" -->
-    <!-- message="211" type="qwarn" -->
-    <!-- message="212" type="qwarn" -->
-    <!-- message="213" type="qwarn" -->
-    <!-- message="214" type="qwarn" -->
-    <!-- message="215" type="qwarn" -->
-    <!-- message="216" type="qwarn" -->
-    <!-- message="217" type="qwarn" -->
-    <!-- message="218" type="qwarn" -->
-    <!-- message="219" type="qwarn" -->
-    <!-- message="220" type="qwarn" -->
-    <!-- message="221" type="qwarn" -->
-    <!-- message="222" type="qwarn" -->
-    <!-- message="223" type="qwarn" -->
-    <!-- message="224" type="qwarn" -->
-    <!-- message="225" type="qwarn" -->
-    <!-- message="226" type="qwarn" -->
-    <!-- message="227" type="qwarn" -->
-    <!-- message="228" type="qwarn" -->
-    <!-- message="229" type="qwarn" -->
-    <!-- message="230" type="qwarn" -->
-    <!-- message="231" type="qwarn" -->
-    <!-- message="232" type="qwarn" -->
-    <!-- message="233" type="qwarn" -->
-    <!-- message="234" type="qwarn" -->
-    <!-- message="235" type="qwarn" -->
-    <!-- message="236" type="qwarn" -->
-    <!-- message="237" type="qwarn" -->
-    <!-- message="238" type="qwarn" -->
-    <!-- message="239" type="qwarn" -->
-    <!-- message="240" type="qwarn" -->
-    <!-- message="241" type="qwarn" -->
-    <!-- message="242" type="qwarn" -->
-    <!-- message="243" type="qwarn" -->
-    <!-- message="244" type="qwarn" -->
-    <!-- message="245" type="qwarn" -->
-    <!-- message="246" type="qwarn" -->
-    <!-- message="247" type="qwarn" -->
-    <!-- message="248" type="qwarn" -->
-    <!-- message="249" type="qwarn" -->
-    <!-- message="250" type="qwarn" -->
-    <!-- message="251" type="qwarn" -->
-    <!-- message="252" type="qwarn" -->
-    <!-- message="253" type="qwarn" -->
-    <!-- message="254" type="qwarn" -->
-    <!-- message="255" type="qwarn" -->
-    <!-- message="256" type="qwarn" -->
-    <!-- message="257" type="qwarn" -->
-    <!-- message="258" type="qwarn" -->
-    <!-- message="259" type="qwarn" -->
-    <!-- message="260" type="qwarn" -->
-    <!-- message="261" type="qwarn" -->
-    <!-- message="262" type="qwarn" -->
-    <!-- message="263" type="qwarn" -->
-    <!-- message="264" type="qwarn" -->
-    <!-- message="265" type="qwarn" -->
-    <!-- message="266" type="qwarn" -->
-    <!-- message="267" type="qwarn" -->
-    <!-- message="268" type="qwarn" -->
-    <!-- message="269" type="qwarn" -->
-    <!-- message="270" type="qwarn" -->
-    <!-- message="271" type="qwarn" -->
-    <!-- message="272" type="qwarn" -->
-    <!-- message="273" type="qwarn" -->
-    <!-- message="274" type="qwarn" -->
-    <!-- message="275" type="qwarn" -->
-    <!-- message="276" type="qwarn" -->
-    <!-- message="277" type="qwarn" -->
-    <!-- message="278" type="qwarn" -->
-    <!-- message="279" type="qwarn" -->
-    <!-- message="280" type="qwarn" -->
-    <!-- message="281" type="qwarn" -->
-    <!-- message="282" type="qwarn" -->
-    <!-- message="283" type="qwarn" -->
-    <!-- message="284" type="qwarn" -->
-    <!-- message="285" type="qwarn" -->
-    <!-- message="286" type="qwarn" -->
-    <!-- message="287" type="qwarn" -->
-    <!-- message="288" type="qwarn" -->
-    <!-- message="289" type="qwarn" -->
-    <!-- message="290" type="qwarn" -->
-    <!-- message="291" type="qwarn" -->
-    <!-- message="292" type="qwarn" -->
-    <!-- message="293" type="qwarn" -->
-    <!-- message="294" type="qwarn" -->
-    <!-- message="295" type="qwarn" -->
-    <!-- message="296" type="qwarn" -->
-    <!-- message="297" type="qwarn" -->
-    <!-- message="298" type="qwarn" -->
-    <!-- message="299" type="qwarn" -->
-    <!-- message="300" type="qwarn" -->
-    <!-- message="301" type="qwarn" -->
-    <!-- message="302" type="qwarn" -->
-    <!-- message="303" type="qwarn" -->
-    <!-- message="304" type="qwarn" -->
-    <!-- message="305" type="qwarn" -->
-    <!-- message="306" type="qwarn" -->
-    <!-- message="307" type="qwarn" -->
-    <!-- message="308" type="qwarn" -->
-    <!-- message="309" type="qwarn" -->
-    <!-- message="310" type="qwarn" -->
-    <!-- message="311" type="qwarn" -->
-    <!-- message="312" type="qwarn" -->
-    <!-- message="313" type="qwarn" -->
-    <!-- message="314" type="qwarn" -->
-    <!-- message="315" type="qwarn" -->
-    <!-- message="316" type="qwarn" -->
-    <!-- message="317" type="qwarn" -->
-    <!-- message="318" type="qwarn" -->
-    <!-- message="319" type="qwarn" -->
-    <!-- message="320" type="qwarn" -->
-    <!-- message="321" type="qwarn" -->
-    <!-- message="322" type="qwarn" -->
-    <!-- message="323" type="qwarn" -->
-    <!-- message="324" type="qwarn" -->
-    <!-- message="325" type="qwarn" -->
-    <!-- message="326" type="qwarn" -->
-    <!-- message="327" type="qwarn" -->
-    <!-- message="328" type="qwarn" -->
-    <!-- message="329" type="qwarn" -->
-    <!-- message="330" type="qwarn" -->
-    <!-- message="331" type="qwarn" -->
-    <!-- message="332" type="qwarn" -->
-    <!-- message="333" type="qwarn" -->
-    <!-- message="334" type="qwarn" -->
-    <!-- message="335" type="qwarn" -->
-    <!-- message="336" type="qwarn" -->
-    <!-- message="337" type="qwarn" -->
-    <!-- message="338" type="qwarn" -->
-    <!-- message="339" type="qwarn" -->
-    <!-- message="340" type="qwarn" -->
-    <!-- message="341" type="qwarn" -->
-    <!-- message="342" type="qwarn" -->
-    <!-- message="343" type="qwarn" -->
-    <!-- message="344" type="qwarn" -->
-    <!-- message="345" type="qwarn" -->
-    <!-- message="346" type="qwarn" -->
-    <!-- message="347" type="qwarn" -->
-    <!-- message="348" type="qwarn" -->
-    <!-- message="349" type="qwarn" -->
-    <!-- message="350" type="qwarn" -->
-    <!-- message="351" type="qwarn" -->
-    <!-- message="352" type="qwarn" -->
-    <!-- message="353" type="qwarn" -->
-    <!-- message="354" type="qwarn" -->
-    <!-- message="355" type="qwarn" -->
-    <!-- message="356" type="qwarn" -->
-    <!-- message="357" type="qwarn" -->
-    <!-- message="358" type="qwarn" -->
-    <!-- message="359" type="qwarn" -->
-    <!-- message="360" type="qwarn" -->
-    <!-- message="361" type="qwarn" -->
-    <!-- message="362" type="qwarn" -->
-    <!-- message="363" type="qwarn" -->
-    <!-- message="364" type="qwarn" -->
-    <!-- message="365" type="qwarn" -->
-    <!-- message="366" type="qwarn" -->
-    <!-- message="367" type="qwarn" -->
-    <!-- message="368" type="qwarn" -->
-    <!-- message="369" type="qwarn" -->
-    <!-- message="370" type="qwarn" -->
-    <!-- message="371" type="qwarn" -->
-    <!-- message="372" type="qwarn" -->
-    <!-- message="373" type="qwarn" -->
-    <!-- message="374" type="qwarn" -->
-    <!-- message="375" type="qwarn" -->
-    <!-- message="376" type="qwarn" -->
-    <!-- message="377" type="qwarn" -->
-    <!-- message="378" type="qwarn" -->
-    <!-- message="379" type="qwarn" -->
-    <!-- message="380" type="qwarn" -->
-    <!-- message="381" type="qwarn" -->
-    <!-- message="382" type="qwarn" -->
-    <!-- message="383" type="qwarn" -->
-    <!-- message="384" type="qwarn" -->
-    <!-- message="385" type="qwarn" -->
-    <!-- message="386" type="qwarn" -->
-    <!-- message="387" type="qwarn" -->
-    <!-- message="388" type="qwarn" -->
-    <!-- message="389" type="qwarn" -->
-    <!-- message="390" type="qwarn" -->
-    <!-- message="391" type="qwarn" -->
-    <!-- message="392" type="qwarn" -->
-    <!-- message="393" type="qwarn" -->
-    <!-- message="394" type="qwarn" -->
-    <!-- message="395" type="qwarn" -->
-    <!-- message="396" type="qwarn" -->
-    <!-- message="397" type="qwarn" -->
-    <!-- message="398" type="qwarn" -->
-    <!-- message="399" type="qwarn" -->
-    <!-- message="400" type="qwarn" -->
-    <!-- message="401" type="qwarn" -->
-    <!-- message="402" type="qwarn" -->
-    <!-- message="403" type="qwarn" -->
-    <!-- message="404" type="qwarn" -->
-    <!-- message="405" type="qwarn" -->
-    <!-- message="406" type="qwarn" -->
-    <!-- message="407" type="qwarn" -->
-    <!-- message="408" type="qwarn" -->
-    <!-- message="409" type="qwarn" -->
-    <!-- message="410" type="qwarn" -->
-    <!-- message="411" type="qwarn" -->
-    <!-- message="412" type="qwarn" -->
-    <!-- message="413" type="qwarn" -->
-    <!-- message="414" type="qwarn" -->
-    <!-- message="415" type="qwarn" -->
-    <!-- message="416" type="qwarn" -->
-    <!-- message="417" type="qwarn" -->
-    <!-- message="418" type="qwarn" -->
-    <!-- message="419" type="qwarn" -->
-    <!-- message="420" type="qwarn" -->
-    <!-- message="421" type="qwarn" -->
-    <!-- message="422" type="qwarn" -->
-    <!-- message="423" type="qwarn" -->
-    <!-- message="424" type="qwarn" -->
-    <!-- message="425" type="qwarn" -->
-    <!-- message="426" type="qwarn" -->
-    <!-- message="427" type="qwarn" -->
-    <!-- message="428" type="qwarn" -->
-    <!-- message="429" type="qwarn" -->
-    <!-- message="430" type="qwarn" -->
-    <!-- message="431" type="qwarn" -->
-    <!-- message="432" type="qwarn" -->
-    <!-- message="433" type="qwarn" -->
-    <!-- message="434" type="qwarn" -->
-    <!-- message="435" type="qwarn" -->
-    <!-- message="436" type="qwarn" -->
-    <!-- message="437" type="qwarn" -->
-    <!-- message="438" type="qwarn" -->
-    <!-- message="439" type="qwarn" -->
-    <!-- message="440" type="qwarn" -->
-    <!-- message="441" type="qwarn" -->
-    <!-- message="442" type="qwarn" -->
-    <!-- message="443" type="qwarn" -->
-    <!-- message="444" type="qwarn" -->
-    <!-- message="445" type="qwarn" -->
-    <!-- message="446" type="qwarn" -->
-    <!-- message="447" type="qwarn" -->
-    <!-- message="448" type="qwarn" -->
-    <!-- message="449" type="qwarn" -->
-    <!-- message="450" type="qwarn" -->
-    <!-- message="451" type="qwarn" -->
-    <!-- message="452" type="qwarn" -->
-    <!-- message="453" type="qwarn" -->
-    <!-- message="454" type="qwarn" -->
-    <!-- message="455" type="qwarn" -->
-    <!-- message="456" type="qwarn" -->
-    <!-- message="457" type="qwarn" -->
-    <!-- message="458" type="qwarn" -->
-    <!-- message="459" type="qwarn" -->
-    <!-- message="460" type="qwarn" -->
-    <!-- message="461" type="qwarn" -->
-    <!-- message="462" type="qwarn" -->
-    <!-- message="463" type="qwarn" -->
-    <!-- message="464" type="qwarn" -->
-    <!-- message="465" type="qwarn" -->
-    <!-- message="466" type="qwarn" -->
-    <!-- message="467" type="qwarn" -->
-    <!-- message="468" type="qwarn" -->
-    <!-- message="469" type="qwarn" -->
-    <!-- message="470" type="qwarn" -->
-    <!-- message="471" type="qwarn" -->
-    <!-- message="472" type="qwarn" -->
-    <!-- message="473" type="qwarn" -->
-    <!-- message="474" type="qwarn" -->
-    <!-- message="475" type="qwarn" -->
-    <!-- message="476" type="qwarn" -->
-    <!-- message="477" type="qwarn" -->
-    <!-- message="478" type="qwarn" -->
-    <!-- message="479" type="qwarn" -->
-    <!-- message="480" type="qwarn" -->
-    <!-- message="481" type="qwarn" -->
-    <!-- message="482" type="qwarn" -->
-    <!-- message="483" type="qwarn" -->
-    <!-- message="484" type="qwarn" -->
-    <!-- message="485" type="qwarn" -->
-    <!-- message="486" type="qwarn" -->
-    <!-- message="487" type="qwarn" -->
-    <!-- message="488" type="qwarn" -->
-    <!-- message="489" type="qwarn" -->
-    <!-- message="490" type="qwarn" -->
-    <!-- message="491" type="qwarn" -->
-    <!-- message="492" type="qwarn" -->
-    <!-- message="493" type="qwarn" -->
-    <!-- message="494" type="qwarn" -->
-    <!-- message="495" type="qwarn" -->
-    <!-- message="496" type="qwarn" -->
-    <!-- message="497" type="qwarn" -->
-    <!-- message="498" type="qwarn" -->
-    <!-- message="499" type="qwarn" -->
-    <!-- message="500" type="qwarn" -->
-    <!-- message="501" type="qwarn" -->
-    <!-- message="502" type="qwarn" -->
-    <!-- message="503" type="qwarn" -->
-    <!-- message="504" type="qwarn" -->
-    <!-- message="505" type="qwarn" -->
-    <!-- message="506" type="qwarn" -->
-    <!-- message="507" type="qwarn" -->
-    <!-- message="508" type="qwarn" -->
-    <!-- message="509" type="qwarn" -->
-    <!-- message="510" type="qwarn" -->
-    <!-- message="511" type="qwarn" -->
-    <!-- message="512" type="qwarn" -->
-    <!-- message="513" type="qwarn" -->
-    <!-- message="514" type="qwarn" -->
-    <!-- message="515" type="qwarn" -->
-    <!-- message="516" type="qwarn" -->
-    <!-- message="517" type="qwarn" -->
-    <!-- message="518" type="qwarn" -->
-    <!-- message="519" type="qwarn" -->
-    <!-- message="520" type="qwarn" -->
-    <!-- message="521" type="qwarn" -->
-    <!-- message="522" type="qwarn" -->
-    <!-- message="523" type="qwarn" -->
-    <!-- message="524" type="qwarn" -->
-    <!-- message="525" type="qwarn" -->
-    <!-- message="526" type="qwarn" -->
-    <!-- message="527" type="qwarn" -->
-    <!-- message="528" type="qwarn" -->
-    <!-- message="529" type="qwarn" -->
-    <!-- message="530" type="qwarn" -->
-    <!-- message="531" type="qwarn" -->
-    <!-- message="532" type="qwarn" -->
-    <!-- message="533" type="qwarn" -->
-    <!-- message="534" type="qwarn" -->
-    <!-- message="535" type="qwarn" -->
-    <!-- message="536" type="qwarn" -->
-    <!-- message="537" type="qwarn" -->
-    <!-- message="538" type="qwarn" -->
-    <!-- message="539" type="qwarn" -->
-    <!-- message="540" type="qwarn" -->
-    <!-- message="541" type="qwarn" -->
-    <!-- message="542" type="qwarn" -->
-    <!-- message="543" type="qwarn" -->
-    <!-- message="544" type="qwarn" -->
-    <!-- message="545" type="qwarn" -->
-    <!-- message="546" type="qwarn" -->
-    <!-- message="547" type="qwarn" -->
-    <!-- message="548" type="qwarn" -->
-    <!-- message="549" type="qwarn" -->
-    <!-- message="550" type="qwarn" -->
-    <!-- message="551" type="qwarn" -->
-    <!-- message="552" type="qwarn" -->
-    <!-- message="553" type="qwarn" -->
-    <!-- message="554" type="qwarn" -->
-    <!-- message="555" type="qwarn" -->
-    <!-- message="556" type="qwarn" -->
-    <!-- message="557" type="qwarn" -->
-    <!-- message="558" type="qwarn" -->
-    <!-- message="559" type="qwarn" -->
-    <!-- message="560" type="qwarn" -->
-    <!-- message="561" type="qwarn" -->
-    <!-- message="562" type="qwarn" -->
-    <!-- message="563" type="qwarn" -->
-    <!-- message="564" type="qwarn" -->
-    <!-- message="565" type="qwarn" -->
-    <!-- message="566" type="qwarn" -->
-    <!-- message="567" type="qwarn" -->
-    <!-- message="568" type="qwarn" -->
-    <!-- message="569" type="qwarn" -->
-    <!-- message="570" type="qwarn" -->
-    <!-- message="571" type="qwarn" -->
-    <!-- message="572" type="qwarn" -->
-    <!-- message="573" type="qwarn" -->
-    <!-- message="574" type="qwarn" -->
-    <!-- message="575" type="qwarn" -->
-    <!-- message="576" type="qwarn" -->
-    <!-- message="577" type="qwarn" -->
-    <!-- message="578" type="qwarn" -->
-    <!-- message="579" type="qwarn" -->
-    <!-- message="580" type="qwarn" -->
-    <!-- message="581" type="qwarn" -->
-    <!-- message="582" type="qwarn" -->
-    <!-- message="583" type="qwarn" -->
-    <!-- message="584" type="qwarn" -->
-    <!-- message="585" type="qwarn" -->
-    <!-- message="586" type="qwarn" -->
-    <!-- message="587" type="qwarn" -->
-    <!-- message="588" type="qwarn" -->
-    <!-- message="589" type="qwarn" -->
-    <!-- message="590" type="qwarn" -->
-    <!-- message="591" type="qwarn" -->
-    <!-- message="592" type="qwarn" -->
-    <!-- message="593" type="qwarn" -->
-    <!-- message="594" type="qwarn" -->
-    <!-- message="595" type="qwarn" -->
-    <!-- message="596" type="qwarn" -->
-    <!-- message="597" type="qwarn" -->
-    <!-- message="598" type="qwarn" -->
-    <!-- message="599" type="qwarn" -->
-    <!-- message="600" type="qwarn" -->
-    <!-- message="601" type="qwarn" -->
-    <!-- message="602" type="qwarn" -->
-    <!-- message="603" type="qwarn" -->
-    <!-- message="604" type="qwarn" -->
-    <!-- message="605" type="qwarn" -->
-    <!-- message="606" type="qwarn" -->
-    <!-- message="607" type="qwarn" -->
-    <!-- message="608" type="qwarn" -->
-    <!-- message="609" type="qwarn" -->
-    <!-- message="610" type="qwarn" -->
-    <!-- message="611" type="qwarn" -->
-    <!-- message="612" type="qwarn" -->
-    <!-- message="613" type="qwarn" -->
-    <!-- message="614" type="qwarn" -->
-    <!-- message="615" type="qwarn" -->
-    <!-- message="616" type="qwarn" -->
-    <!-- message="617" type="qwarn" -->
-    <!-- message="618" type="qwarn" -->
-    <!-- message="619" type="qwarn" -->
-    <!-- message="620" type="qwarn" -->
-    <!-- message="621" type="qwarn" -->
-    <!-- message="622" type="qwarn" -->
-    <!-- message="623" type="qwarn" -->
-    <!-- message="624" type="qwarn" -->
-    <!-- message="625" type="qwarn" -->
-    <!-- message="626" type="qwarn" -->
-    <!-- message="627" type="qwarn" -->
-    <!-- message="628" type="qwarn" -->
-    <!-- message="629" type="qwarn" -->
-    <!-- message="630" type="qwarn" -->
-    <!-- message="631" type="qwarn" -->
-    <!-- message="632" type="qwarn" -->
-    <!-- message="633" type="qwarn" -->
-    <!-- message="634" type="qwarn" -->
-    <!-- message="635" type="qwarn" -->
-    <!-- message="636" type="qwarn" -->
-    <!-- message="637" type="qwarn" -->
-    <!-- message="638" type="qwarn" -->
-    <!-- message="639" type="qwarn" -->
-    <!-- message="640" type="qwarn" -->
-    <!-- message="641" type="qwarn" -->
-    <!-- message="642" type="qwarn" -->
-    <!-- message="643" type="qwarn" -->
-    <!-- message="644" type="qwarn" -->
-    <!-- message="645" type="qwarn" -->
-    <!-- message="646" type="qwarn" -->
-    <!-- message="647" type="qwarn" -->
-    <!-- message="648" type="qwarn" -->
-    <!-- message="649" type="qwarn" -->
-    <!-- message="650" type="qwarn" -->
-    <!-- message="651" type="qwarn" -->
-    <!-- message="652" type="qwarn" -->
-    <!-- message="653" type="qwarn" -->
-    <!-- message="654" type="qwarn" -->
-    <!-- message="655" type="qwarn" -->
-    <!-- message="656" type="qwarn" -->
-    <!-- message="657" type="qwarn" -->
-    <!-- message="658" type="qwarn" -->
-    <!-- message="659" type="qwarn" -->
-    <!-- message="660" type="qwarn" -->
-    <!-- message="661" type="qwarn" -->
-    <!-- message="662" type="qwarn" -->
-    <!-- message="663" type="qwarn" -->
-    <!-- message="664" type="qwarn" -->
-    <!-- message="665" type="qwarn" -->
-    <!-- message="666" type="qwarn" -->
-    <!-- message="667" type="qwarn" -->
-    <!-- message="668" type="qwarn" -->
-    <!-- message="669" type="qwarn" -->
-    <!-- message="670" type="qwarn" -->
-    <!-- message="671" type="qwarn" -->
-    <!-- message="672" type="qwarn" -->
-    <!-- message="673" type="qwarn" -->
-    <!-- message="674" type="qwarn" -->
-    <!-- message="675" type="qwarn" -->
-    <!-- message="676" type="qwarn" -->
-    <!-- message="677" type="qwarn" -->
-    <!-- message="678" type="qwarn" -->
-    <!-- message="679" type="qwarn" -->
-    <!-- message="680" type="qwarn" -->
-    <!-- message="681" type="qwarn" -->
-    <!-- message="682" type="qwarn" -->
-    <!-- message="683" type="qwarn" -->
-    <!-- message="684" type="qwarn" -->
-    <!-- message="685" type="qwarn" -->
-    <!-- message="686" type="qwarn" -->
-    <!-- message="687" type="qwarn" -->
-    <!-- message="688" type="qwarn" -->
-    <!-- message="689" type="qwarn" -->
-    <!-- message="690" type="qwarn" -->
-    <!-- message="691" type="qwarn" -->
-    <!-- message="692" type="qwarn" -->
-    <!-- message="693" type="qwarn" -->
-    <!-- message="694" type="qwarn" -->
-    <!-- message="695" type="qwarn" -->
-    <!-- message="696" type="qwarn" -->
-    <!-- message="697" type="qwarn" -->
-    <!-- message="698" type="qwarn" -->
-    <!-- message="699" type="qwarn" -->
-    <!-- message="700" type="qwarn" -->
-    <!-- message="701" type="qwarn" -->
-    <!-- message="702" type="qwarn" -->
-    <!-- message="703" type="qwarn" -->
-    <!-- message="704" type="qwarn" -->
-    <!-- message="705" type="qwarn" -->
-    <!-- message="706" type="qwarn" -->
-    <!-- message="707" type="qwarn" -->
-    <!-- message="708" type="qwarn" -->
-    <!-- message="709" type="qwarn" -->
-    <!-- message="710" type="qwarn" -->
-    <!-- message="711" type="qwarn" -->
-    <!-- message="712" type="qwarn" -->
-    <!-- message="713" type="qwarn" -->
-    <!-- message="714" type="qwarn" -->
-    <!-- message="715" type="qwarn" -->
-    <!-- message="716" type="qwarn" -->
-    <!-- message="717" type="qwarn" -->
-    <!-- message="718" type="qwarn" -->
-    <!-- message="719" type="qwarn" -->
-    <!-- message="720" type="qwarn" -->
-    <!-- message="721" type="qwarn" -->
-    <!-- message="722" type="qwarn" -->
-    <!-- message="723" type="qwarn" -->
-    <!-- message="724" type="qwarn" -->
-    <!-- message="725" type="qwarn" -->
-    <!-- message="726" type="qwarn" -->
-    <!-- message="727" type="qwarn" -->
-    <!-- message="728" type="qwarn" -->
-    <!-- message="729" type="qwarn" -->
-    <!-- message="730" type="qwarn" -->
-    <!-- message="731" type="qwarn" -->
-    <!-- message="732" type="qwarn" -->
-    <!-- message="733" type="qwarn" -->
-    <!-- message="734" type="qwarn" -->
-    <!-- message="735" type="qwarn" -->
-    <!-- message="736" type="qwarn" -->
-    <!-- message="737" type="qwarn" -->
-    <!-- message="738" type="qwarn" -->
-    <!-- message="739" type="qwarn" -->
-    <!-- message="740" type="qwarn" -->
-    <!-- message="741" type="qwarn" -->
-    <!-- message="742" type="qwarn" -->
-    <!-- message="743" type="qwarn" -->
-    <!-- message="744" type="qwarn" -->
-    <!-- message="745" type="qwarn" -->
-    <!-- message="746" type="qwarn" -->
-    <!-- message="747" type="qwarn" -->
-    <!-- message="748" type="qwarn" -->
-    <!-- message="749" type="qwarn" -->
-    <!-- message="750" type="qwarn" -->
-    <!-- message="751" type="qwarn" -->
-    <!-- message="752" type="qwarn" -->
-    <!-- message="753" type="qwarn" -->
-    <!-- message="754" type="qwarn" -->
-    <!-- message="755" type="qwarn" -->
-    <!-- message="756" type="qwarn" -->
-    <!-- message="757" type="qwarn" -->
-    <!-- message="758" type="qwarn" -->
-    <!-- message="759" type="qwarn" -->
-    <!-- message="760" type="qwarn" -->
-    <!-- message="761" type="qwarn" -->
-    <!-- message="762" type="qwarn" -->
-    <!-- message="763" type="qwarn" -->
-    <!-- message="764" type="qwarn" -->
-    <!-- message="765" type="qwarn" -->
-    <!-- message="766" type="qwarn" -->
-    <!-- message="767" type="qwarn" -->
-    <!-- message="768" type="qwarn" -->
-    <!-- message="769" type="qwarn" -->
-    <!-- message="770" type="qwarn" -->
-    <!-- message="771" type="qwarn" -->
-    <!-- message="772" type="qwarn" -->
-    <!-- message="773" type="qwarn" -->
-    <!-- message="774" type="qwarn" -->
-    <!-- message="775" type="qwarn" -->
-    <!-- message="776" type="qwarn" -->
-    <!-- message="777" type="qwarn" -->
-    <!-- message="778" type="qwarn" -->
-    <!-- message="779" type="qwarn" -->
-    <!-- message="780" type="qwarn" -->
-    <!-- message="781" type="qwarn" -->
-    <!-- message="782" type="qwarn" -->
-    <!-- message="783" type="qwarn" -->
-    <!-- message="784" type="qwarn" -->
-    <!-- message="785" type="qwarn" -->
-    <!-- message="786" type="qwarn" -->
-    <!-- message="787" type="qwarn" -->
-    <!-- message="788" type="qwarn" -->
-    <!-- message="789" type="qwarn" -->
-    <!-- message="790" type="qwarn" -->
-    <!-- message="791" type="qwarn" -->
-    <!-- message="792" type="qwarn" -->
-    <!-- message="793" type="qwarn" -->
-    <!-- message="794" type="qwarn" -->
-    <!-- message="795" type="qwarn" -->
-    <!-- message="796" type="qwarn" -->
-    <!-- message="797" type="qwarn" -->
-    <!-- message="798" type="qwarn" -->
-    <!-- message="799" type="qwarn" -->
-    <!-- message="800" type="qwarn" -->
-    <!-- message="801" type="qwarn" -->
-    <!-- message="802" type="qwarn" -->
-    <!-- message="803" type="qwarn" -->
-    <!-- message="804" type="qwarn" -->
-    <!-- message="805" type="qwarn" -->
-    <!-- message="806" type="qwarn" -->
-    <!-- message="807" type="qwarn" -->
-    <!-- message="808" type="qwarn" -->
-    <!-- message="809" type="qwarn" -->
-    <!-- message="810" type="qwarn" -->
-    <!-- message="811" type="qwarn" -->
-    <!-- message="812" type="qwarn" -->
-    <!-- message="813" type="qwarn" -->
-    <!-- message="814" type="qwarn" -->
-    <!-- message="815" type="qwarn" -->
-    <!-- message="816" type="qwarn" -->
-    <!-- message="817" type="qwarn" -->
-    <!-- message="818" type="qwarn" -->
-    <!-- message="819" type="qwarn" -->
-    <!-- message="820" type="qwarn" -->
-    <!-- message="821" type="qwarn" -->
-    <!-- message="822" type="qwarn" -->
-    <!-- message="823" type="qwarn" -->
-    <!-- message="824" type="qwarn" -->
-    <!-- message="825" type="qwarn" -->
-    <!-- message="826" type="qwarn" -->
-    <!-- message="827" type="qwarn" -->
-    <!-- message="828" type="qwarn" -->
-    <!-- message="829" type="qwarn" -->
-    <!-- message="830" type="qwarn" -->
-    <!-- message="831" type="qwarn" -->
-    <!-- message="832" type="qwarn" -->
-    <!-- message="833" type="qwarn" -->
-    <!-- message="834" type="qwarn" -->
-    <!-- message="835" type="qwarn" -->
-    <!-- message="836" type="qwarn" -->
-    <!-- message="837" type="qwarn" -->
-    <!-- message="838" type="qwarn" -->
-    <!-- message="839" type="qwarn" -->
-    <!-- message="840" type="qwarn" -->
-    <!-- message="841" type="qwarn" -->
-    <!-- message="842" type="qwarn" -->
-    <!-- message="843" type="qwarn" -->
-    <!-- message="844" type="qwarn" -->
-    <!-- message="845" type="qwarn" -->
-    <!-- message="846" type="qwarn" -->
-    <!-- message="847" type="qwarn" -->
-    <!-- message="848" type="qwarn" -->
-    <!-- message="849" type="qwarn" -->
-    <!-- message="850" type="qwarn" -->
-    <!-- message="851" type="qwarn" -->
-    <!-- message="852" type="qwarn" -->
-    <!-- message="853" type="qwarn" -->
-    <!-- message="854" type="qwarn" -->
-    <!-- message="855" type="qwarn" -->
-    <!-- message="856" type="qwarn" -->
-    <!-- message="857" type="qwarn" -->
-    <!-- message="858" type="qwarn" -->
-    <!-- message="859" type="qwarn" -->
-    <!-- message="860" type="qwarn" -->
-    <!-- message="861" type="qwarn" -->
-    <!-- message="862" type="qwarn" -->
-    <!-- message="863" type="qwarn" -->
-    <!-- message="864" type="qwarn" -->
-    <!-- message="865" type="qwarn" -->
-    <!-- message="866" type="qwarn" -->
-    <!-- message="867" type="qwarn" -->
-    <!-- message="868" type="qwarn" -->
-    <!-- message="869" type="qwarn" -->
-    <!-- message="870" type="qwarn" -->
-    <!-- message="871" type="qwarn" -->
-    <!-- message="872" type="qwarn" -->
-    <!-- message="873" type="qwarn" -->
-    <!-- message="874" type="qwarn" -->
-    <!-- message="875" type="qwarn" -->
-    <!-- message="876" type="qwarn" -->
-    <!-- message="877" type="qwarn" -->
-    <!-- message="878" type="qwarn" -->
-    <!-- message="879" type="qwarn" -->
-    <!-- message="880" type="qwarn" -->
-    <!-- message="881" type="qwarn" -->
-    <!-- message="882" type="qwarn" -->
-    <!-- message="883" type="qwarn" -->
-    <!-- message="884" type="qwarn" -->
-    <!-- message="885" type="qwarn" -->
-    <!-- message="886" type="qwarn" -->
-    <!-- message="887" type="qwarn" -->
-    <!-- message="888" type="qwarn" -->
-    <!-- message="889" type="qwarn" -->
-    <!-- message="890" type="qwarn" -->
-    <!-- message="891" type="qwarn" -->
-    <!-- message="892" type="qwarn" -->
-    <!-- message="893" type="qwarn" -->
-    <!-- message="894" type="qwarn" -->
-    <!-- message="895" type="qwarn" -->
-    <!-- message="896" type="qwarn" -->
-    <!-- message="897" type="qwarn" -->
-    <!-- message="898" type="qwarn" -->
-    <!-- message="899" type="qwarn" -->
-    <!-- message="900" type="qwarn" -->
-    <!-- message="901" type="qwarn" -->
-    <!-- message="902" type="qwarn" -->
-    <!-- message="903" type="qwarn" -->
-    <!-- message="904" type="qwarn" -->
-    <!-- message="905" type="qwarn" -->
-    <!-- message="906" type="qwarn" -->
-    <!-- message="907" type="qwarn" -->
-    <!-- message="908" type="qwarn" -->
-    <!-- message="909" type="qwarn" -->
-    <!-- message="910" type="qwarn" -->
-    <!-- message="911" type="qwarn" -->
-    <!-- message="912" type="qwarn" -->
-    <!-- message="913" type="qwarn" -->
-    <!-- message="914" type="qwarn" -->
-    <!-- message="915" type="qwarn" -->
-    <!-- message="916" type="qwarn" -->
-    <!-- message="917" type="qwarn" -->
-    <!-- message="918" type="qwarn" -->
-    <!-- message="919" type="qwarn" -->
-    <!-- message="920" type="qwarn" -->
-    <!-- message="921" type="qwarn" -->
-    <!-- message="922" type="qwarn" -->
-    <!-- message="923" type="qwarn" -->
-    <!-- message="924" type="qwarn" -->
-    <!-- message="925" type="qwarn" -->
-    <!-- message="926" type="qwarn" -->
-    <!-- message="927" type="qwarn" -->
-    <!-- message="928" type="qwarn" -->
-    <!-- message="929" type="qwarn" -->
-    <!-- message="930" type="qwarn" -->
-    <!-- message="931" type="qwarn" -->
-    <!-- message="932" type="qwarn" -->
-    <!-- message="933" type="qwarn" -->
-    <!-- message="934" type="qwarn" -->
-    <!-- message="935" type="qwarn" -->
-    <!-- message="936" type="qwarn" -->
-    <!-- message="937" type="qwarn" -->
-    <!-- message="938" type="qwarn" -->
-    <!-- message="939" type="qwarn" -->
-    <!-- message="940" type="qwarn" -->
-    <!-- message="941" type="qwarn" -->
-    <!-- message="942" type="qwarn" -->
-    <!-- message="943" type="qwarn" -->
-    <!-- message="944" type="qwarn" -->
-    <!-- message="945" type="qwarn" -->
-    <!-- message="946" type="qwarn" -->
-    <!-- message="947" type="qwarn" -->
-    <!-- message="948" type="qwarn" -->
-    <!-- message="949" type="qwarn" -->
-    <!-- message="950" type="qwarn" -->
-    <!-- message="951" type="qwarn" -->
-    <!-- message="952" type="qwarn" -->
-    <!-- message="953" type="qwarn" -->
-    <!-- message="954" type="qwarn" -->
-    <!-- message="955" type="qwarn" -->
-    <!-- message="956" type="qwarn" -->
-    <!-- message="957" type="qwarn" -->
-    <!-- message="958" type="qwarn" -->
-    <!-- message="959" type="qwarn" -->
-    <!-- message="960" type="qwarn" -->
-    <!-- message="961" type="qwarn" -->
-    <!-- message="962" type="qwarn" -->
-    <!-- message="963" type="qwarn" -->
-    <!-- message="964" type="qwarn" -->
-    <!-- message="965" type="qwarn" -->
-    <!-- message="966" type="qwarn" -->
-    <!-- message="967" type="qwarn" -->
-    <!-- message="968" type="qwarn" -->
-    <!-- message="969" type="qwarn" -->
-    <!-- message="970" type="qwarn" -->
-    <!-- message="971" type="qwarn" -->
-    <!-- message="972" type="qwarn" -->
-    <!-- message="973" type="qwarn" -->
-    <!-- message="974" type="qwarn" -->
-    <!-- message="975" type="qwarn" -->
-    <!-- message="976" type="qwarn" -->
-    <!-- message="977" type="qwarn" -->
-    <!-- message="978" type="qwarn" -->
-    <!-- message="979" type="qwarn" -->
-    <!-- message="980" type="qwarn" -->
-    <!-- message="981" type="qwarn" -->
-    <!-- message="982" type="qwarn" -->
-    <!-- message="983" type="qwarn" -->
-    <!-- message="984" type="qwarn" -->
-    <!-- message="985" type="qwarn" -->
-    <!-- message="986" type="qwarn" -->
-    <!-- message="987" type="qwarn" -->
-    <!-- message="988" type="qwarn" -->
-    <!-- message="989" type="qwarn" -->
-    <!-- message="990" type="qwarn" -->
-    <!-- message="991" type="qwarn" -->
-    <!-- message="992" type="qwarn" -->
-    <!-- message="993" type="qwarn" -->
-    <!-- message="994" type="qwarn" -->
-    <!-- message="995" type="qwarn" -->
-    <!-- message="996" type="qwarn" -->
-    <!-- message="997" type="qwarn" -->
-    <!-- message="998" type="qwarn" -->
-    <!-- message="999" type="qwarn" -->
-    <!-- message="1000" type="qwarn" -->
-    <!-- message="1001" type="qwarn" -->
-    <!-- message="1002" type="qwarn" -->
-    <!-- message="1003" type="qwarn" -->
-    <!-- message="1004" type="qwarn" -->
-    <!-- message="1005" type="qwarn" -->
-    <!-- message="1006" type="qwarn" -->
-    <!-- message="1007" type="qwarn" -->
-    <!-- message="1008" type="qwarn" -->
-    <!-- message="1009" type="qwarn" -->
-    <!-- message="1010" type="qwarn" -->
-    <!-- message="1011" type="qwarn" -->
-    <!-- message="1012" type="qwarn" -->
-    <!-- message="1013" type="qwarn" -->
-    <!-- message="1014" type="qwarn" -->
-    <!-- message="1015" type="qwarn" -->
-    <!-- message="1016" type="qwarn" -->
-    <!-- message="1017" type="qwarn" -->
-    <!-- message="1018" type="qwarn" -->
-    <!-- message="1019" type="qwarn" -->
-    <!-- message="1020" type="qwarn" -->
-    <!-- message="1021" type="qwarn" -->
-    <!-- message="1022" type="qwarn" -->
-    <!-- message="1023" type="qwarn" -->
-    <!-- message="1024" type="qwarn" -->
-    <!-- message="1025" type="qwarn" -->
-    <!-- message="1026" type="qwarn" -->
-    <!-- message="1027" type="qwarn" -->
-    <!-- message="1028" type="qwarn" -->
-    <!-- message="1029" type="qwarn" -->
-    <!-- message="1030" type="qwarn" -->
-    <!-- message="1031" type="qwarn" -->
-    <!-- message="1032" type="qwarn" -->
-    <!-- message="1033" type="qwarn" -->
-    <!-- message="1034" type="qwarn" -->
-    <!-- message="1035" type="qwarn" -->
-    <!-- message="1036" type="qwarn" -->
-    <!-- message="1037" type="qwarn" -->
-    <!-- message="1038" type="qwarn" -->
-    <!-- message="1039" type="qwarn" -->
-    <!-- message="1040" type="qwarn" -->
-    <!-- message="1041" type="qwarn" -->
-    <!-- message="1042" type="qwarn" -->
-    <!-- message="1043" type="qwarn" -->
-    <!-- message="1044" type="qwarn" -->
-    <!-- message="1045" type="qwarn" -->
-    <!-- message="1046" type="qwarn" -->
-    <!-- message="1047" type="qwarn" -->
-    <!-- message="1048" type="qwarn" -->
-    <!-- message="1049" type="qwarn" -->
-    <!-- message="1050" type="qwarn" -->
-    <!-- message="1051" type="qwarn" -->
-    <!-- message="1052" type="qwarn" -->
-    <!-- message="1053" type="qwarn" -->
-    <!-- message="1054" type="qwarn" -->
-    <!-- message="1055" type="qwarn" -->
-    <!-- message="1056" type="qwarn" -->
-    <!-- message="1057" type="qwarn" -->
-    <!-- message="1058" type="qwarn" -->
-    <!-- message="1059" type="qwarn" -->
-    <!-- message="1060" type="qwarn" -->
-    <!-- message="1061" type="qwarn" -->
-    <!-- message="1062" type="qwarn" -->
-    <!-- message="1063" type="qwarn" -->
-    <!-- message="1064" type="qwarn" -->
-    <!-- message="1065" type="qwarn" -->
-    <!-- message="1066" type="qwarn" -->
-    <!-- message="1067" type="qwarn" -->
-    <!-- message="1068" type="qwarn" -->
-    <!-- message="1069" type="qwarn" -->
-    <!-- message="1070" type="qwarn" -->
-    <!-- message="1071" type="qwarn" -->
-    <!-- message="1072" type="qwarn" -->
-    <!-- message="1073" type="qwarn" -->
-    <!-- message="1074" type="qwarn" -->
-    <!-- message="1075" type="qwarn" -->
-    <!-- message="1076" type="qwarn" -->
-    <!-- message="1077" type="qwarn" -->
-    <!-- message="1078" type="qwarn" -->
-    <!-- message="1079" type="qwarn" -->
-    <!-- message="1080" type="qwarn" -->
-    <!-- message="1081" type="qwarn" -->
-    <!-- message="1082" type="qwarn" -->
-    <!-- message="1083" type="qwarn" -->
-    <!-- message="1084" type="qwarn" -->
-    <!-- message="1085" type="qwarn" -->
-    <!-- message="1086" type="qwarn" -->
-    <!-- message="1087" type="qwarn" -->
-    <!-- message="1088" type="qwarn" -->
-    <!-- message="1089" type="qwarn" -->
-    <!-- message="1090" type="qwarn" -->
-    <!-- message="1091" type="qwarn" -->
-    <!-- message="1092" type="qwarn" -->
-    <!-- message="1093" type="qwarn" -->
-    <!-- message="1094" type="qwarn" -->
-    <!-- message="1095" type="qwarn" -->
-    <!-- message="1096" type="qwarn" -->
-    <!-- message="1097" type="qwarn" -->
-    <!-- message="1098" type="qwarn" -->
-    <!-- message="1099" type="qwarn" -->
-    <!-- message="1100" type="qwarn" -->
-    <!-- message="1101" type="qwarn" -->
-    <!-- message="1102" type="qwarn" -->
-    <!-- message="1103" type="qwarn" -->
-    <!-- message="1104" type="qwarn" -->
-    <!-- message="1105" type="qwarn" -->
-    <!-- message="1106" type="qwarn" -->
-    <!-- message="1107" type="qwarn" -->
-    <!-- message="1108" type="qwarn" -->
-    <!-- message="1109" type="qwarn" -->
-    <!-- message="1110" type="qwarn" -->
-    <!-- message="1111" type="qwarn" -->
-    <!-- message="1112" type="qwarn" -->
-    <!-- message="1113" type="qwarn" -->
-    <!-- message="1114" type="qwarn" -->
-    <!-- message="1115" type="qwarn" -->
-    <!-- message="1116" type="qwarn" -->
-    <!-- message="1117" type="qwarn" -->
-    <!-- message="1118" type="qwarn" -->
-    <!-- message="1119" type="qwarn" -->
-    <!-- message="1120" type="qwarn" -->
-    <!-- message="1121" type="qwarn" -->
-    <!-- message="1122" type="qwarn" -->
-    <!-- message="1123" type="qwarn" -->
-    <!-- message="1124" type="qwarn" -->
-    <!-- message="1125" type="qwarn" -->
-    <!-- message="1126" type="qwarn" -->
-    <!-- message="1127" type="qwarn" -->
-    <!-- message="1128" type="qwarn" -->
-    <!-- message="1129" type="qwarn" -->
-    <!-- message="1130" type="qwarn" -->
-    <!-- message="1131" type="qwarn" -->
-    <!-- message="1132" type="qwarn" -->
-    <!-- message="1133" type="qwarn" -->
-    <!-- message="1134" type="qwarn" -->
-    <!-- message="1135" type="qwarn" -->
-    <!-- message="1136" type="qwarn" -->
-    <!-- message="1137" type="qwarn" -->
-    <!-- message="1138" type="qwarn" -->
-    <!-- message="1139" type="qwarn" -->
-    <!-- message="1140" type="qwarn" -->
-    <!-- message="1141" type="qwarn" -->
-    <!-- message="1142" type="qwarn" -->
-    <!-- message="1143" type="qwarn" -->
-    <!-- message="1144" type="qwarn" -->
-    <!-- message="1145" type="qwarn" -->
-    <!-- message="1146" type="qwarn" -->
-    <!-- message="1147" type="qwarn" -->
-    <!-- message="1148" type="qwarn" -->
-    <!-- message="1149" type="qwarn" -->
-    <!-- message="1150" type="qwarn" -->
-    <!-- message="1151" type="qwarn" -->
-    <!-- message="1152" type="qwarn" -->
-    <!-- message="1153" type="qwarn" -->
-    <!-- message="1154" type="qwarn" -->
-    <!-- message="1155" type="qwarn" -->
-    <!-- message="1156" type="qwarn" -->
-    <!-- message="1157" type="qwarn" -->
-    <!-- message="1158" type="qwarn" -->
-    <!-- message="1159" type="qwarn" -->
-    <!-- message="1160" type="qwarn" -->
-    <!-- message="1161" type="qwarn" -->
-    <!-- message="1162" type="qwarn" -->
-    <!-- message="1163" type="qwarn" -->
-    <!-- message="1164" type="qwarn" -->
-    <!-- message="1165" type="qwarn" -->
-    <!-- message="1166" type="qwarn" -->
-    <!-- message="1167" type="qwarn" -->
-    <!-- message="1168" type="qwarn" -->
-    <!-- message="1169" type="qwarn" -->
-    <!-- message="1170" type="qwarn" -->
-    <!-- message="1171" type="qwarn" -->
-    <!-- message="1172" type="qwarn" -->
-    <!-- message="1173" type="qwarn" -->
-    <!-- message="1174" type="qwarn" -->
-    <!-- message="1175" type="qwarn" -->
-    <!-- message="1176" type="qwarn" -->
-    <!-- message="1177" type="qwarn" -->
-    <!-- message="1178" type="qwarn" -->
-    <!-- message="1179" type="qwarn" -->
-    <!-- message="1180" type="qwarn" -->
-    <!-- message="1181" type="qwarn" -->
-    <!-- message="1182" type="qwarn" -->
-    <!-- message="1183" type="qwarn" -->
-    <!-- message="1184" type="qwarn" -->
-    <!-- message="1185" type="qwarn" -->
-    <!-- message="1186" type="qwarn" -->
-    <!-- message="1187" type="qwarn" -->
-    <!-- message="1188" type="qwarn" -->
-    <!-- message="1189" type="qwarn" -->
-    <!-- message="1190" type="qwarn" -->
-    <!-- message="1191" type="qwarn" -->
-    <!-- message="1192" type="qwarn" -->
-    <!-- message="1193" type="qwarn" -->
-    <!-- message="1194" type="qwarn" -->
-    <!-- message="1195" type="qwarn" -->
-    <!-- message="1196" type="qwarn" -->
-    <!-- message="1197" type="qwarn" -->
-    <!-- message="1198" type="qwarn" -->
-    <!-- message="1199" type="qwarn" -->
-    <!-- message="1200" type="qwarn" -->
-    <!-- message="1201" type="qwarn" -->
-    <!-- message="1202" type="qwarn" -->
-    <!-- message="1203" type="qwarn" -->
-    <!-- message="1204" type="qwarn" -->
-    <!-- message="1205" type="qwarn" -->
-    <!-- message="1206" type="qwarn" -->
-    <!-- message="1207" type="qwarn" -->
-    <!-- message="1208" type="qwarn" -->
-    <!-- message="1209" type="qwarn" -->
-    <!-- message="1210" type="qwarn" -->
-    <!-- message="1211" type="qwarn" -->
-    <!-- message="1212" type="qwarn" -->
-    <!-- message="1213" type="qwarn" -->
-    <!-- message="1214" type="qwarn" -->
-    <!-- message="1215" type="qwarn" -->
-    <!-- message="1216" type="qwarn" -->
-    <!-- message="1217" type="qwarn" -->
-    <!-- message="1218" type="qwarn" -->
-    <!-- message="1219" type="qwarn" -->
-    <!-- message="1220" type="qwarn" -->
-    <!-- message="1221" type="qwarn" -->
-    <!-- message="1222" type="qwarn" -->
-    <!-- message="1223" type="qwarn" -->
-    <!-- message="1224" type="qwarn" -->
-    <!-- message="1225" type="qwarn" -->
-    <!-- message="1226" type="qwarn" -->
-    <!-- message="1227" type="qwarn" -->
-    <!-- message="1228" type="qwarn" -->
-    <!-- message="1229" type="qwarn" -->
-    <!-- message="1230" type="qwarn" -->
-    <!-- message="1231" type="qwarn" -->
-    <!-- message="1232" type="qwarn" -->
-    <!-- message="1233" type="qwarn" -->
-    <!-- message="1234" type="qwarn" -->
-    <!-- message="1235" type="qwarn" -->
-    <!-- message="1236" type="qwarn" -->
-    <!-- message="1237" type="qwarn" -->
-    <!-- message="1238" type="qwarn" -->
-    <!-- message="1239" type="qwarn" -->
-    <!-- message="1240" type="qwarn" -->
-    <!-- message="1241" type="qwarn" -->
-    <!-- message="1242" type="qwarn" -->
-    <!-- message="1243" type="qwarn" -->
-    <!-- message="1244" type="qwarn" -->
-    <!-- message="1245" type="qwarn" -->
-    <!-- message="1246" type="qwarn" -->
-    <!-- message="1247" type="qwarn" -->
-    <!-- message="1248" type="qwarn" -->
-    <!-- message="1249" type="qwarn" -->
-    <!-- message="1250" type="qwarn" -->
-    <!-- message="1251" type="qwarn" -->
-    <!-- message="1252" type="qwarn" -->
-    <!-- message="1253" type="qwarn" -->
-    <!-- message="1254" type="qwarn" -->
-    <!-- message="1255" type="qwarn" -->
-    <!-- message="1256" type="qwarn" -->
-    <!-- message="1257" type="qwarn" -->
-    <!-- message="1258" type="qwarn" -->
-    <!-- message="1259" type="qwarn" -->
-    <!-- message="1260" type="qwarn" -->
-    <!-- message="1261" type="qwarn" -->
-    <!-- message="1262" type="qwarn" -->
-    <!-- message="1263" type="qwarn" -->
-    <!-- message="1264" type="qwarn" -->
-    <!-- message="1265" type="qwarn" -->
-    <!-- message="1266" type="qwarn" -->
-    <!-- message="1267" type="qwarn" -->
-    <!-- message="1268" type="qwarn" -->
-    <!-- message="1269" type="qwarn" -->
-    <!-- message="1270" type="qwarn" -->
-    <!-- message="1271" type="qwarn" -->
-    <!-- message="1272" type="qwarn" -->
-    <!-- message="1273" type="qwarn" -->
-    <!-- message="1274" type="qwarn" -->
-    <!-- message="1275" type="qwarn" -->
-    <!-- message="1276" type="qwarn" -->
-    <!-- message="1277" type="qwarn" -->
-    <!-- message="1278" type="qwarn" -->
-    <!-- message="1279" type="qwarn" -->
-    <!-- message="1280" type="qwarn" -->
-    <!-- message="1281" type="qwarn" -->
-    <!-- message="1282" type="qwarn" -->
-    <!-- message="1283" type="qwarn" -->
-    <!-- message="1284" type="qwarn" -->
-    <!-- message="1285" type="qwarn" -->
-    <!-- message="1286" type="qwarn" -->
-    <!-- message="1287" type="qwarn" -->
-    <!-- message="1288" type="qwarn" -->
-    <!-- message="1289" type="qwarn" -->
-    <!-- message="1290" type="qwarn" -->
-    <!-- message="1291" type="qwarn" -->
-    <!-- message="1292" type="qwarn" -->
-    <!-- message="1293" type="qwarn" -->
-    <!-- message="1294" type="qwarn" -->
-    <!-- message="1295" type="qwarn" -->
-    <!-- message="1296" type="qwarn" -->
-    <!-- message="1297" type="qwarn" -->
-    <!-- message="1298" type="qwarn" -->
-    <!-- message="1299" type="qwarn" -->
-    <!-- message="1300" type="qwarn" -->
-    <!-- message="1301" type="qwarn" -->
-    <!-- message="1302" type="qwarn" -->
-    <!-- message="1303" type="qwarn" -->
-    <!-- message="1304" type="qwarn" -->
-    <!-- message="1305" type="qwarn" -->
-    <!-- message="1306" type="qwarn" -->
-    <!-- message="1307" type="qwarn" -->
-    <!-- message="1308" type="qwarn" -->
-    <!-- message="1309" type="qwarn" -->
-    <!-- message="1310" type="qwarn" -->
-    <!-- message="1311" type="qwarn" -->
-    <!-- message="1312" type="qwarn" -->
-    <!-- message="1313" type="qwarn" -->
-    <!-- message="1314" type="qwarn" -->
-    <!-- message="1315" type="qwarn" -->
-    <!-- message="1316" type="qwarn" -->
-    <!-- message="1317" type="qwarn" -->
-    <!-- message="1318" type="qwarn" -->
-    <!-- message="1319" type="qwarn" -->
-    <!-- message="1320" type="qwarn" -->
-    <!-- message="1321" type="qwarn" -->
-    <!-- message="1322" type="qwarn" -->
-    <!-- message="1323" type="qwarn" -->
-    <!-- message="1324" type="qwarn" -->
-    <!-- message="1325" type="qwarn" -->
-    <!-- message="1326" type="qwarn" -->
-    <!-- message="1327" type="qwarn" -->
-    <!-- message="1328" type="qwarn" -->
-    <!-- message="1329" type="qwarn" -->
-    <!-- message="1330" type="qwarn" -->
-    <!-- message="1331" type="qwarn" -->
-    <!-- message="1332" type="qwarn" -->
-    <!-- message="1333" type="qwarn" -->
-    <!-- message="1334" type="qwarn" -->
-    <!-- message="1335" type="qwarn" -->
-    <!-- message="1336" type="qwarn" -->
-    <!-- message="1337" type="qwarn" -->
-    <!-- message="1338" type="qwarn" -->
-    <!-- message="1339" type="qwarn" -->
-    <!-- message="1340" type="qwarn" -->
-    <!-- message="1341" type="qwarn" -->
-    <!-- message="1342" type="qwarn" -->
-    <!-- message="1343" type="qwarn" -->
-    <!-- message="1344" type="qwarn" -->
-    <!-- message="1345" type="qwarn" -->
-    <!-- message="1346" type="qwarn" -->
-    <!-- message="1347" type="qwarn" -->
-    <!-- message="1348" type="qwarn" -->
-    <!-- message="1349" type="qwarn" -->
-    <!-- message="1350" type="qwarn" -->
-    <!-- message="1351" type="qwarn" -->
-    <!-- message="1352" type="qwarn" -->
-    <!-- message="1353" type="qwarn" -->
-    <!-- message="1354" type="qwarn" -->
-    <!-- message="1355" type="qwarn" -->
-    <!-- message="1356" type="qwarn" -->
-    <!-- message="1357" type="qwarn" -->
-    <!-- message="1358" type="qwarn" -->
-    <!-- message="1359" type="qwarn" -->
-    <!-- message="1360" type="qwarn" -->
-    <!-- message="1361" type="qwarn" -->
-    <!-- message="1362" type="qwarn" -->
-    <!-- message="1363" type="qwarn" -->
-    <!-- message="1364" type="qwarn" -->
-    <!-- message="1365" type="qwarn" -->
-    <!-- message="1366" type="qwarn" -->
-    <!-- message="1367" type="qwarn" -->
-    <!-- message="1368" type="qwarn" -->
-    <!-- message="1369" type="qwarn" -->
-    <!-- message="1370" type="qwarn" -->
-    <!-- message="1371" type="qwarn" -->
-    <!-- message="1372" type="qwarn" -->
-    <!-- message="1373" type="qwarn" -->
-    <!-- message="1374" type="qwarn" -->
-    <!-- message="1375" type="qwarn" -->
-    <!-- message="1376" type="qwarn" -->
-    <!-- message="1377" type="qwarn" -->
-    <!-- message="1378" type="qwarn" -->
-    <!-- message="1379" type="qwarn" -->
-    <!-- message="1380" type="qwarn" -->
-    <!-- message="1381" type="qwarn" -->
-    <!-- message="1382" type="qwarn" -->
-    <!-- message="1383" type="qwarn" -->
-    <!-- message="1384" type="qwarn" -->
-    <!-- message="1385" type="qwarn" -->
-    <!-- message="1386" type="qwarn" -->
-    <!-- message="1387" type="qwarn" -->
-    <!-- message="1388" type="qwarn" -->
-    <!-- message="1389" type="qwarn" -->
-    <!-- message="1390" type="qwarn" -->
-    <!-- message="1391" type="qwarn" -->
-    <!-- message="1392" type="qwarn" -->
-    <!-- message="1393" type="qwarn" -->
-    <!-- message="1394" type="qwarn" -->
-    <!-- message="1395" type="qwarn" -->
-    <!-- message="1396" type="qwarn" -->
-    <!-- message="1397" type="qwarn" -->
-    <!-- message="1398" type="qwarn" -->
-    <!-- message="1399" type="qwarn" -->
-    <!-- message="1400" type="qwarn" -->
-    <!-- message="1401" type="qwarn" -->
-    <!-- message="1402" type="qwarn" -->
-    <!-- message="1403" type="qwarn" -->
-    <!-- message="1404" type="qwarn" -->
-    <!-- message="1405" type="qwarn" -->
-    <!-- message="1406" type="qwarn" -->
-    <!-- message="1407" type="qwarn" -->
-    <!-- message="1408" type="qwarn" -->
-    <!-- message="1409" type="qwarn" -->
-    <!-- message="1410" type="qwarn" -->
-    <!-- message="1411" type="qwarn" -->
-    <!-- message="1412" type="qwarn" -->
-    <!-- message="1413" type="qwarn" -->
-    <!-- message="1414" type="qwarn" -->
-    <!-- message="1415" type="qwarn" -->
-    <!-- message="1416" type="qwarn" -->
-    <!-- message="1417" type="qwarn" -->
-    <!-- message="1418" type="qwarn" -->
-    <!-- message="1419" type="qwarn" -->
-    <!-- message="1420" type="qwarn" -->
-    <!-- message="1421" type="qwarn" -->
-    <!-- message="1422" type="qwarn" -->
-    <!-- message="1423" type="qwarn" -->
-    <!-- message="1424" type="qwarn" -->
-    <!-- message="1425" type="qwarn" -->
-    <!-- message="1426" type="qwarn" -->
-    <!-- message="1427" type="qwarn" -->
-    <!-- message="1428" type="qwarn" -->
-    <!-- message="1429" type="qwarn" -->
-    <!-- message="1430" type="qwarn" -->
-    <!-- message="1431" type="qwarn" -->
-    <!-- message="1432" type="qwarn" -->
-    <!-- message="1433" type="qwarn" -->
-    <!-- message="1434" type="qwarn" -->
-    <!-- message="1435" type="qwarn" -->
-    <!-- message="1436" type="qwarn" -->
-    <!-- message="1437" type="qwarn" -->
-    <!-- message="1438" type="qwarn" -->
-    <!-- message="1439" type="qwarn" -->
-    <!-- message="1440" type="qwarn" -->
-    <!-- message="1441" type="qwarn" -->
-    <!-- message="1442" type="qwarn" -->
-    <!-- message="1443" type="qwarn" -->
-    <!-- message="1444" type="qwarn" -->
-    <!-- message="1445" type="qwarn" -->
-    <!-- message="1446" type="qwarn" -->
-    <!-- message="1447" type="qwarn" -->
-    <!-- message="1448" type="qwarn" -->
-    <!-- message="1449" type="qwarn" -->
-    <!-- message="1450" type="qwarn" -->
-    <!-- message="1451" type="qwarn" -->
-    <!-- message="1452" type="qwarn" -->
-    <!-- message="1453" type="qwarn" -->
-    <!-- message="1454" type="qwarn" -->
-    <!-- message="1455" type="qwarn" -->
-    <!-- message="1456" type="qwarn" -->
-    <!-- message="1457" type="qwarn" -->
-    <!-- message="1458" type="qwarn" -->
-    <!-- message="1459" type="qwarn" -->
-    <!-- message="1460" type="qwarn" -->
-    <!-- message="1461" type="qwarn" -->
-    <!-- message="1462" type="qwarn" -->
-    <!-- message="1463" type="qwarn" -->
-    <!-- message="1464" type="qwarn" -->
-    <!-- message="1465" type="qwarn" -->
-    <!-- message="1466" type="qwarn" -->
-    <!-- message="1467" type="qwarn" -->
-    <!-- message="1468" type="qwarn" -->
-    <!-- message="1469" type="qwarn" -->
-    <!-- message="1470" type="qwarn" -->
-    <!-- message="1471" type="qwarn" -->
-    <!-- message="1472" type="qwarn" -->
-    <!-- message="1473" type="qwarn" -->
-    <!-- message="1474" type="qwarn" -->
-    <!-- message="1475" type="qwarn" -->
-    <!-- message="1476" type="qwarn" -->
-    <!-- message="1477" type="qwarn" -->
-    <!-- message="1478" type="qwarn" -->
-    <!-- message="1479" type="qwarn" -->
-    <!-- message="1480" type="qwarn" -->
-    <!-- message="1481" type="qwarn" -->
-    <!-- message="1482" type="qwarn" -->
-    <!-- message="1483" type="qwarn" -->
-    <!-- message="1484" type="qwarn" -->
-    <!-- message="1485" type="qwarn" -->
-    <!-- message="1486" type="qwarn" -->
-    <!-- message="1487" type="qwarn" -->
-    <!-- message="1488" type="qwarn" -->
-    <!-- message="1489" type="qwarn" -->
-    <!-- message="1490" type="qwarn" -->
-    <!-- message="1491" type="qwarn" -->
-    <!-- message="1492" type="qwarn" -->
-    <!-- message="1493" type="qwarn" -->
-    <!-- message="1494" type="qwarn" -->
-    <!-- message="1495" type="qwarn" -->
-    <!-- message="1496" type="qwarn" -->
-    <!-- message="1497" type="qwarn" -->
-    <!-- message="1498" type="qwarn" -->
-    <!-- message="1499" type="qwarn" -->
-    <!-- message="1500" type="qwarn" -->
-    <!-- message="1501" type="qwarn" -->
-    <!-- message="1502" type="qwarn" -->
-    <!-- message="1503" type="qwarn" -->
-    <!-- message="1504" type="qwarn" -->
-    <!-- message="1505" type="qwarn" -->
-    <!-- message="1506" type="qwarn" -->
-    <!-- message="1507" type="qwarn" -->
-    <!-- message="1508" type="qwarn" -->
-    <!-- message="1509" type="qwarn" -->
-    <!-- message="1510" type="qwarn" -->
-    <!-- message="1511" type="qwarn" -->
-    <!-- message="1512" type="qwarn" -->
-    <!-- message="1513" type="qwarn" -->
-    <!-- message="1514" type="qwarn" -->
-    <!-- message="1515" type="qwarn" -->
-    <!-- message="1516" type="qwarn" -->
-    <!-- message="1517" type="qwarn" -->
-    <!-- message="1518" type="qwarn" -->
-    <!-- message="1519" type="qwarn" -->
-    <!-- message="1520" type="qwarn" -->
-    <!-- message="1521" type="qwarn" -->
-    <!-- message="1522" type="qwarn" -->
-    <!-- message="1523" type="qwarn" -->
-    <!-- message="1524" type="qwarn" -->
-    <!-- message="1525" type="qwarn" -->
-    <!-- message="1526" type="qwarn" -->
-    <!-- message="1527" type="qwarn" -->
-    <!-- message="1528" type="qwarn" -->
-    <!-- message="1529" type="qwarn" -->
-    <!-- message="1530" type="qwarn" -->
-    <!-- message="1531" type="qwarn" -->
-    <!-- message="1532" type="qwarn" -->
-    <!-- message="1533" type="qwarn" -->
-    <!-- message="1534" type="qwarn" -->
-    <!-- message="1535" type="qwarn" -->
-    <!-- message="1536" type="qwarn" -->
-    <!-- message="1537" type="qwarn" -->
-    <!-- message="1538" type="qwarn" -->
-    <!-- message="1539" type="qwarn" -->
-    <!-- message="1540" type="qwarn" -->
-    <!-- message="1541" type="qwarn" -->
-    <!-- message="1542" type="qwarn" -->
-    <!-- message="1543" type="qwarn" -->
-    <!-- message="1544" type="qwarn" -->
-    <!-- message="1545" type="qwarn" -->
-    <!-- message="1546" type="qwarn" -->
-    <!-- message="1547" type="qwarn" -->
-    <!-- message="1548" type="qwarn" -->
-    <!-- message="1549" type="qwarn" -->
-    <!-- message="1550" type="qwarn" -->
-    <!-- message="1551" type="qwarn" -->
-    <!-- message="1552" type="qwarn" -->
-    <!-- message="1553" type="qwarn" -->
-    <!-- message="1554" type="qwarn" -->
-    <!-- message="1555" type="qwarn" -->
-    <!-- message="1556" type="qwarn" -->
-    <!-- message="1557" type="qwarn" -->
-    <!-- message="1558" type="qwarn" -->
-    <!-- message="1559" type="qwarn" -->
-    <!-- message="1560" type="qwarn" -->
-    <!-- message="1561" type="qwarn" -->
-    <!-- message="1562" type="qwarn" -->
-    <!-- message="1563" type="qwarn" -->
-    <!-- message="1564" type="qwarn" -->
-    <!-- message="1565" type="qwarn" -->
-    <!-- message="1566" type="qwarn" -->
-    <!-- message="1567" type="qwarn" -->
-    <!-- message="1568" type="qwarn" -->
-    <!-- message="1569" type="qwarn" -->
-    <!-- message="1570" type="qwarn" -->
-    <!-- message="1571" type="qwarn" -->
-    <!-- message="1572" type="qwarn" -->
-    <!-- message="1573" type="qwarn" -->
-    <!-- message="1574" type="qwarn" -->
-    <!-- message="1575" type="qwarn" -->
-    <!-- message="1576" type="qwarn" -->
-    <!-- message="1577" type="qwarn" -->
-    <!-- message="1578" type="qwarn" -->
-    <!-- message="1579" type="qwarn" -->
-    <!-- message="1580" type="qwarn" -->
-    <!-- message="1581" type="qwarn" -->
-    <!-- message="1582" type="qwarn" -->
-    <!-- message="1583" type="qwarn" -->
-    <!-- message="1584" type="qwarn" -->
-    <!-- message="1585" type="qwarn" -->
-    <!-- message="1586" type="qwarn" -->
-    <!-- message="1587" type="qwarn" -->
-    <!-- message="1588" type="qwarn" -->
-    <!-- message="1589" type="qwarn" -->
-    <!-- message="1590" type="qwarn" -->
-    <!-- message="1591" type="qwarn" -->
-    <!-- message="1592" type="qwarn" -->
-    <!-- message="1593" type="qwarn" -->
-    <!-- message="1594" type="qwarn" -->
-    <!-- message="1595" type="qwarn" -->
-    <!-- message="1596" type="qwarn" -->
-    <!-- message="1597" type="qwarn" -->
-    <!-- message="1598" type="qwarn" -->
-    <!-- message="1599" type="qwarn" -->
-    <!-- message="1600" type="qwarn" -->
-    <!-- message="1601" type="qwarn" -->
-    <!-- message="1602" type="qwarn" -->
-    <!-- message="1603" type="qwarn" -->
-    <!-- message="1604" type="qwarn" -->
-    <!-- message="1605" type="qwarn" -->
-    <!-- message="1606" type="qwarn" -->
-    <!-- message="1607" type="qwarn" -->
-    <!-- message="1608" type="qwarn" -->
-    <!-- message="1609" type="qwarn" -->
-    <!-- message="1610" type="qwarn" -->
-    <!-- message="1611" type="qwarn" -->
-    <!-- message="1612" type="qwarn" -->
-    <!-- message="1613" type="qwarn" -->
-    <!-- message="1614" type="qwarn" -->
-    <!-- message="1615" type="qwarn" -->
-    <!-- message="1616" type="qwarn" -->
-    <!-- message="1617" type="qwarn" -->
-    <!-- message="1618" type="qwarn" -->
-    <!-- message="1619" type="qwarn" -->
-    <!-- message="1620" type="qwarn" -->
-    <!-- message="1621" type="qwarn" -->
-    <!-- message="1622" type="qwarn" -->
-    <!-- message="1623" type="qwarn" -->
-    <!-- message="1624" type="qwarn" -->
-    <!-- message="1625" type="qwarn" -->
-    <!-- message="1626" type="qwarn" -->
-    <!-- message="1627" type="qwarn" -->
-    <!-- message="1628" type="qwarn" -->
-    <!-- message="1629" type="qwarn" -->
-    <!-- message="1630" type="qwarn" -->
-    <!-- message="1631" type="qwarn" -->
-    <!-- message="1632" type="qwarn" -->
-    <!-- message="1633" type="qwarn" -->
-    <!-- message="1634" type="qwarn" -->
-    <!-- message="1635" type="qwarn" -->
-    <!-- message="1636" type="qwarn" -->
-    <!-- message="1637" type="qwarn" -->
-    <!-- message="1638" type="qwarn" -->
-    <!-- message="1639" type="qwarn" -->
-    <!-- message="1640" type="qwarn" -->
-    <!-- message="1641" type="qwarn" -->
-    <!-- message="1642" type="qwarn" -->
-    <!-- message="1643" type="qwarn" -->
-    <!-- message="1644" type="qwarn" -->
-    <!-- message="1645" type="qwarn" -->
-    <!-- message="1646" type="qwarn" -->
-    <!-- message="1647" type="qwarn" -->
-    <!-- message="1648" type="qwarn" -->
-    <!-- message="1649" type="qwarn" -->
-    <!-- message="1650" type="qwarn" -->
-    <!-- message="1651" type="qwarn" -->
-    <!-- message="1652" type="qwarn" -->
-    <!-- message="1653" type="qwarn" -->
-    <!-- message="1654" type="qwarn" -->
-    <!-- message="1655" type="qwarn" -->
-    <!-- message="1656" type="qwarn" -->
-    <!-- message="1657" type="qwarn" -->
-    <!-- message="1658" type="qwarn" -->
-    <!-- message="1659" type="qwarn" -->
-    <!-- message="1660" type="qwarn" -->
-    <!-- message="1661" type="qwarn" -->
-    <!-- message="1662" type="qwarn" -->
-    <!-- message="1663" type="qwarn" -->
-    <!-- message="1664" type="qwarn" -->
-    <!-- message="1665" type="qwarn" -->
-    <!-- message="1666" type="qwarn" -->
-    <!-- message="1667" type="qwarn" -->
-    <!-- message="1668" type="qwarn" -->
-    <!-- message="1669" type="qwarn" -->
-    <!-- message="1670" type="qwarn" -->
-    <!-- message="1671" type="qwarn" -->
-    <!-- message="1672" type="qwarn" -->
-    <!-- message="1673" type="qwarn" -->
-    <!-- message="1674" type="qwarn" -->
-    <!-- message="1675" type="qwarn" -->
-    <!-- message="1676" type="qwarn" -->
-    <!-- message="1677" type="qwarn" -->
-    <!-- message="1678" type="qwarn" -->
-    <!-- message="1679" type="qwarn" -->
-    <!-- message="1680" type="qwarn" -->
-    <!-- message="1681" type="qwarn" -->
-    <!-- message="1682" type="qwarn" -->
-    <!-- message="1683" type="qwarn" -->
-    <!-- message="1684" type="qwarn" -->
-    <!-- message="1685" type="qwarn" -->
-    <!-- message="1686" type="qwarn" -->
-    <!-- message="1687" type="qwarn" -->
-    <!-- message="1688" type="qwarn" -->
-    <!-- message="1689" type="qwarn" -->
-    <!-- message="1690" type="qwarn" -->
-    <!-- message="1691" type="qwarn" -->
-    <!-- message="1692" type="qwarn" -->
-    <!-- message="1693" type="qwarn" -->
-    <!-- message="1694" type="qwarn" -->
-    <!-- message="1695" type="qwarn" -->
-    <!-- message="1696" type="qwarn" -->
-    <!-- message="1697" type="qwarn" -->
-    <!-- message="1698" type="qwarn" -->
-    <!-- message="1699" type="qwarn" -->
-    <!-- message="1700" type="qwarn" -->
-    <!-- message="1701" type="qwarn" -->
-    <!-- message="1702" type="qwarn" -->
-    <!-- message="1703" type="qwarn" -->
-    <!-- message="1704" type="qwarn" -->
-    <!-- message="1705" type="qwarn" -->
-    <!-- message="1706" type="qwarn" -->
-    <!-- message="1707" type="qwarn" -->
-    <!-- message="1708" type="qwarn" -->
-    <!-- message="1709" type="qwarn" -->
-    <!-- message="1710" type="qwarn" -->
-    <!-- message="1711" type="qwarn" -->
-    <!-- message="1712" type="qwarn" -->
-    <!-- message="1713" type="qwarn" -->
-    <!-- message="1714" type="qwarn" -->
-    <!-- message="1715" type="qwarn" -->
-    <!-- message="1716" type="qwarn" -->
-    <!-- message="1717" type="qwarn" -->
-    <!-- message="1718" type="qwarn" -->
-    <!-- message="1719" type="qwarn" -->
-    <!-- message="1720" type="qwarn" -->
-    <!-- message="1721" type="qwarn" -->
-    <!-- message="1722" type="qwarn" -->
-    <!-- message="1723" type="qwarn" -->
-    <!-- message="1724" type="qwarn" -->
-    <!-- message="1725" type="qwarn" -->
-    <!-- message="1726" type="qwarn" -->
-    <!-- message="1727" type="qwarn" -->
-    <!-- message="1728" type="qwarn" -->
-    <!-- message="1729" type="qwarn" -->
-    <!-- message="1730" type="qwarn" -->
-    <!-- message="1731" type="qwarn" -->
-    <!-- message="1732" type="qwarn" -->
-    <!-- message="1733" type="qwarn" -->
-    <!-- message="1734" type="qwarn" -->
-    <!-- message="1735" type="qwarn" -->
-    <!-- message="1736" type="qwarn" -->
-    <!-- message="1737" type="qwarn" -->
-    <!-- message="1738" type="qwarn" -->
-    <!-- message="1739" type="qwarn" -->
-    <!-- message="1740" type="qwarn" -->
-    <!-- message="1741" type="qwarn" -->
-    <!-- message="1742" type="qwarn" -->
-    <!-- message="1743" type="qwarn" -->
-    <!-- message="1744" type="qwarn" -->
-    <!-- message="1745" type="qwarn" -->
-    <!-- message="1746" type="qwarn" -->
-    <!-- message="1747" type="qwarn" -->
-    <!-- message="1748" type="qwarn" -->
-    <!-- message="1749" type="qwarn" -->
-    <!-- message="1750" type="qwarn" -->
-    <!-- message="1751" type="qwarn" -->
-    <!-- message="1752" type="qwarn" -->
-    <!-- message="1753" type="qwarn" -->
-    <!-- message="1754" type="qwarn" -->
-    <!-- message="1755" type="qwarn" -->
-    <!-- message="1756" type="qwarn" -->
-    <!-- message="1757" type="qwarn" -->
-    <!-- message="1758" type="qwarn" -->
-    <!-- message="1759" type="qwarn" -->
-    <!-- message="1760" type="qwarn" -->
-    <!-- message="1761" type="qwarn" -->
-    <!-- message="1762" type="qwarn" -->
-    <!-- message="1763" type="qwarn" -->
-    <!-- message="1764" type="qwarn" -->
-    <!-- message="1765" type="qwarn" -->
-    <!-- message="1766" type="qwarn" -->
-    <!-- message="1767" type="qwarn" -->
-    <!-- message="1768" type="qwarn" -->
-    <!-- message="1769" type="qwarn" -->
-    <!-- message="1770" type="qwarn" -->
-    <!-- message="1771" type="qwarn" -->
-    <!-- message="1772" type="qwarn" -->
-    <!-- message="1773" type="qwarn" -->
-    <!-- message="1774" type="qwarn" -->
-    <!-- message="1775" type="qwarn" -->
-    <!-- message="1776" type="qwarn" -->
-    <!-- message="1777" type="qwarn" -->
-    <!-- message="1778" type="qwarn" -->
-    <!-- message="1779" type="qwarn" -->
-    <!-- message="1780" type="qwarn" -->
-    <!-- message="1781" type="qwarn" -->
-    <!-- message="1782" type="qwarn" -->
-    <!-- message="1783" type="qwarn" -->
-    <!-- message="1784" type="qwarn" -->
-    <!-- message="1785" type="qwarn" -->
-    <!-- message="1786" type="qwarn" -->
-    <!-- message="1787" type="qwarn" -->
-    <!-- message="1788" type="qwarn" -->
-    <!-- message="1789" type="qwarn" -->
-    <!-- message="1790" type="qwarn" -->
-    <!-- message="1791" type="qwarn" -->
-    <!-- message="1792" type="qwarn" -->
-    <!-- message="1793" type="qwarn" -->
-    <!-- message="1794" type="qwarn" -->
-    <!-- message="1795" type="qwarn" -->
-    <!-- message="1796" type="qwarn" -->
-    <!-- message="1797" type="qwarn" -->
-    <!-- message="1798" type="qwarn" -->
-    <!-- message="1799" type="qwarn" -->
-    <!-- message="1800" type="qwarn" -->
-    <!-- message="1801" type="qwarn" -->
-    <!-- message="1802" type="qwarn" -->
-    <!-- message="1803" type="qwarn" -->
-    <!-- message="1804" type="qwarn" -->
-    <!-- message="1805" type="qwarn" -->
-    <!-- message="1806" type="qwarn" -->
-    <!-- message="1807" type="qwarn" -->
-    <!-- message="1808" type="qwarn" -->
-    <!-- message="1809" type="qwarn" -->
-    <!-- message="1810" type="qwarn" -->
-    <!-- message="1811" type="qwarn" -->
-    <!-- message="1812" type="qwarn" -->
-    <!-- message="1813" type="qwarn" -->
-    <!-- message="1814" type="qwarn" -->
-    <!-- message="1815" type="qwarn" -->
-    <!-- message="1816" type="qwarn" -->
-    <!-- message="1817" type="qwarn" -->
-    <!-- message="1818" type="qwarn" -->
-    <!-- message="1819" type="qwarn" -->
-    <!-- message="1820" type="qwarn" -->
-    <!-- message="1821" type="qwarn" -->
-    <!-- message="1822" type="qwarn" -->
-    <!-- message="1823" type="qwarn" -->
-    <!-- message="1824" type="qwarn" -->
-    <!-- message="1825" type="qwarn" -->
-    <!-- message="1826" type="qwarn" -->
-    <!-- message="1827" type="qwarn" -->
-    <!-- message="1828" type="qwarn" -->
-    <!-- message="1829" type="qwarn" -->
-    <!-- message="1830" type="qwarn" -->
-    <!-- message="1831" type="qwarn" -->
-    <!-- message="1832" type="qwarn" -->
-    <!-- message="1833" type="qwarn" -->
-    <!-- message="1834" type="qwarn" -->
-    <!-- message="1835" type="qwarn" -->
-    <!-- message="1836" type="qwarn" -->
-    <!-- message="1837" type="qwarn" -->
-    <!-- message="1838" type="qwarn" -->
-    <!-- message="1839" type="qwarn" -->
-    <!-- message="1840" type="qwarn" -->
-    <!-- message="1841" type="qwarn" -->
-    <!-- message="1842" type="qwarn" -->
-    <!-- message="1843" type="qwarn" -->
-    <!-- message="1844" type="qwarn" -->
-    <!-- message="1845" type="qwarn" -->
-    <!-- message="1846" type="qwarn" -->
-    <!-- message="1847" type="qwarn" -->
-    <!-- message="1848" type="qwarn" -->
-    <!-- message="1849" type="qwarn" -->
-    <!-- message="1850" type="qwarn" -->
-    <!-- message="1851" type="qwarn" -->
-    <!-- message="1852" type="qwarn" -->
-    <!-- message="1853" type="qwarn" -->
-    <!-- message="1854" type="qwarn" -->
-    <!-- message="1855" type="qwarn" -->
-    <!-- message="1856" type="qwarn" -->
-    <!-- message="1857" type="qwarn" -->
-    <!-- message="1858" type="qwarn" -->
-    <!-- message="1859" type="qwarn" -->
-    <!-- message="1860" type="qwarn" -->
-    <!-- message="1861" type="qwarn" -->
-    <!-- message="1862" type="qwarn" -->
-    <!-- message="1863" type="qwarn" -->
-    <!-- message="1864" type="qwarn" -->
-    <!-- message="1865" type="qwarn" -->
-    <!-- message="1866" type="qwarn" -->
-    <!-- message="1867" type="qwarn" -->
-    <!-- message="1868" type="qwarn" -->
-    <!-- message="1869" type="qwarn" -->
-    <!-- message="1870" type="qwarn" -->
-    <!-- message="1871" type="qwarn" -->
-    <!-- message="1872" type="qwarn" -->
-    <!-- message="1873" type="qwarn" -->
-    <!-- message="1874" type="qwarn" -->
-    <!-- message="1875" type="qwarn" -->
-    <!-- message="1876" type="qwarn" -->
-    <!-- message="1877" type="qwarn" -->
-    <!-- message="1878" type="qwarn" -->
-    <!-- message="1879" type="qwarn" -->
-    <!-- message="1880" type="qwarn" -->
-    <!-- message="1881" type="qwarn" -->
-    <!-- message="1882" type="qwarn" -->
-    <!-- message="1883" type="qwarn" -->
-    <!-- message="1884" type="qwarn" -->
-    <!-- message="1885" type="qwarn" -->
-    <!-- message="1886" type="qwarn" -->
-    <!-- message="1887" type="qwarn" -->
-    <!-- message="1888" type="qwarn" -->
-    <!-- message="1889" type="qwarn" -->
-    <!-- message="1890" type="qwarn" -->
-    <!-- message="1891" type="qwarn" -->
-    <!-- message="1892" type="qwarn" -->
-    <!-- message="1893" type="qwarn" -->
-    <!-- message="1894" type="qwarn" -->
-    <!-- message="1895" type="qwarn" -->
-    <!-- message="1896" type="qwarn" -->
-    <!-- message="1897" type="qwarn" -->
-    <!-- message="1898" type="qwarn" -->
-    <!-- message="1899" type="qwarn" -->
-    <!-- message="1900" type="qwarn" -->
-    <!-- message="1901" type="qwarn" -->
-    <!-- message="1902" type="qwarn" -->
-    <!-- message="1903" type="qwarn" -->
-    <!-- message="1904" type="qwarn" -->
-    <!-- message="1905" type="qwarn" -->
-    <!-- message="1906" type="qwarn" -->
-    <!-- message="1907" type="qwarn" -->
-    <!-- message="1908" type="qwarn" -->
-    <!-- message="1909" type="qwarn" -->
-    <!-- message="1910" type="qwarn" -->
-    <!-- message="1911" type="qwarn" -->
-    <!-- message="1912" type="qwarn" -->
-    <!-- message="1913" type="qwarn" -->
-    <!-- message="1914" type="qwarn" -->
-    <!-- message="1915" type="qwarn" -->
-    <!-- message="1916" type="qwarn" -->
-    <!-- message="1917" type="qwarn" -->
-    <!-- message="1918" type="qwarn" -->
-    <!-- message="1919" type="qwarn" -->
-    <!-- message="1920" type="qwarn" -->
-    <!-- message="1921" type="qwarn" -->
-    <!-- message="1922" type="qwarn" -->
-    <!-- message="1923" type="qwarn" -->
-    <!-- message="1924" type="qwarn" -->
-    <!-- message="1925" type="qwarn" -->
-    <!-- message="1926" type="qwarn" -->
-    <!-- message="1927" type="qwarn" -->
-    <!-- message="1928" type="qwarn" -->
-    <!-- message="1929" type="qwarn" -->
-    <!-- message="1930" type="qwarn" -->
-    <!-- message="1931" type="qwarn" -->
-    <!-- message="1932" type="qwarn" -->
-    <!-- message="1933" type="qwarn" -->
-    <!-- message="1934" type="qwarn" -->
-    <!-- message="1935" type="qwarn" -->
-    <!-- message="1936" type="qwarn" -->
-    <!-- message="1937" type="qwarn" -->
-    <!-- message="1938" type="qwarn" -->
-    <!-- message="1939" type="qwarn" -->
-    <!-- message="1940" type="qwarn" -->
-    <!-- message="1941" type="qwarn" -->
-    <!-- message="1942" type="qwarn" -->
-    <!-- message="1943" type="qwarn" -->
-    <!-- message="1944" type="qwarn" -->
-    <!-- message="1945" type="qwarn" -->
-    <!-- message="1946" type="qwarn" -->
-    <!-- message="1947" type="qwarn" -->
-    <!-- message="1948" type="qwarn" -->
-    <!-- message="1949" type="qwarn" -->
-    <!-- message="1950" type="qwarn" -->
-    <!-- message="1951" type="qwarn" -->
-    <!-- message="1952" type="qwarn" -->
-    <!-- message="1953" type="qwarn" -->
-    <!-- message="1954" type="qwarn" -->
-    <!-- message="1955" type="qwarn" -->
-    <!-- message="1956" type="qwarn" -->
-    <!-- message="1957" type="qwarn" -->
-    <!-- message="1958" type="qwarn" -->
-    <!-- message="1959" type="qwarn" -->
-    <!-- message="1960" type="qwarn" -->
-    <!-- message="1961" type="qwarn" -->
-    <!-- message="1962" type="qwarn" -->
-    <!-- message="1963" type="qwarn" -->
-    <!-- message="1964" type="qwarn" -->
-    <!-- message="1965" type="qwarn" -->
-    <!-- message="1966" type="qwarn" -->
-    <!-- message="1967" type="qwarn" -->
-    <!-- message="1968" type="qwarn" -->
-    <!-- message="1969" type="qwarn" -->
-    <!-- message="1970" type="qwarn" -->
-    <!-- message="1971" type="qwarn" -->
-    <!-- message="1972" type="qwarn" -->
-    <!-- message="1973" type="qwarn" -->
-    <!-- message="1974" type="qwarn" -->
-    <!-- message="1975" type="qwarn" -->
-    <!-- message="1976" type="qwarn" -->
-    <!-- message="1977" type="qwarn" -->
-    <!-- message="1978" type="qwarn" -->
-    <!-- message="1979" type="qwarn" -->
-    <!-- message="1980" type="qwarn" -->
-    <!-- message="1981" type="qwarn" -->
-    <!-- message="1982" type="qwarn" -->
-    <!-- message="1983" type="qwarn" -->
-    <!-- message="1984" type="qwarn" -->
-    <!-- message="1985" type="qwarn" -->
-    <!-- message="1986" type="qwarn" -->
-    <!-- message="1987" type="qwarn" -->
-    <!-- message="1988" type="qwarn" -->
-    <!-- message="1989" type="qwarn" -->
-    <!-- message="1990" type="qwarn" -->
-    <!-- message="1991" type="qwarn" -->
-    <!-- message="1992" type="qwarn" -->
-    <!-- message="1993" type="qwarn" -->
-    <!-- message="1994" type="qwarn" -->
-    <!-- message="1995" type="qwarn" -->
-    <!-- message="1996" type="qwarn" -->
-    <!-- message="1997" type="qwarn" -->
-    <!-- message="1998" type="qwarn" -->
-    <!-- message="1999" type="qwarn" -->
-    <!-- message="2000" type="qwarn" -->
-    <!-- message="Maximum amount of warnings exceeded. Use &#x002D;maxwarnings to override." type="system" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="warn" result="pass">
+    <!-- type="qwarn" message="0" -->
+    <!-- type="qwarn" message="1" -->
+    <!-- type="qwarn" message="2" -->
+    <!-- type="qwarn" message="3" -->
+    <!-- type="qwarn" message="4" -->
+    <!-- type="qwarn" message="5" -->
+    <!-- type="qwarn" message="6" -->
+    <!-- type="qwarn" message="7" -->
+    <!-- type="qwarn" message="8" -->
+    <!-- type="qwarn" message="9" -->
+    <!-- type="qwarn" message="10" -->
+    <!-- type="qwarn" message="11" -->
+    <!-- type="qwarn" message="12" -->
+    <!-- type="qwarn" message="13" -->
+    <!-- type="qwarn" message="14" -->
+    <!-- type="qwarn" message="15" -->
+    <!-- type="qwarn" message="16" -->
+    <!-- type="qwarn" message="17" -->
+    <!-- type="qwarn" message="18" -->
+    <!-- type="qwarn" message="19" -->
+    <!-- type="qwarn" message="20" -->
+    <!-- type="qwarn" message="21" -->
+    <!-- type="qwarn" message="22" -->
+    <!-- type="qwarn" message="23" -->
+    <!-- type="qwarn" message="24" -->
+    <!-- type="qwarn" message="25" -->
+    <!-- type="qwarn" message="26" -->
+    <!-- type="qwarn" message="27" -->
+    <!-- type="qwarn" message="28" -->
+    <!-- type="qwarn" message="29" -->
+    <!-- type="qwarn" message="30" -->
+    <!-- type="qwarn" message="31" -->
+    <!-- type="qwarn" message="32" -->
+    <!-- type="qwarn" message="33" -->
+    <!-- type="qwarn" message="34" -->
+    <!-- type="qwarn" message="35" -->
+    <!-- type="qwarn" message="36" -->
+    <!-- type="qwarn" message="37" -->
+    <!-- type="qwarn" message="38" -->
+    <!-- type="qwarn" message="39" -->
+    <!-- type="qwarn" message="40" -->
+    <!-- type="qwarn" message="41" -->
+    <!-- type="qwarn" message="42" -->
+    <!-- type="qwarn" message="43" -->
+    <!-- type="qwarn" message="44" -->
+    <!-- type="qwarn" message="45" -->
+    <!-- type="qwarn" message="46" -->
+    <!-- type="qwarn" message="47" -->
+    <!-- type="qwarn" message="48" -->
+    <!-- type="qwarn" message="49" -->
+    <!-- type="qwarn" message="50" -->
+    <!-- type="qwarn" message="51" -->
+    <!-- type="qwarn" message="52" -->
+    <!-- type="qwarn" message="53" -->
+    <!-- type="qwarn" message="54" -->
+    <!-- type="qwarn" message="55" -->
+    <!-- type="qwarn" message="56" -->
+    <!-- type="qwarn" message="57" -->
+    <!-- type="qwarn" message="58" -->
+    <!-- type="qwarn" message="59" -->
+    <!-- type="qwarn" message="60" -->
+    <!-- type="qwarn" message="61" -->
+    <!-- type="qwarn" message="62" -->
+    <!-- type="qwarn" message="63" -->
+    <!-- type="qwarn" message="64" -->
+    <!-- type="qwarn" message="65" -->
+    <!-- type="qwarn" message="66" -->
+    <!-- type="qwarn" message="67" -->
+    <!-- type="qwarn" message="68" -->
+    <!-- type="qwarn" message="69" -->
+    <!-- type="qwarn" message="70" -->
+    <!-- type="qwarn" message="71" -->
+    <!-- type="qwarn" message="72" -->
+    <!-- type="qwarn" message="73" -->
+    <!-- type="qwarn" message="74" -->
+    <!-- type="qwarn" message="75" -->
+    <!-- type="qwarn" message="76" -->
+    <!-- type="qwarn" message="77" -->
+    <!-- type="qwarn" message="78" -->
+    <!-- type="qwarn" message="79" -->
+    <!-- type="qwarn" message="80" -->
+    <!-- type="qwarn" message="81" -->
+    <!-- type="qwarn" message="82" -->
+    <!-- type="qwarn" message="83" -->
+    <!-- type="qwarn" message="84" -->
+    <!-- type="qwarn" message="85" -->
+    <!-- type="qwarn" message="86" -->
+    <!-- type="qwarn" message="87" -->
+    <!-- type="qwarn" message="88" -->
+    <!-- type="qwarn" message="89" -->
+    <!-- type="qwarn" message="90" -->
+    <!-- type="qwarn" message="91" -->
+    <!-- type="qwarn" message="92" -->
+    <!-- type="qwarn" message="93" -->
+    <!-- type="qwarn" message="94" -->
+    <!-- type="qwarn" message="95" -->
+    <!-- type="qwarn" message="96" -->
+    <!-- type="qwarn" message="97" -->
+    <!-- type="qwarn" message="98" -->
+    <!-- type="qwarn" message="99" -->
+    <!-- type="qwarn" message="100" -->
+    <!-- type="qwarn" message="101" -->
+    <!-- type="qwarn" message="102" -->
+    <!-- type="qwarn" message="103" -->
+    <!-- type="qwarn" message="104" -->
+    <!-- type="qwarn" message="105" -->
+    <!-- type="qwarn" message="106" -->
+    <!-- type="qwarn" message="107" -->
+    <!-- type="qwarn" message="108" -->
+    <!-- type="qwarn" message="109" -->
+    <!-- type="qwarn" message="110" -->
+    <!-- type="qwarn" message="111" -->
+    <!-- type="qwarn" message="112" -->
+    <!-- type="qwarn" message="113" -->
+    <!-- type="qwarn" message="114" -->
+    <!-- type="qwarn" message="115" -->
+    <!-- type="qwarn" message="116" -->
+    <!-- type="qwarn" message="117" -->
+    <!-- type="qwarn" message="118" -->
+    <!-- type="qwarn" message="119" -->
+    <!-- type="qwarn" message="120" -->
+    <!-- type="qwarn" message="121" -->
+    <!-- type="qwarn" message="122" -->
+    <!-- type="qwarn" message="123" -->
+    <!-- type="qwarn" message="124" -->
+    <!-- type="qwarn" message="125" -->
+    <!-- type="qwarn" message="126" -->
+    <!-- type="qwarn" message="127" -->
+    <!-- type="qwarn" message="128" -->
+    <!-- type="qwarn" message="129" -->
+    <!-- type="qwarn" message="130" -->
+    <!-- type="qwarn" message="131" -->
+    <!-- type="qwarn" message="132" -->
+    <!-- type="qwarn" message="133" -->
+    <!-- type="qwarn" message="134" -->
+    <!-- type="qwarn" message="135" -->
+    <!-- type="qwarn" message="136" -->
+    <!-- type="qwarn" message="137" -->
+    <!-- type="qwarn" message="138" -->
+    <!-- type="qwarn" message="139" -->
+    <!-- type="qwarn" message="140" -->
+    <!-- type="qwarn" message="141" -->
+    <!-- type="qwarn" message="142" -->
+    <!-- type="qwarn" message="143" -->
+    <!-- type="qwarn" message="144" -->
+    <!-- type="qwarn" message="145" -->
+    <!-- type="qwarn" message="146" -->
+    <!-- type="qwarn" message="147" -->
+    <!-- type="qwarn" message="148" -->
+    <!-- type="qwarn" message="149" -->
+    <!-- type="qwarn" message="150" -->
+    <!-- type="qwarn" message="151" -->
+    <!-- type="qwarn" message="152" -->
+    <!-- type="qwarn" message="153" -->
+    <!-- type="qwarn" message="154" -->
+    <!-- type="qwarn" message="155" -->
+    <!-- type="qwarn" message="156" -->
+    <!-- type="qwarn" message="157" -->
+    <!-- type="qwarn" message="158" -->
+    <!-- type="qwarn" message="159" -->
+    <!-- type="qwarn" message="160" -->
+    <!-- type="qwarn" message="161" -->
+    <!-- type="qwarn" message="162" -->
+    <!-- type="qwarn" message="163" -->
+    <!-- type="qwarn" message="164" -->
+    <!-- type="qwarn" message="165" -->
+    <!-- type="qwarn" message="166" -->
+    <!-- type="qwarn" message="167" -->
+    <!-- type="qwarn" message="168" -->
+    <!-- type="qwarn" message="169" -->
+    <!-- type="qwarn" message="170" -->
+    <!-- type="qwarn" message="171" -->
+    <!-- type="qwarn" message="172" -->
+    <!-- type="qwarn" message="173" -->
+    <!-- type="qwarn" message="174" -->
+    <!-- type="qwarn" message="175" -->
+    <!-- type="qwarn" message="176" -->
+    <!-- type="qwarn" message="177" -->
+    <!-- type="qwarn" message="178" -->
+    <!-- type="qwarn" message="179" -->
+    <!-- type="qwarn" message="180" -->
+    <!-- type="qwarn" message="181" -->
+    <!-- type="qwarn" message="182" -->
+    <!-- type="qwarn" message="183" -->
+    <!-- type="qwarn" message="184" -->
+    <!-- type="qwarn" message="185" -->
+    <!-- type="qwarn" message="186" -->
+    <!-- type="qwarn" message="187" -->
+    <!-- type="qwarn" message="188" -->
+    <!-- type="qwarn" message="189" -->
+    <!-- type="qwarn" message="190" -->
+    <!-- type="qwarn" message="191" -->
+    <!-- type="qwarn" message="192" -->
+    <!-- type="qwarn" message="193" -->
+    <!-- type="qwarn" message="194" -->
+    <!-- type="qwarn" message="195" -->
+    <!-- type="qwarn" message="196" -->
+    <!-- type="qwarn" message="197" -->
+    <!-- type="qwarn" message="198" -->
+    <!-- type="qwarn" message="199" -->
+    <!-- type="qwarn" message="200" -->
+    <!-- type="qwarn" message="201" -->
+    <!-- type="qwarn" message="202" -->
+    <!-- type="qwarn" message="203" -->
+    <!-- type="qwarn" message="204" -->
+    <!-- type="qwarn" message="205" -->
+    <!-- type="qwarn" message="206" -->
+    <!-- type="qwarn" message="207" -->
+    <!-- type="qwarn" message="208" -->
+    <!-- type="qwarn" message="209" -->
+    <!-- type="qwarn" message="210" -->
+    <!-- type="qwarn" message="211" -->
+    <!-- type="qwarn" message="212" -->
+    <!-- type="qwarn" message="213" -->
+    <!-- type="qwarn" message="214" -->
+    <!-- type="qwarn" message="215" -->
+    <!-- type="qwarn" message="216" -->
+    <!-- type="qwarn" message="217" -->
+    <!-- type="qwarn" message="218" -->
+    <!-- type="qwarn" message="219" -->
+    <!-- type="qwarn" message="220" -->
+    <!-- type="qwarn" message="221" -->
+    <!-- type="qwarn" message="222" -->
+    <!-- type="qwarn" message="223" -->
+    <!-- type="qwarn" message="224" -->
+    <!-- type="qwarn" message="225" -->
+    <!-- type="qwarn" message="226" -->
+    <!-- type="qwarn" message="227" -->
+    <!-- type="qwarn" message="228" -->
+    <!-- type="qwarn" message="229" -->
+    <!-- type="qwarn" message="230" -->
+    <!-- type="qwarn" message="231" -->
+    <!-- type="qwarn" message="232" -->
+    <!-- type="qwarn" message="233" -->
+    <!-- type="qwarn" message="234" -->
+    <!-- type="qwarn" message="235" -->
+    <!-- type="qwarn" message="236" -->
+    <!-- type="qwarn" message="237" -->
+    <!-- type="qwarn" message="238" -->
+    <!-- type="qwarn" message="239" -->
+    <!-- type="qwarn" message="240" -->
+    <!-- type="qwarn" message="241" -->
+    <!-- type="qwarn" message="242" -->
+    <!-- type="qwarn" message="243" -->
+    <!-- type="qwarn" message="244" -->
+    <!-- type="qwarn" message="245" -->
+    <!-- type="qwarn" message="246" -->
+    <!-- type="qwarn" message="247" -->
+    <!-- type="qwarn" message="248" -->
+    <!-- type="qwarn" message="249" -->
+    <!-- type="qwarn" message="250" -->
+    <!-- type="qwarn" message="251" -->
+    <!-- type="qwarn" message="252" -->
+    <!-- type="qwarn" message="253" -->
+    <!-- type="qwarn" message="254" -->
+    <!-- type="qwarn" message="255" -->
+    <!-- type="qwarn" message="256" -->
+    <!-- type="qwarn" message="257" -->
+    <!-- type="qwarn" message="258" -->
+    <!-- type="qwarn" message="259" -->
+    <!-- type="qwarn" message="260" -->
+    <!-- type="qwarn" message="261" -->
+    <!-- type="qwarn" message="262" -->
+    <!-- type="qwarn" message="263" -->
+    <!-- type="qwarn" message="264" -->
+    <!-- type="qwarn" message="265" -->
+    <!-- type="qwarn" message="266" -->
+    <!-- type="qwarn" message="267" -->
+    <!-- type="qwarn" message="268" -->
+    <!-- type="qwarn" message="269" -->
+    <!-- type="qwarn" message="270" -->
+    <!-- type="qwarn" message="271" -->
+    <!-- type="qwarn" message="272" -->
+    <!-- type="qwarn" message="273" -->
+    <!-- type="qwarn" message="274" -->
+    <!-- type="qwarn" message="275" -->
+    <!-- type="qwarn" message="276" -->
+    <!-- type="qwarn" message="277" -->
+    <!-- type="qwarn" message="278" -->
+    <!-- type="qwarn" message="279" -->
+    <!-- type="qwarn" message="280" -->
+    <!-- type="qwarn" message="281" -->
+    <!-- type="qwarn" message="282" -->
+    <!-- type="qwarn" message="283" -->
+    <!-- type="qwarn" message="284" -->
+    <!-- type="qwarn" message="285" -->
+    <!-- type="qwarn" message="286" -->
+    <!-- type="qwarn" message="287" -->
+    <!-- type="qwarn" message="288" -->
+    <!-- type="qwarn" message="289" -->
+    <!-- type="qwarn" message="290" -->
+    <!-- type="qwarn" message="291" -->
+    <!-- type="qwarn" message="292" -->
+    <!-- type="qwarn" message="293" -->
+    <!-- type="qwarn" message="294" -->
+    <!-- type="qwarn" message="295" -->
+    <!-- type="qwarn" message="296" -->
+    <!-- type="qwarn" message="297" -->
+    <!-- type="qwarn" message="298" -->
+    <!-- type="qwarn" message="299" -->
+    <!-- type="qwarn" message="300" -->
+    <!-- type="qwarn" message="301" -->
+    <!-- type="qwarn" message="302" -->
+    <!-- type="qwarn" message="303" -->
+    <!-- type="qwarn" message="304" -->
+    <!-- type="qwarn" message="305" -->
+    <!-- type="qwarn" message="306" -->
+    <!-- type="qwarn" message="307" -->
+    <!-- type="qwarn" message="308" -->
+    <!-- type="qwarn" message="309" -->
+    <!-- type="qwarn" message="310" -->
+    <!-- type="qwarn" message="311" -->
+    <!-- type="qwarn" message="312" -->
+    <!-- type="qwarn" message="313" -->
+    <!-- type="qwarn" message="314" -->
+    <!-- type="qwarn" message="315" -->
+    <!-- type="qwarn" message="316" -->
+    <!-- type="qwarn" message="317" -->
+    <!-- type="qwarn" message="318" -->
+    <!-- type="qwarn" message="319" -->
+    <!-- type="qwarn" message="320" -->
+    <!-- type="qwarn" message="321" -->
+    <!-- type="qwarn" message="322" -->
+    <!-- type="qwarn" message="323" -->
+    <!-- type="qwarn" message="324" -->
+    <!-- type="qwarn" message="325" -->
+    <!-- type="qwarn" message="326" -->
+    <!-- type="qwarn" message="327" -->
+    <!-- type="qwarn" message="328" -->
+    <!-- type="qwarn" message="329" -->
+    <!-- type="qwarn" message="330" -->
+    <!-- type="qwarn" message="331" -->
+    <!-- type="qwarn" message="332" -->
+    <!-- type="qwarn" message="333" -->
+    <!-- type="qwarn" message="334" -->
+    <!-- type="qwarn" message="335" -->
+    <!-- type="qwarn" message="336" -->
+    <!-- type="qwarn" message="337" -->
+    <!-- type="qwarn" message="338" -->
+    <!-- type="qwarn" message="339" -->
+    <!-- type="qwarn" message="340" -->
+    <!-- type="qwarn" message="341" -->
+    <!-- type="qwarn" message="342" -->
+    <!-- type="qwarn" message="343" -->
+    <!-- type="qwarn" message="344" -->
+    <!-- type="qwarn" message="345" -->
+    <!-- type="qwarn" message="346" -->
+    <!-- type="qwarn" message="347" -->
+    <!-- type="qwarn" message="348" -->
+    <!-- type="qwarn" message="349" -->
+    <!-- type="qwarn" message="350" -->
+    <!-- type="qwarn" message="351" -->
+    <!-- type="qwarn" message="352" -->
+    <!-- type="qwarn" message="353" -->
+    <!-- type="qwarn" message="354" -->
+    <!-- type="qwarn" message="355" -->
+    <!-- type="qwarn" message="356" -->
+    <!-- type="qwarn" message="357" -->
+    <!-- type="qwarn" message="358" -->
+    <!-- type="qwarn" message="359" -->
+    <!-- type="qwarn" message="360" -->
+    <!-- type="qwarn" message="361" -->
+    <!-- type="qwarn" message="362" -->
+    <!-- type="qwarn" message="363" -->
+    <!-- type="qwarn" message="364" -->
+    <!-- type="qwarn" message="365" -->
+    <!-- type="qwarn" message="366" -->
+    <!-- type="qwarn" message="367" -->
+    <!-- type="qwarn" message="368" -->
+    <!-- type="qwarn" message="369" -->
+    <!-- type="qwarn" message="370" -->
+    <!-- type="qwarn" message="371" -->
+    <!-- type="qwarn" message="372" -->
+    <!-- type="qwarn" message="373" -->
+    <!-- type="qwarn" message="374" -->
+    <!-- type="qwarn" message="375" -->
+    <!-- type="qwarn" message="376" -->
+    <!-- type="qwarn" message="377" -->
+    <!-- type="qwarn" message="378" -->
+    <!-- type="qwarn" message="379" -->
+    <!-- type="qwarn" message="380" -->
+    <!-- type="qwarn" message="381" -->
+    <!-- type="qwarn" message="382" -->
+    <!-- type="qwarn" message="383" -->
+    <!-- type="qwarn" message="384" -->
+    <!-- type="qwarn" message="385" -->
+    <!-- type="qwarn" message="386" -->
+    <!-- type="qwarn" message="387" -->
+    <!-- type="qwarn" message="388" -->
+    <!-- type="qwarn" message="389" -->
+    <!-- type="qwarn" message="390" -->
+    <!-- type="qwarn" message="391" -->
+    <!-- type="qwarn" message="392" -->
+    <!-- type="qwarn" message="393" -->
+    <!-- type="qwarn" message="394" -->
+    <!-- type="qwarn" message="395" -->
+    <!-- type="qwarn" message="396" -->
+    <!-- type="qwarn" message="397" -->
+    <!-- type="qwarn" message="398" -->
+    <!-- type="qwarn" message="399" -->
+    <!-- type="qwarn" message="400" -->
+    <!-- type="qwarn" message="401" -->
+    <!-- type="qwarn" message="402" -->
+    <!-- type="qwarn" message="403" -->
+    <!-- type="qwarn" message="404" -->
+    <!-- type="qwarn" message="405" -->
+    <!-- type="qwarn" message="406" -->
+    <!-- type="qwarn" message="407" -->
+    <!-- type="qwarn" message="408" -->
+    <!-- type="qwarn" message="409" -->
+    <!-- type="qwarn" message="410" -->
+    <!-- type="qwarn" message="411" -->
+    <!-- type="qwarn" message="412" -->
+    <!-- type="qwarn" message="413" -->
+    <!-- type="qwarn" message="414" -->
+    <!-- type="qwarn" message="415" -->
+    <!-- type="qwarn" message="416" -->
+    <!-- type="qwarn" message="417" -->
+    <!-- type="qwarn" message="418" -->
+    <!-- type="qwarn" message="419" -->
+    <!-- type="qwarn" message="420" -->
+    <!-- type="qwarn" message="421" -->
+    <!-- type="qwarn" message="422" -->
+    <!-- type="qwarn" message="423" -->
+    <!-- type="qwarn" message="424" -->
+    <!-- type="qwarn" message="425" -->
+    <!-- type="qwarn" message="426" -->
+    <!-- type="qwarn" message="427" -->
+    <!-- type="qwarn" message="428" -->
+    <!-- type="qwarn" message="429" -->
+    <!-- type="qwarn" message="430" -->
+    <!-- type="qwarn" message="431" -->
+    <!-- type="qwarn" message="432" -->
+    <!-- type="qwarn" message="433" -->
+    <!-- type="qwarn" message="434" -->
+    <!-- type="qwarn" message="435" -->
+    <!-- type="qwarn" message="436" -->
+    <!-- type="qwarn" message="437" -->
+    <!-- type="qwarn" message="438" -->
+    <!-- type="qwarn" message="439" -->
+    <!-- type="qwarn" message="440" -->
+    <!-- type="qwarn" message="441" -->
+    <!-- type="qwarn" message="442" -->
+    <!-- type="qwarn" message="443" -->
+    <!-- type="qwarn" message="444" -->
+    <!-- type="qwarn" message="445" -->
+    <!-- type="qwarn" message="446" -->
+    <!-- type="qwarn" message="447" -->
+    <!-- type="qwarn" message="448" -->
+    <!-- type="qwarn" message="449" -->
+    <!-- type="qwarn" message="450" -->
+    <!-- type="qwarn" message="451" -->
+    <!-- type="qwarn" message="452" -->
+    <!-- type="qwarn" message="453" -->
+    <!-- type="qwarn" message="454" -->
+    <!-- type="qwarn" message="455" -->
+    <!-- type="qwarn" message="456" -->
+    <!-- type="qwarn" message="457" -->
+    <!-- type="qwarn" message="458" -->
+    <!-- type="qwarn" message="459" -->
+    <!-- type="qwarn" message="460" -->
+    <!-- type="qwarn" message="461" -->
+    <!-- type="qwarn" message="462" -->
+    <!-- type="qwarn" message="463" -->
+    <!-- type="qwarn" message="464" -->
+    <!-- type="qwarn" message="465" -->
+    <!-- type="qwarn" message="466" -->
+    <!-- type="qwarn" message="467" -->
+    <!-- type="qwarn" message="468" -->
+    <!-- type="qwarn" message="469" -->
+    <!-- type="qwarn" message="470" -->
+    <!-- type="qwarn" message="471" -->
+    <!-- type="qwarn" message="472" -->
+    <!-- type="qwarn" message="473" -->
+    <!-- type="qwarn" message="474" -->
+    <!-- type="qwarn" message="475" -->
+    <!-- type="qwarn" message="476" -->
+    <!-- type="qwarn" message="477" -->
+    <!-- type="qwarn" message="478" -->
+    <!-- type="qwarn" message="479" -->
+    <!-- type="qwarn" message="480" -->
+    <!-- type="qwarn" message="481" -->
+    <!-- type="qwarn" message="482" -->
+    <!-- type="qwarn" message="483" -->
+    <!-- type="qwarn" message="484" -->
+    <!-- type="qwarn" message="485" -->
+    <!-- type="qwarn" message="486" -->
+    <!-- type="qwarn" message="487" -->
+    <!-- type="qwarn" message="488" -->
+    <!-- type="qwarn" message="489" -->
+    <!-- type="qwarn" message="490" -->
+    <!-- type="qwarn" message="491" -->
+    <!-- type="qwarn" message="492" -->
+    <!-- type="qwarn" message="493" -->
+    <!-- type="qwarn" message="494" -->
+    <!-- type="qwarn" message="495" -->
+    <!-- type="qwarn" message="496" -->
+    <!-- type="qwarn" message="497" -->
+    <!-- type="qwarn" message="498" -->
+    <!-- type="qwarn" message="499" -->
+    <!-- type="qwarn" message="500" -->
+    <!-- type="qwarn" message="501" -->
+    <!-- type="qwarn" message="502" -->
+    <!-- type="qwarn" message="503" -->
+    <!-- type="qwarn" message="504" -->
+    <!-- type="qwarn" message="505" -->
+    <!-- type="qwarn" message="506" -->
+    <!-- type="qwarn" message="507" -->
+    <!-- type="qwarn" message="508" -->
+    <!-- type="qwarn" message="509" -->
+    <!-- type="qwarn" message="510" -->
+    <!-- type="qwarn" message="511" -->
+    <!-- type="qwarn" message="512" -->
+    <!-- type="qwarn" message="513" -->
+    <!-- type="qwarn" message="514" -->
+    <!-- type="qwarn" message="515" -->
+    <!-- type="qwarn" message="516" -->
+    <!-- type="qwarn" message="517" -->
+    <!-- type="qwarn" message="518" -->
+    <!-- type="qwarn" message="519" -->
+    <!-- type="qwarn" message="520" -->
+    <!-- type="qwarn" message="521" -->
+    <!-- type="qwarn" message="522" -->
+    <!-- type="qwarn" message="523" -->
+    <!-- type="qwarn" message="524" -->
+    <!-- type="qwarn" message="525" -->
+    <!-- type="qwarn" message="526" -->
+    <!-- type="qwarn" message="527" -->
+    <!-- type="qwarn" message="528" -->
+    <!-- type="qwarn" message="529" -->
+    <!-- type="qwarn" message="530" -->
+    <!-- type="qwarn" message="531" -->
+    <!-- type="qwarn" message="532" -->
+    <!-- type="qwarn" message="533" -->
+    <!-- type="qwarn" message="534" -->
+    <!-- type="qwarn" message="535" -->
+    <!-- type="qwarn" message="536" -->
+    <!-- type="qwarn" message="537" -->
+    <!-- type="qwarn" message="538" -->
+    <!-- type="qwarn" message="539" -->
+    <!-- type="qwarn" message="540" -->
+    <!-- type="qwarn" message="541" -->
+    <!-- type="qwarn" message="542" -->
+    <!-- type="qwarn" message="543" -->
+    <!-- type="qwarn" message="544" -->
+    <!-- type="qwarn" message="545" -->
+    <!-- type="qwarn" message="546" -->
+    <!-- type="qwarn" message="547" -->
+    <!-- type="qwarn" message="548" -->
+    <!-- type="qwarn" message="549" -->
+    <!-- type="qwarn" message="550" -->
+    <!-- type="qwarn" message="551" -->
+    <!-- type="qwarn" message="552" -->
+    <!-- type="qwarn" message="553" -->
+    <!-- type="qwarn" message="554" -->
+    <!-- type="qwarn" message="555" -->
+    <!-- type="qwarn" message="556" -->
+    <!-- type="qwarn" message="557" -->
+    <!-- type="qwarn" message="558" -->
+    <!-- type="qwarn" message="559" -->
+    <!-- type="qwarn" message="560" -->
+    <!-- type="qwarn" message="561" -->
+    <!-- type="qwarn" message="562" -->
+    <!-- type="qwarn" message="563" -->
+    <!-- type="qwarn" message="564" -->
+    <!-- type="qwarn" message="565" -->
+    <!-- type="qwarn" message="566" -->
+    <!-- type="qwarn" message="567" -->
+    <!-- type="qwarn" message="568" -->
+    <!-- type="qwarn" message="569" -->
+    <!-- type="qwarn" message="570" -->
+    <!-- type="qwarn" message="571" -->
+    <!-- type="qwarn" message="572" -->
+    <!-- type="qwarn" message="573" -->
+    <!-- type="qwarn" message="574" -->
+    <!-- type="qwarn" message="575" -->
+    <!-- type="qwarn" message="576" -->
+    <!-- type="qwarn" message="577" -->
+    <!-- type="qwarn" message="578" -->
+    <!-- type="qwarn" message="579" -->
+    <!-- type="qwarn" message="580" -->
+    <!-- type="qwarn" message="581" -->
+    <!-- type="qwarn" message="582" -->
+    <!-- type="qwarn" message="583" -->
+    <!-- type="qwarn" message="584" -->
+    <!-- type="qwarn" message="585" -->
+    <!-- type="qwarn" message="586" -->
+    <!-- type="qwarn" message="587" -->
+    <!-- type="qwarn" message="588" -->
+    <!-- type="qwarn" message="589" -->
+    <!-- type="qwarn" message="590" -->
+    <!-- type="qwarn" message="591" -->
+    <!-- type="qwarn" message="592" -->
+    <!-- type="qwarn" message="593" -->
+    <!-- type="qwarn" message="594" -->
+    <!-- type="qwarn" message="595" -->
+    <!-- type="qwarn" message="596" -->
+    <!-- type="qwarn" message="597" -->
+    <!-- type="qwarn" message="598" -->
+    <!-- type="qwarn" message="599" -->
+    <!-- type="qwarn" message="600" -->
+    <!-- type="qwarn" message="601" -->
+    <!-- type="qwarn" message="602" -->
+    <!-- type="qwarn" message="603" -->
+    <!-- type="qwarn" message="604" -->
+    <!-- type="qwarn" message="605" -->
+    <!-- type="qwarn" message="606" -->
+    <!-- type="qwarn" message="607" -->
+    <!-- type="qwarn" message="608" -->
+    <!-- type="qwarn" message="609" -->
+    <!-- type="qwarn" message="610" -->
+    <!-- type="qwarn" message="611" -->
+    <!-- type="qwarn" message="612" -->
+    <!-- type="qwarn" message="613" -->
+    <!-- type="qwarn" message="614" -->
+    <!-- type="qwarn" message="615" -->
+    <!-- type="qwarn" message="616" -->
+    <!-- type="qwarn" message="617" -->
+    <!-- type="qwarn" message="618" -->
+    <!-- type="qwarn" message="619" -->
+    <!-- type="qwarn" message="620" -->
+    <!-- type="qwarn" message="621" -->
+    <!-- type="qwarn" message="622" -->
+    <!-- type="qwarn" message="623" -->
+    <!-- type="qwarn" message="624" -->
+    <!-- type="qwarn" message="625" -->
+    <!-- type="qwarn" message="626" -->
+    <!-- type="qwarn" message="627" -->
+    <!-- type="qwarn" message="628" -->
+    <!-- type="qwarn" message="629" -->
+    <!-- type="qwarn" message="630" -->
+    <!-- type="qwarn" message="631" -->
+    <!-- type="qwarn" message="632" -->
+    <!-- type="qwarn" message="633" -->
+    <!-- type="qwarn" message="634" -->
+    <!-- type="qwarn" message="635" -->
+    <!-- type="qwarn" message="636" -->
+    <!-- type="qwarn" message="637" -->
+    <!-- type="qwarn" message="638" -->
+    <!-- type="qwarn" message="639" -->
+    <!-- type="qwarn" message="640" -->
+    <!-- type="qwarn" message="641" -->
+    <!-- type="qwarn" message="642" -->
+    <!-- type="qwarn" message="643" -->
+    <!-- type="qwarn" message="644" -->
+    <!-- type="qwarn" message="645" -->
+    <!-- type="qwarn" message="646" -->
+    <!-- type="qwarn" message="647" -->
+    <!-- type="qwarn" message="648" -->
+    <!-- type="qwarn" message="649" -->
+    <!-- type="qwarn" message="650" -->
+    <!-- type="qwarn" message="651" -->
+    <!-- type="qwarn" message="652" -->
+    <!-- type="qwarn" message="653" -->
+    <!-- type="qwarn" message="654" -->
+    <!-- type="qwarn" message="655" -->
+    <!-- type="qwarn" message="656" -->
+    <!-- type="qwarn" message="657" -->
+    <!-- type="qwarn" message="658" -->
+    <!-- type="qwarn" message="659" -->
+    <!-- type="qwarn" message="660" -->
+    <!-- type="qwarn" message="661" -->
+    <!-- type="qwarn" message="662" -->
+    <!-- type="qwarn" message="663" -->
+    <!-- type="qwarn" message="664" -->
+    <!-- type="qwarn" message="665" -->
+    <!-- type="qwarn" message="666" -->
+    <!-- type="qwarn" message="667" -->
+    <!-- type="qwarn" message="668" -->
+    <!-- type="qwarn" message="669" -->
+    <!-- type="qwarn" message="670" -->
+    <!-- type="qwarn" message="671" -->
+    <!-- type="qwarn" message="672" -->
+    <!-- type="qwarn" message="673" -->
+    <!-- type="qwarn" message="674" -->
+    <!-- type="qwarn" message="675" -->
+    <!-- type="qwarn" message="676" -->
+    <!-- type="qwarn" message="677" -->
+    <!-- type="qwarn" message="678" -->
+    <!-- type="qwarn" message="679" -->
+    <!-- type="qwarn" message="680" -->
+    <!-- type="qwarn" message="681" -->
+    <!-- type="qwarn" message="682" -->
+    <!-- type="qwarn" message="683" -->
+    <!-- type="qwarn" message="684" -->
+    <!-- type="qwarn" message="685" -->
+    <!-- type="qwarn" message="686" -->
+    <!-- type="qwarn" message="687" -->
+    <!-- type="qwarn" message="688" -->
+    <!-- type="qwarn" message="689" -->
+    <!-- type="qwarn" message="690" -->
+    <!-- type="qwarn" message="691" -->
+    <!-- type="qwarn" message="692" -->
+    <!-- type="qwarn" message="693" -->
+    <!-- type="qwarn" message="694" -->
+    <!-- type="qwarn" message="695" -->
+    <!-- type="qwarn" message="696" -->
+    <!-- type="qwarn" message="697" -->
+    <!-- type="qwarn" message="698" -->
+    <!-- type="qwarn" message="699" -->
+    <!-- type="qwarn" message="700" -->
+    <!-- type="qwarn" message="701" -->
+    <!-- type="qwarn" message="702" -->
+    <!-- type="qwarn" message="703" -->
+    <!-- type="qwarn" message="704" -->
+    <!-- type="qwarn" message="705" -->
+    <!-- type="qwarn" message="706" -->
+    <!-- type="qwarn" message="707" -->
+    <!-- type="qwarn" message="708" -->
+    <!-- type="qwarn" message="709" -->
+    <!-- type="qwarn" message="710" -->
+    <!-- type="qwarn" message="711" -->
+    <!-- type="qwarn" message="712" -->
+    <!-- type="qwarn" message="713" -->
+    <!-- type="qwarn" message="714" -->
+    <!-- type="qwarn" message="715" -->
+    <!-- type="qwarn" message="716" -->
+    <!-- type="qwarn" message="717" -->
+    <!-- type="qwarn" message="718" -->
+    <!-- type="qwarn" message="719" -->
+    <!-- type="qwarn" message="720" -->
+    <!-- type="qwarn" message="721" -->
+    <!-- type="qwarn" message="722" -->
+    <!-- type="qwarn" message="723" -->
+    <!-- type="qwarn" message="724" -->
+    <!-- type="qwarn" message="725" -->
+    <!-- type="qwarn" message="726" -->
+    <!-- type="qwarn" message="727" -->
+    <!-- type="qwarn" message="728" -->
+    <!-- type="qwarn" message="729" -->
+    <!-- type="qwarn" message="730" -->
+    <!-- type="qwarn" message="731" -->
+    <!-- type="qwarn" message="732" -->
+    <!-- type="qwarn" message="733" -->
+    <!-- type="qwarn" message="734" -->
+    <!-- type="qwarn" message="735" -->
+    <!-- type="qwarn" message="736" -->
+    <!-- type="qwarn" message="737" -->
+    <!-- type="qwarn" message="738" -->
+    <!-- type="qwarn" message="739" -->
+    <!-- type="qwarn" message="740" -->
+    <!-- type="qwarn" message="741" -->
+    <!-- type="qwarn" message="742" -->
+    <!-- type="qwarn" message="743" -->
+    <!-- type="qwarn" message="744" -->
+    <!-- type="qwarn" message="745" -->
+    <!-- type="qwarn" message="746" -->
+    <!-- type="qwarn" message="747" -->
+    <!-- type="qwarn" message="748" -->
+    <!-- type="qwarn" message="749" -->
+    <!-- type="qwarn" message="750" -->
+    <!-- type="qwarn" message="751" -->
+    <!-- type="qwarn" message="752" -->
+    <!-- type="qwarn" message="753" -->
+    <!-- type="qwarn" message="754" -->
+    <!-- type="qwarn" message="755" -->
+    <!-- type="qwarn" message="756" -->
+    <!-- type="qwarn" message="757" -->
+    <!-- type="qwarn" message="758" -->
+    <!-- type="qwarn" message="759" -->
+    <!-- type="qwarn" message="760" -->
+    <!-- type="qwarn" message="761" -->
+    <!-- type="qwarn" message="762" -->
+    <!-- type="qwarn" message="763" -->
+    <!-- type="qwarn" message="764" -->
+    <!-- type="qwarn" message="765" -->
+    <!-- type="qwarn" message="766" -->
+    <!-- type="qwarn" message="767" -->
+    <!-- type="qwarn" message="768" -->
+    <!-- type="qwarn" message="769" -->
+    <!-- type="qwarn" message="770" -->
+    <!-- type="qwarn" message="771" -->
+    <!-- type="qwarn" message="772" -->
+    <!-- type="qwarn" message="773" -->
+    <!-- type="qwarn" message="774" -->
+    <!-- type="qwarn" message="775" -->
+    <!-- type="qwarn" message="776" -->
+    <!-- type="qwarn" message="777" -->
+    <!-- type="qwarn" message="778" -->
+    <!-- type="qwarn" message="779" -->
+    <!-- type="qwarn" message="780" -->
+    <!-- type="qwarn" message="781" -->
+    <!-- type="qwarn" message="782" -->
+    <!-- type="qwarn" message="783" -->
+    <!-- type="qwarn" message="784" -->
+    <!-- type="qwarn" message="785" -->
+    <!-- type="qwarn" message="786" -->
+    <!-- type="qwarn" message="787" -->
+    <!-- type="qwarn" message="788" -->
+    <!-- type="qwarn" message="789" -->
+    <!-- type="qwarn" message="790" -->
+    <!-- type="qwarn" message="791" -->
+    <!-- type="qwarn" message="792" -->
+    <!-- type="qwarn" message="793" -->
+    <!-- type="qwarn" message="794" -->
+    <!-- type="qwarn" message="795" -->
+    <!-- type="qwarn" message="796" -->
+    <!-- type="qwarn" message="797" -->
+    <!-- type="qwarn" message="798" -->
+    <!-- type="qwarn" message="799" -->
+    <!-- type="qwarn" message="800" -->
+    <!-- type="qwarn" message="801" -->
+    <!-- type="qwarn" message="802" -->
+    <!-- type="qwarn" message="803" -->
+    <!-- type="qwarn" message="804" -->
+    <!-- type="qwarn" message="805" -->
+    <!-- type="qwarn" message="806" -->
+    <!-- type="qwarn" message="807" -->
+    <!-- type="qwarn" message="808" -->
+    <!-- type="qwarn" message="809" -->
+    <!-- type="qwarn" message="810" -->
+    <!-- type="qwarn" message="811" -->
+    <!-- type="qwarn" message="812" -->
+    <!-- type="qwarn" message="813" -->
+    <!-- type="qwarn" message="814" -->
+    <!-- type="qwarn" message="815" -->
+    <!-- type="qwarn" message="816" -->
+    <!-- type="qwarn" message="817" -->
+    <!-- type="qwarn" message="818" -->
+    <!-- type="qwarn" message="819" -->
+    <!-- type="qwarn" message="820" -->
+    <!-- type="qwarn" message="821" -->
+    <!-- type="qwarn" message="822" -->
+    <!-- type="qwarn" message="823" -->
+    <!-- type="qwarn" message="824" -->
+    <!-- type="qwarn" message="825" -->
+    <!-- type="qwarn" message="826" -->
+    <!-- type="qwarn" message="827" -->
+    <!-- type="qwarn" message="828" -->
+    <!-- type="qwarn" message="829" -->
+    <!-- type="qwarn" message="830" -->
+    <!-- type="qwarn" message="831" -->
+    <!-- type="qwarn" message="832" -->
+    <!-- type="qwarn" message="833" -->
+    <!-- type="qwarn" message="834" -->
+    <!-- type="qwarn" message="835" -->
+    <!-- type="qwarn" message="836" -->
+    <!-- type="qwarn" message="837" -->
+    <!-- type="qwarn" message="838" -->
+    <!-- type="qwarn" message="839" -->
+    <!-- type="qwarn" message="840" -->
+    <!-- type="qwarn" message="841" -->
+    <!-- type="qwarn" message="842" -->
+    <!-- type="qwarn" message="843" -->
+    <!-- type="qwarn" message="844" -->
+    <!-- type="qwarn" message="845" -->
+    <!-- type="qwarn" message="846" -->
+    <!-- type="qwarn" message="847" -->
+    <!-- type="qwarn" message="848" -->
+    <!-- type="qwarn" message="849" -->
+    <!-- type="qwarn" message="850" -->
+    <!-- type="qwarn" message="851" -->
+    <!-- type="qwarn" message="852" -->
+    <!-- type="qwarn" message="853" -->
+    <!-- type="qwarn" message="854" -->
+    <!-- type="qwarn" message="855" -->
+    <!-- type="qwarn" message="856" -->
+    <!-- type="qwarn" message="857" -->
+    <!-- type="qwarn" message="858" -->
+    <!-- type="qwarn" message="859" -->
+    <!-- type="qwarn" message="860" -->
+    <!-- type="qwarn" message="861" -->
+    <!-- type="qwarn" message="862" -->
+    <!-- type="qwarn" message="863" -->
+    <!-- type="qwarn" message="864" -->
+    <!-- type="qwarn" message="865" -->
+    <!-- type="qwarn" message="866" -->
+    <!-- type="qwarn" message="867" -->
+    <!-- type="qwarn" message="868" -->
+    <!-- type="qwarn" message="869" -->
+    <!-- type="qwarn" message="870" -->
+    <!-- type="qwarn" message="871" -->
+    <!-- type="qwarn" message="872" -->
+    <!-- type="qwarn" message="873" -->
+    <!-- type="qwarn" message="874" -->
+    <!-- type="qwarn" message="875" -->
+    <!-- type="qwarn" message="876" -->
+    <!-- type="qwarn" message="877" -->
+    <!-- type="qwarn" message="878" -->
+    <!-- type="qwarn" message="879" -->
+    <!-- type="qwarn" message="880" -->
+    <!-- type="qwarn" message="881" -->
+    <!-- type="qwarn" message="882" -->
+    <!-- type="qwarn" message="883" -->
+    <!-- type="qwarn" message="884" -->
+    <!-- type="qwarn" message="885" -->
+    <!-- type="qwarn" message="886" -->
+    <!-- type="qwarn" message="887" -->
+    <!-- type="qwarn" message="888" -->
+    <!-- type="qwarn" message="889" -->
+    <!-- type="qwarn" message="890" -->
+    <!-- type="qwarn" message="891" -->
+    <!-- type="qwarn" message="892" -->
+    <!-- type="qwarn" message="893" -->
+    <!-- type="qwarn" message="894" -->
+    <!-- type="qwarn" message="895" -->
+    <!-- type="qwarn" message="896" -->
+    <!-- type="qwarn" message="897" -->
+    <!-- type="qwarn" message="898" -->
+    <!-- type="qwarn" message="899" -->
+    <!-- type="qwarn" message="900" -->
+    <!-- type="qwarn" message="901" -->
+    <!-- type="qwarn" message="902" -->
+    <!-- type="qwarn" message="903" -->
+    <!-- type="qwarn" message="904" -->
+    <!-- type="qwarn" message="905" -->
+    <!-- type="qwarn" message="906" -->
+    <!-- type="qwarn" message="907" -->
+    <!-- type="qwarn" message="908" -->
+    <!-- type="qwarn" message="909" -->
+    <!-- type="qwarn" message="910" -->
+    <!-- type="qwarn" message="911" -->
+    <!-- type="qwarn" message="912" -->
+    <!-- type="qwarn" message="913" -->
+    <!-- type="qwarn" message="914" -->
+    <!-- type="qwarn" message="915" -->
+    <!-- type="qwarn" message="916" -->
+    <!-- type="qwarn" message="917" -->
+    <!-- type="qwarn" message="918" -->
+    <!-- type="qwarn" message="919" -->
+    <!-- type="qwarn" message="920" -->
+    <!-- type="qwarn" message="921" -->
+    <!-- type="qwarn" message="922" -->
+    <!-- type="qwarn" message="923" -->
+    <!-- type="qwarn" message="924" -->
+    <!-- type="qwarn" message="925" -->
+    <!-- type="qwarn" message="926" -->
+    <!-- type="qwarn" message="927" -->
+    <!-- type="qwarn" message="928" -->
+    <!-- type="qwarn" message="929" -->
+    <!-- type="qwarn" message="930" -->
+    <!-- type="qwarn" message="931" -->
+    <!-- type="qwarn" message="932" -->
+    <!-- type="qwarn" message="933" -->
+    <!-- type="qwarn" message="934" -->
+    <!-- type="qwarn" message="935" -->
+    <!-- type="qwarn" message="936" -->
+    <!-- type="qwarn" message="937" -->
+    <!-- type="qwarn" message="938" -->
+    <!-- type="qwarn" message="939" -->
+    <!-- type="qwarn" message="940" -->
+    <!-- type="qwarn" message="941" -->
+    <!-- type="qwarn" message="942" -->
+    <!-- type="qwarn" message="943" -->
+    <!-- type="qwarn" message="944" -->
+    <!-- type="qwarn" message="945" -->
+    <!-- type="qwarn" message="946" -->
+    <!-- type="qwarn" message="947" -->
+    <!-- type="qwarn" message="948" -->
+    <!-- type="qwarn" message="949" -->
+    <!-- type="qwarn" message="950" -->
+    <!-- type="qwarn" message="951" -->
+    <!-- type="qwarn" message="952" -->
+    <!-- type="qwarn" message="953" -->
+    <!-- type="qwarn" message="954" -->
+    <!-- type="qwarn" message="955" -->
+    <!-- type="qwarn" message="956" -->
+    <!-- type="qwarn" message="957" -->
+    <!-- type="qwarn" message="958" -->
+    <!-- type="qwarn" message="959" -->
+    <!-- type="qwarn" message="960" -->
+    <!-- type="qwarn" message="961" -->
+    <!-- type="qwarn" message="962" -->
+    <!-- type="qwarn" message="963" -->
+    <!-- type="qwarn" message="964" -->
+    <!-- type="qwarn" message="965" -->
+    <!-- type="qwarn" message="966" -->
+    <!-- type="qwarn" message="967" -->
+    <!-- type="qwarn" message="968" -->
+    <!-- type="qwarn" message="969" -->
+    <!-- type="qwarn" message="970" -->
+    <!-- type="qwarn" message="971" -->
+    <!-- type="qwarn" message="972" -->
+    <!-- type="qwarn" message="973" -->
+    <!-- type="qwarn" message="974" -->
+    <!-- type="qwarn" message="975" -->
+    <!-- type="qwarn" message="976" -->
+    <!-- type="qwarn" message="977" -->
+    <!-- type="qwarn" message="978" -->
+    <!-- type="qwarn" message="979" -->
+    <!-- type="qwarn" message="980" -->
+    <!-- type="qwarn" message="981" -->
+    <!-- type="qwarn" message="982" -->
+    <!-- type="qwarn" message="983" -->
+    <!-- type="qwarn" message="984" -->
+    <!-- type="qwarn" message="985" -->
+    <!-- type="qwarn" message="986" -->
+    <!-- type="qwarn" message="987" -->
+    <!-- type="qwarn" message="988" -->
+    <!-- type="qwarn" message="989" -->
+    <!-- type="qwarn" message="990" -->
+    <!-- type="qwarn" message="991" -->
+    <!-- type="qwarn" message="992" -->
+    <!-- type="qwarn" message="993" -->
+    <!-- type="qwarn" message="994" -->
+    <!-- type="qwarn" message="995" -->
+    <!-- type="qwarn" message="996" -->
+    <!-- type="qwarn" message="997" -->
+    <!-- type="qwarn" message="998" -->
+    <!-- type="qwarn" message="999" -->
+    <!-- type="qwarn" message="1000" -->
+    <!-- type="qwarn" message="1001" -->
+    <!-- type="qwarn" message="1002" -->
+    <!-- type="qwarn" message="1003" -->
+    <!-- type="qwarn" message="1004" -->
+    <!-- type="qwarn" message="1005" -->
+    <!-- type="qwarn" message="1006" -->
+    <!-- type="qwarn" message="1007" -->
+    <!-- type="qwarn" message="1008" -->
+    <!-- type="qwarn" message="1009" -->
+    <!-- type="qwarn" message="1010" -->
+    <!-- type="qwarn" message="1011" -->
+    <!-- type="qwarn" message="1012" -->
+    <!-- type="qwarn" message="1013" -->
+    <!-- type="qwarn" message="1014" -->
+    <!-- type="qwarn" message="1015" -->
+    <!-- type="qwarn" message="1016" -->
+    <!-- type="qwarn" message="1017" -->
+    <!-- type="qwarn" message="1018" -->
+    <!-- type="qwarn" message="1019" -->
+    <!-- type="qwarn" message="1020" -->
+    <!-- type="qwarn" message="1021" -->
+    <!-- type="qwarn" message="1022" -->
+    <!-- type="qwarn" message="1023" -->
+    <!-- type="qwarn" message="1024" -->
+    <!-- type="qwarn" message="1025" -->
+    <!-- type="qwarn" message="1026" -->
+    <!-- type="qwarn" message="1027" -->
+    <!-- type="qwarn" message="1028" -->
+    <!-- type="qwarn" message="1029" -->
+    <!-- type="qwarn" message="1030" -->
+    <!-- type="qwarn" message="1031" -->
+    <!-- type="qwarn" message="1032" -->
+    <!-- type="qwarn" message="1033" -->
+    <!-- type="qwarn" message="1034" -->
+    <!-- type="qwarn" message="1035" -->
+    <!-- type="qwarn" message="1036" -->
+    <!-- type="qwarn" message="1037" -->
+    <!-- type="qwarn" message="1038" -->
+    <!-- type="qwarn" message="1039" -->
+    <!-- type="qwarn" message="1040" -->
+    <!-- type="qwarn" message="1041" -->
+    <!-- type="qwarn" message="1042" -->
+    <!-- type="qwarn" message="1043" -->
+    <!-- type="qwarn" message="1044" -->
+    <!-- type="qwarn" message="1045" -->
+    <!-- type="qwarn" message="1046" -->
+    <!-- type="qwarn" message="1047" -->
+    <!-- type="qwarn" message="1048" -->
+    <!-- type="qwarn" message="1049" -->
+    <!-- type="qwarn" message="1050" -->
+    <!-- type="qwarn" message="1051" -->
+    <!-- type="qwarn" message="1052" -->
+    <!-- type="qwarn" message="1053" -->
+    <!-- type="qwarn" message="1054" -->
+    <!-- type="qwarn" message="1055" -->
+    <!-- type="qwarn" message="1056" -->
+    <!-- type="qwarn" message="1057" -->
+    <!-- type="qwarn" message="1058" -->
+    <!-- type="qwarn" message="1059" -->
+    <!-- type="qwarn" message="1060" -->
+    <!-- type="qwarn" message="1061" -->
+    <!-- type="qwarn" message="1062" -->
+    <!-- type="qwarn" message="1063" -->
+    <!-- type="qwarn" message="1064" -->
+    <!-- type="qwarn" message="1065" -->
+    <!-- type="qwarn" message="1066" -->
+    <!-- type="qwarn" message="1067" -->
+    <!-- type="qwarn" message="1068" -->
+    <!-- type="qwarn" message="1069" -->
+    <!-- type="qwarn" message="1070" -->
+    <!-- type="qwarn" message="1071" -->
+    <!-- type="qwarn" message="1072" -->
+    <!-- type="qwarn" message="1073" -->
+    <!-- type="qwarn" message="1074" -->
+    <!-- type="qwarn" message="1075" -->
+    <!-- type="qwarn" message="1076" -->
+    <!-- type="qwarn" message="1077" -->
+    <!-- type="qwarn" message="1078" -->
+    <!-- type="qwarn" message="1079" -->
+    <!-- type="qwarn" message="1080" -->
+    <!-- type="qwarn" message="1081" -->
+    <!-- type="qwarn" message="1082" -->
+    <!-- type="qwarn" message="1083" -->
+    <!-- type="qwarn" message="1084" -->
+    <!-- type="qwarn" message="1085" -->
+    <!-- type="qwarn" message="1086" -->
+    <!-- type="qwarn" message="1087" -->
+    <!-- type="qwarn" message="1088" -->
+    <!-- type="qwarn" message="1089" -->
+    <!-- type="qwarn" message="1090" -->
+    <!-- type="qwarn" message="1091" -->
+    <!-- type="qwarn" message="1092" -->
+    <!-- type="qwarn" message="1093" -->
+    <!-- type="qwarn" message="1094" -->
+    <!-- type="qwarn" message="1095" -->
+    <!-- type="qwarn" message="1096" -->
+    <!-- type="qwarn" message="1097" -->
+    <!-- type="qwarn" message="1098" -->
+    <!-- type="qwarn" message="1099" -->
+    <!-- type="qwarn" message="1100" -->
+    <!-- type="qwarn" message="1101" -->
+    <!-- type="qwarn" message="1102" -->
+    <!-- type="qwarn" message="1103" -->
+    <!-- type="qwarn" message="1104" -->
+    <!-- type="qwarn" message="1105" -->
+    <!-- type="qwarn" message="1106" -->
+    <!-- type="qwarn" message="1107" -->
+    <!-- type="qwarn" message="1108" -->
+    <!-- type="qwarn" message="1109" -->
+    <!-- type="qwarn" message="1110" -->
+    <!-- type="qwarn" message="1111" -->
+    <!-- type="qwarn" message="1112" -->
+    <!-- type="qwarn" message="1113" -->
+    <!-- type="qwarn" message="1114" -->
+    <!-- type="qwarn" message="1115" -->
+    <!-- type="qwarn" message="1116" -->
+    <!-- type="qwarn" message="1117" -->
+    <!-- type="qwarn" message="1118" -->
+    <!-- type="qwarn" message="1119" -->
+    <!-- type="qwarn" message="1120" -->
+    <!-- type="qwarn" message="1121" -->
+    <!-- type="qwarn" message="1122" -->
+    <!-- type="qwarn" message="1123" -->
+    <!-- type="qwarn" message="1124" -->
+    <!-- type="qwarn" message="1125" -->
+    <!-- type="qwarn" message="1126" -->
+    <!-- type="qwarn" message="1127" -->
+    <!-- type="qwarn" message="1128" -->
+    <!-- type="qwarn" message="1129" -->
+    <!-- type="qwarn" message="1130" -->
+    <!-- type="qwarn" message="1131" -->
+    <!-- type="qwarn" message="1132" -->
+    <!-- type="qwarn" message="1133" -->
+    <!-- type="qwarn" message="1134" -->
+    <!-- type="qwarn" message="1135" -->
+    <!-- type="qwarn" message="1136" -->
+    <!-- type="qwarn" message="1137" -->
+    <!-- type="qwarn" message="1138" -->
+    <!-- type="qwarn" message="1139" -->
+    <!-- type="qwarn" message="1140" -->
+    <!-- type="qwarn" message="1141" -->
+    <!-- type="qwarn" message="1142" -->
+    <!-- type="qwarn" message="1143" -->
+    <!-- type="qwarn" message="1144" -->
+    <!-- type="qwarn" message="1145" -->
+    <!-- type="qwarn" message="1146" -->
+    <!-- type="qwarn" message="1147" -->
+    <!-- type="qwarn" message="1148" -->
+    <!-- type="qwarn" message="1149" -->
+    <!-- type="qwarn" message="1150" -->
+    <!-- type="qwarn" message="1151" -->
+    <!-- type="qwarn" message="1152" -->
+    <!-- type="qwarn" message="1153" -->
+    <!-- type="qwarn" message="1154" -->
+    <!-- type="qwarn" message="1155" -->
+    <!-- type="qwarn" message="1156" -->
+    <!-- type="qwarn" message="1157" -->
+    <!-- type="qwarn" message="1158" -->
+    <!-- type="qwarn" message="1159" -->
+    <!-- type="qwarn" message="1160" -->
+    <!-- type="qwarn" message="1161" -->
+    <!-- type="qwarn" message="1162" -->
+    <!-- type="qwarn" message="1163" -->
+    <!-- type="qwarn" message="1164" -->
+    <!-- type="qwarn" message="1165" -->
+    <!-- type="qwarn" message="1166" -->
+    <!-- type="qwarn" message="1167" -->
+    <!-- type="qwarn" message="1168" -->
+    <!-- type="qwarn" message="1169" -->
+    <!-- type="qwarn" message="1170" -->
+    <!-- type="qwarn" message="1171" -->
+    <!-- type="qwarn" message="1172" -->
+    <!-- type="qwarn" message="1173" -->
+    <!-- type="qwarn" message="1174" -->
+    <!-- type="qwarn" message="1175" -->
+    <!-- type="qwarn" message="1176" -->
+    <!-- type="qwarn" message="1177" -->
+    <!-- type="qwarn" message="1178" -->
+    <!-- type="qwarn" message="1179" -->
+    <!-- type="qwarn" message="1180" -->
+    <!-- type="qwarn" message="1181" -->
+    <!-- type="qwarn" message="1182" -->
+    <!-- type="qwarn" message="1183" -->
+    <!-- type="qwarn" message="1184" -->
+    <!-- type="qwarn" message="1185" -->
+    <!-- type="qwarn" message="1186" -->
+    <!-- type="qwarn" message="1187" -->
+    <!-- type="qwarn" message="1188" -->
+    <!-- type="qwarn" message="1189" -->
+    <!-- type="qwarn" message="1190" -->
+    <!-- type="qwarn" message="1191" -->
+    <!-- type="qwarn" message="1192" -->
+    <!-- type="qwarn" message="1193" -->
+    <!-- type="qwarn" message="1194" -->
+    <!-- type="qwarn" message="1195" -->
+    <!-- type="qwarn" message="1196" -->
+    <!-- type="qwarn" message="1197" -->
+    <!-- type="qwarn" message="1198" -->
+    <!-- type="qwarn" message="1199" -->
+    <!-- type="qwarn" message="1200" -->
+    <!-- type="qwarn" message="1201" -->
+    <!-- type="qwarn" message="1202" -->
+    <!-- type="qwarn" message="1203" -->
+    <!-- type="qwarn" message="1204" -->
+    <!-- type="qwarn" message="1205" -->
+    <!-- type="qwarn" message="1206" -->
+    <!-- type="qwarn" message="1207" -->
+    <!-- type="qwarn" message="1208" -->
+    <!-- type="qwarn" message="1209" -->
+    <!-- type="qwarn" message="1210" -->
+    <!-- type="qwarn" message="1211" -->
+    <!-- type="qwarn" message="1212" -->
+    <!-- type="qwarn" message="1213" -->
+    <!-- type="qwarn" message="1214" -->
+    <!-- type="qwarn" message="1215" -->
+    <!-- type="qwarn" message="1216" -->
+    <!-- type="qwarn" message="1217" -->
+    <!-- type="qwarn" message="1218" -->
+    <!-- type="qwarn" message="1219" -->
+    <!-- type="qwarn" message="1220" -->
+    <!-- type="qwarn" message="1221" -->
+    <!-- type="qwarn" message="1222" -->
+    <!-- type="qwarn" message="1223" -->
+    <!-- type="qwarn" message="1224" -->
+    <!-- type="qwarn" message="1225" -->
+    <!-- type="qwarn" message="1226" -->
+    <!-- type="qwarn" message="1227" -->
+    <!-- type="qwarn" message="1228" -->
+    <!-- type="qwarn" message="1229" -->
+    <!-- type="qwarn" message="1230" -->
+    <!-- type="qwarn" message="1231" -->
+    <!-- type="qwarn" message="1232" -->
+    <!-- type="qwarn" message="1233" -->
+    <!-- type="qwarn" message="1234" -->
+    <!-- type="qwarn" message="1235" -->
+    <!-- type="qwarn" message="1236" -->
+    <!-- type="qwarn" message="1237" -->
+    <!-- type="qwarn" message="1238" -->
+    <!-- type="qwarn" message="1239" -->
+    <!-- type="qwarn" message="1240" -->
+    <!-- type="qwarn" message="1241" -->
+    <!-- type="qwarn" message="1242" -->
+    <!-- type="qwarn" message="1243" -->
+    <!-- type="qwarn" message="1244" -->
+    <!-- type="qwarn" message="1245" -->
+    <!-- type="qwarn" message="1246" -->
+    <!-- type="qwarn" message="1247" -->
+    <!-- type="qwarn" message="1248" -->
+    <!-- type="qwarn" message="1249" -->
+    <!-- type="qwarn" message="1250" -->
+    <!-- type="qwarn" message="1251" -->
+    <!-- type="qwarn" message="1252" -->
+    <!-- type="qwarn" message="1253" -->
+    <!-- type="qwarn" message="1254" -->
+    <!-- type="qwarn" message="1255" -->
+    <!-- type="qwarn" message="1256" -->
+    <!-- type="qwarn" message="1257" -->
+    <!-- type="qwarn" message="1258" -->
+    <!-- type="qwarn" message="1259" -->
+    <!-- type="qwarn" message="1260" -->
+    <!-- type="qwarn" message="1261" -->
+    <!-- type="qwarn" message="1262" -->
+    <!-- type="qwarn" message="1263" -->
+    <!-- type="qwarn" message="1264" -->
+    <!-- type="qwarn" message="1265" -->
+    <!-- type="qwarn" message="1266" -->
+    <!-- type="qwarn" message="1267" -->
+    <!-- type="qwarn" message="1268" -->
+    <!-- type="qwarn" message="1269" -->
+    <!-- type="qwarn" message="1270" -->
+    <!-- type="qwarn" message="1271" -->
+    <!-- type="qwarn" message="1272" -->
+    <!-- type="qwarn" message="1273" -->
+    <!-- type="qwarn" message="1274" -->
+    <!-- type="qwarn" message="1275" -->
+    <!-- type="qwarn" message="1276" -->
+    <!-- type="qwarn" message="1277" -->
+    <!-- type="qwarn" message="1278" -->
+    <!-- type="qwarn" message="1279" -->
+    <!-- type="qwarn" message="1280" -->
+    <!-- type="qwarn" message="1281" -->
+    <!-- type="qwarn" message="1282" -->
+    <!-- type="qwarn" message="1283" -->
+    <!-- type="qwarn" message="1284" -->
+    <!-- type="qwarn" message="1285" -->
+    <!-- type="qwarn" message="1286" -->
+    <!-- type="qwarn" message="1287" -->
+    <!-- type="qwarn" message="1288" -->
+    <!-- type="qwarn" message="1289" -->
+    <!-- type="qwarn" message="1290" -->
+    <!-- type="qwarn" message="1291" -->
+    <!-- type="qwarn" message="1292" -->
+    <!-- type="qwarn" message="1293" -->
+    <!-- type="qwarn" message="1294" -->
+    <!-- type="qwarn" message="1295" -->
+    <!-- type="qwarn" message="1296" -->
+    <!-- type="qwarn" message="1297" -->
+    <!-- type="qwarn" message="1298" -->
+    <!-- type="qwarn" message="1299" -->
+    <!-- type="qwarn" message="1300" -->
+    <!-- type="qwarn" message="1301" -->
+    <!-- type="qwarn" message="1302" -->
+    <!-- type="qwarn" message="1303" -->
+    <!-- type="qwarn" message="1304" -->
+    <!-- type="qwarn" message="1305" -->
+    <!-- type="qwarn" message="1306" -->
+    <!-- type="qwarn" message="1307" -->
+    <!-- type="qwarn" message="1308" -->
+    <!-- type="qwarn" message="1309" -->
+    <!-- type="qwarn" message="1310" -->
+    <!-- type="qwarn" message="1311" -->
+    <!-- type="qwarn" message="1312" -->
+    <!-- type="qwarn" message="1313" -->
+    <!-- type="qwarn" message="1314" -->
+    <!-- type="qwarn" message="1315" -->
+    <!-- type="qwarn" message="1316" -->
+    <!-- type="qwarn" message="1317" -->
+    <!-- type="qwarn" message="1318" -->
+    <!-- type="qwarn" message="1319" -->
+    <!-- type="qwarn" message="1320" -->
+    <!-- type="qwarn" message="1321" -->
+    <!-- type="qwarn" message="1322" -->
+    <!-- type="qwarn" message="1323" -->
+    <!-- type="qwarn" message="1324" -->
+    <!-- type="qwarn" message="1325" -->
+    <!-- type="qwarn" message="1326" -->
+    <!-- type="qwarn" message="1327" -->
+    <!-- type="qwarn" message="1328" -->
+    <!-- type="qwarn" message="1329" -->
+    <!-- type="qwarn" message="1330" -->
+    <!-- type="qwarn" message="1331" -->
+    <!-- type="qwarn" message="1332" -->
+    <!-- type="qwarn" message="1333" -->
+    <!-- type="qwarn" message="1334" -->
+    <!-- type="qwarn" message="1335" -->
+    <!-- type="qwarn" message="1336" -->
+    <!-- type="qwarn" message="1337" -->
+    <!-- type="qwarn" message="1338" -->
+    <!-- type="qwarn" message="1339" -->
+    <!-- type="qwarn" message="1340" -->
+    <!-- type="qwarn" message="1341" -->
+    <!-- type="qwarn" message="1342" -->
+    <!-- type="qwarn" message="1343" -->
+    <!-- type="qwarn" message="1344" -->
+    <!-- type="qwarn" message="1345" -->
+    <!-- type="qwarn" message="1346" -->
+    <!-- type="qwarn" message="1347" -->
+    <!-- type="qwarn" message="1348" -->
+    <!-- type="qwarn" message="1349" -->
+    <!-- type="qwarn" message="1350" -->
+    <!-- type="qwarn" message="1351" -->
+    <!-- type="qwarn" message="1352" -->
+    <!-- type="qwarn" message="1353" -->
+    <!-- type="qwarn" message="1354" -->
+    <!-- type="qwarn" message="1355" -->
+    <!-- type="qwarn" message="1356" -->
+    <!-- type="qwarn" message="1357" -->
+    <!-- type="qwarn" message="1358" -->
+    <!-- type="qwarn" message="1359" -->
+    <!-- type="qwarn" message="1360" -->
+    <!-- type="qwarn" message="1361" -->
+    <!-- type="qwarn" message="1362" -->
+    <!-- type="qwarn" message="1363" -->
+    <!-- type="qwarn" message="1364" -->
+    <!-- type="qwarn" message="1365" -->
+    <!-- type="qwarn" message="1366" -->
+    <!-- type="qwarn" message="1367" -->
+    <!-- type="qwarn" message="1368" -->
+    <!-- type="qwarn" message="1369" -->
+    <!-- type="qwarn" message="1370" -->
+    <!-- type="qwarn" message="1371" -->
+    <!-- type="qwarn" message="1372" -->
+    <!-- type="qwarn" message="1373" -->
+    <!-- type="qwarn" message="1374" -->
+    <!-- type="qwarn" message="1375" -->
+    <!-- type="qwarn" message="1376" -->
+    <!-- type="qwarn" message="1377" -->
+    <!-- type="qwarn" message="1378" -->
+    <!-- type="qwarn" message="1379" -->
+    <!-- type="qwarn" message="1380" -->
+    <!-- type="qwarn" message="1381" -->
+    <!-- type="qwarn" message="1382" -->
+    <!-- type="qwarn" message="1383" -->
+    <!-- type="qwarn" message="1384" -->
+    <!-- type="qwarn" message="1385" -->
+    <!-- type="qwarn" message="1386" -->
+    <!-- type="qwarn" message="1387" -->
+    <!-- type="qwarn" message="1388" -->
+    <!-- type="qwarn" message="1389" -->
+    <!-- type="qwarn" message="1390" -->
+    <!-- type="qwarn" message="1391" -->
+    <!-- type="qwarn" message="1392" -->
+    <!-- type="qwarn" message="1393" -->
+    <!-- type="qwarn" message="1394" -->
+    <!-- type="qwarn" message="1395" -->
+    <!-- type="qwarn" message="1396" -->
+    <!-- type="qwarn" message="1397" -->
+    <!-- type="qwarn" message="1398" -->
+    <!-- type="qwarn" message="1399" -->
+    <!-- type="qwarn" message="1400" -->
+    <!-- type="qwarn" message="1401" -->
+    <!-- type="qwarn" message="1402" -->
+    <!-- type="qwarn" message="1403" -->
+    <!-- type="qwarn" message="1404" -->
+    <!-- type="qwarn" message="1405" -->
+    <!-- type="qwarn" message="1406" -->
+    <!-- type="qwarn" message="1407" -->
+    <!-- type="qwarn" message="1408" -->
+    <!-- type="qwarn" message="1409" -->
+    <!-- type="qwarn" message="1410" -->
+    <!-- type="qwarn" message="1411" -->
+    <!-- type="qwarn" message="1412" -->
+    <!-- type="qwarn" message="1413" -->
+    <!-- type="qwarn" message="1414" -->
+    <!-- type="qwarn" message="1415" -->
+    <!-- type="qwarn" message="1416" -->
+    <!-- type="qwarn" message="1417" -->
+    <!-- type="qwarn" message="1418" -->
+    <!-- type="qwarn" message="1419" -->
+    <!-- type="qwarn" message="1420" -->
+    <!-- type="qwarn" message="1421" -->
+    <!-- type="qwarn" message="1422" -->
+    <!-- type="qwarn" message="1423" -->
+    <!-- type="qwarn" message="1424" -->
+    <!-- type="qwarn" message="1425" -->
+    <!-- type="qwarn" message="1426" -->
+    <!-- type="qwarn" message="1427" -->
+    <!-- type="qwarn" message="1428" -->
+    <!-- type="qwarn" message="1429" -->
+    <!-- type="qwarn" message="1430" -->
+    <!-- type="qwarn" message="1431" -->
+    <!-- type="qwarn" message="1432" -->
+    <!-- type="qwarn" message="1433" -->
+    <!-- type="qwarn" message="1434" -->
+    <!-- type="qwarn" message="1435" -->
+    <!-- type="qwarn" message="1436" -->
+    <!-- type="qwarn" message="1437" -->
+    <!-- type="qwarn" message="1438" -->
+    <!-- type="qwarn" message="1439" -->
+    <!-- type="qwarn" message="1440" -->
+    <!-- type="qwarn" message="1441" -->
+    <!-- type="qwarn" message="1442" -->
+    <!-- type="qwarn" message="1443" -->
+    <!-- type="qwarn" message="1444" -->
+    <!-- type="qwarn" message="1445" -->
+    <!-- type="qwarn" message="1446" -->
+    <!-- type="qwarn" message="1447" -->
+    <!-- type="qwarn" message="1448" -->
+    <!-- type="qwarn" message="1449" -->
+    <!-- type="qwarn" message="1450" -->
+    <!-- type="qwarn" message="1451" -->
+    <!-- type="qwarn" message="1452" -->
+    <!-- type="qwarn" message="1453" -->
+    <!-- type="qwarn" message="1454" -->
+    <!-- type="qwarn" message="1455" -->
+    <!-- type="qwarn" message="1456" -->
+    <!-- type="qwarn" message="1457" -->
+    <!-- type="qwarn" message="1458" -->
+    <!-- type="qwarn" message="1459" -->
+    <!-- type="qwarn" message="1460" -->
+    <!-- type="qwarn" message="1461" -->
+    <!-- type="qwarn" message="1462" -->
+    <!-- type="qwarn" message="1463" -->
+    <!-- type="qwarn" message="1464" -->
+    <!-- type="qwarn" message="1465" -->
+    <!-- type="qwarn" message="1466" -->
+    <!-- type="qwarn" message="1467" -->
+    <!-- type="qwarn" message="1468" -->
+    <!-- type="qwarn" message="1469" -->
+    <!-- type="qwarn" message="1470" -->
+    <!-- type="qwarn" message="1471" -->
+    <!-- type="qwarn" message="1472" -->
+    <!-- type="qwarn" message="1473" -->
+    <!-- type="qwarn" message="1474" -->
+    <!-- type="qwarn" message="1475" -->
+    <!-- type="qwarn" message="1476" -->
+    <!-- type="qwarn" message="1477" -->
+    <!-- type="qwarn" message="1478" -->
+    <!-- type="qwarn" message="1479" -->
+    <!-- type="qwarn" message="1480" -->
+    <!-- type="qwarn" message="1481" -->
+    <!-- type="qwarn" message="1482" -->
+    <!-- type="qwarn" message="1483" -->
+    <!-- type="qwarn" message="1484" -->
+    <!-- type="qwarn" message="1485" -->
+    <!-- type="qwarn" message="1486" -->
+    <!-- type="qwarn" message="1487" -->
+    <!-- type="qwarn" message="1488" -->
+    <!-- type="qwarn" message="1489" -->
+    <!-- type="qwarn" message="1490" -->
+    <!-- type="qwarn" message="1491" -->
+    <!-- type="qwarn" message="1492" -->
+    <!-- type="qwarn" message="1493" -->
+    <!-- type="qwarn" message="1494" -->
+    <!-- type="qwarn" message="1495" -->
+    <!-- type="qwarn" message="1496" -->
+    <!-- type="qwarn" message="1497" -->
+    <!-- type="qwarn" message="1498" -->
+    <!-- type="qwarn" message="1499" -->
+    <!-- type="qwarn" message="1500" -->
+    <!-- type="qwarn" message="1501" -->
+    <!-- type="qwarn" message="1502" -->
+    <!-- type="qwarn" message="1503" -->
+    <!-- type="qwarn" message="1504" -->
+    <!-- type="qwarn" message="1505" -->
+    <!-- type="qwarn" message="1506" -->
+    <!-- type="qwarn" message="1507" -->
+    <!-- type="qwarn" message="1508" -->
+    <!-- type="qwarn" message="1509" -->
+    <!-- type="qwarn" message="1510" -->
+    <!-- type="qwarn" message="1511" -->
+    <!-- type="qwarn" message="1512" -->
+    <!-- type="qwarn" message="1513" -->
+    <!-- type="qwarn" message="1514" -->
+    <!-- type="qwarn" message="1515" -->
+    <!-- type="qwarn" message="1516" -->
+    <!-- type="qwarn" message="1517" -->
+    <!-- type="qwarn" message="1518" -->
+    <!-- type="qwarn" message="1519" -->
+    <!-- type="qwarn" message="1520" -->
+    <!-- type="qwarn" message="1521" -->
+    <!-- type="qwarn" message="1522" -->
+    <!-- type="qwarn" message="1523" -->
+    <!-- type="qwarn" message="1524" -->
+    <!-- type="qwarn" message="1525" -->
+    <!-- type="qwarn" message="1526" -->
+    <!-- type="qwarn" message="1527" -->
+    <!-- type="qwarn" message="1528" -->
+    <!-- type="qwarn" message="1529" -->
+    <!-- type="qwarn" message="1530" -->
+    <!-- type="qwarn" message="1531" -->
+    <!-- type="qwarn" message="1532" -->
+    <!-- type="qwarn" message="1533" -->
+    <!-- type="qwarn" message="1534" -->
+    <!-- type="qwarn" message="1535" -->
+    <!-- type="qwarn" message="1536" -->
+    <!-- type="qwarn" message="1537" -->
+    <!-- type="qwarn" message="1538" -->
+    <!-- type="qwarn" message="1539" -->
+    <!-- type="qwarn" message="1540" -->
+    <!-- type="qwarn" message="1541" -->
+    <!-- type="qwarn" message="1542" -->
+    <!-- type="qwarn" message="1543" -->
+    <!-- type="qwarn" message="1544" -->
+    <!-- type="qwarn" message="1545" -->
+    <!-- type="qwarn" message="1546" -->
+    <!-- type="qwarn" message="1547" -->
+    <!-- type="qwarn" message="1548" -->
+    <!-- type="qwarn" message="1549" -->
+    <!-- type="qwarn" message="1550" -->
+    <!-- type="qwarn" message="1551" -->
+    <!-- type="qwarn" message="1552" -->
+    <!-- type="qwarn" message="1553" -->
+    <!-- type="qwarn" message="1554" -->
+    <!-- type="qwarn" message="1555" -->
+    <!-- type="qwarn" message="1556" -->
+    <!-- type="qwarn" message="1557" -->
+    <!-- type="qwarn" message="1558" -->
+    <!-- type="qwarn" message="1559" -->
+    <!-- type="qwarn" message="1560" -->
+    <!-- type="qwarn" message="1561" -->
+    <!-- type="qwarn" message="1562" -->
+    <!-- type="qwarn" message="1563" -->
+    <!-- type="qwarn" message="1564" -->
+    <!-- type="qwarn" message="1565" -->
+    <!-- type="qwarn" message="1566" -->
+    <!-- type="qwarn" message="1567" -->
+    <!-- type="qwarn" message="1568" -->
+    <!-- type="qwarn" message="1569" -->
+    <!-- type="qwarn" message="1570" -->
+    <!-- type="qwarn" message="1571" -->
+    <!-- type="qwarn" message="1572" -->
+    <!-- type="qwarn" message="1573" -->
+    <!-- type="qwarn" message="1574" -->
+    <!-- type="qwarn" message="1575" -->
+    <!-- type="qwarn" message="1576" -->
+    <!-- type="qwarn" message="1577" -->
+    <!-- type="qwarn" message="1578" -->
+    <!-- type="qwarn" message="1579" -->
+    <!-- type="qwarn" message="1580" -->
+    <!-- type="qwarn" message="1581" -->
+    <!-- type="qwarn" message="1582" -->
+    <!-- type="qwarn" message="1583" -->
+    <!-- type="qwarn" message="1584" -->
+    <!-- type="qwarn" message="1585" -->
+    <!-- type="qwarn" message="1586" -->
+    <!-- type="qwarn" message="1587" -->
+    <!-- type="qwarn" message="1588" -->
+    <!-- type="qwarn" message="1589" -->
+    <!-- type="qwarn" message="1590" -->
+    <!-- type="qwarn" message="1591" -->
+    <!-- type="qwarn" message="1592" -->
+    <!-- type="qwarn" message="1593" -->
+    <!-- type="qwarn" message="1594" -->
+    <!-- type="qwarn" message="1595" -->
+    <!-- type="qwarn" message="1596" -->
+    <!-- type="qwarn" message="1597" -->
+    <!-- type="qwarn" message="1598" -->
+    <!-- type="qwarn" message="1599" -->
+    <!-- type="qwarn" message="1600" -->
+    <!-- type="qwarn" message="1601" -->
+    <!-- type="qwarn" message="1602" -->
+    <!-- type="qwarn" message="1603" -->
+    <!-- type="qwarn" message="1604" -->
+    <!-- type="qwarn" message="1605" -->
+    <!-- type="qwarn" message="1606" -->
+    <!-- type="qwarn" message="1607" -->
+    <!-- type="qwarn" message="1608" -->
+    <!-- type="qwarn" message="1609" -->
+    <!-- type="qwarn" message="1610" -->
+    <!-- type="qwarn" message="1611" -->
+    <!-- type="qwarn" message="1612" -->
+    <!-- type="qwarn" message="1613" -->
+    <!-- type="qwarn" message="1614" -->
+    <!-- type="qwarn" message="1615" -->
+    <!-- type="qwarn" message="1616" -->
+    <!-- type="qwarn" message="1617" -->
+    <!-- type="qwarn" message="1618" -->
+    <!-- type="qwarn" message="1619" -->
+    <!-- type="qwarn" message="1620" -->
+    <!-- type="qwarn" message="1621" -->
+    <!-- type="qwarn" message="1622" -->
+    <!-- type="qwarn" message="1623" -->
+    <!-- type="qwarn" message="1624" -->
+    <!-- type="qwarn" message="1625" -->
+    <!-- type="qwarn" message="1626" -->
+    <!-- type="qwarn" message="1627" -->
+    <!-- type="qwarn" message="1628" -->
+    <!-- type="qwarn" message="1629" -->
+    <!-- type="qwarn" message="1630" -->
+    <!-- type="qwarn" message="1631" -->
+    <!-- type="qwarn" message="1632" -->
+    <!-- type="qwarn" message="1633" -->
+    <!-- type="qwarn" message="1634" -->
+    <!-- type="qwarn" message="1635" -->
+    <!-- type="qwarn" message="1636" -->
+    <!-- type="qwarn" message="1637" -->
+    <!-- type="qwarn" message="1638" -->
+    <!-- type="qwarn" message="1639" -->
+    <!-- type="qwarn" message="1640" -->
+    <!-- type="qwarn" message="1641" -->
+    <!-- type="qwarn" message="1642" -->
+    <!-- type="qwarn" message="1643" -->
+    <!-- type="qwarn" message="1644" -->
+    <!-- type="qwarn" message="1645" -->
+    <!-- type="qwarn" message="1646" -->
+    <!-- type="qwarn" message="1647" -->
+    <!-- type="qwarn" message="1648" -->
+    <!-- type="qwarn" message="1649" -->
+    <!-- type="qwarn" message="1650" -->
+    <!-- type="qwarn" message="1651" -->
+    <!-- type="qwarn" message="1652" -->
+    <!-- type="qwarn" message="1653" -->
+    <!-- type="qwarn" message="1654" -->
+    <!-- type="qwarn" message="1655" -->
+    <!-- type="qwarn" message="1656" -->
+    <!-- type="qwarn" message="1657" -->
+    <!-- type="qwarn" message="1658" -->
+    <!-- type="qwarn" message="1659" -->
+    <!-- type="qwarn" message="1660" -->
+    <!-- type="qwarn" message="1661" -->
+    <!-- type="qwarn" message="1662" -->
+    <!-- type="qwarn" message="1663" -->
+    <!-- type="qwarn" message="1664" -->
+    <!-- type="qwarn" message="1665" -->
+    <!-- type="qwarn" message="1666" -->
+    <!-- type="qwarn" message="1667" -->
+    <!-- type="qwarn" message="1668" -->
+    <!-- type="qwarn" message="1669" -->
+    <!-- type="qwarn" message="1670" -->
+    <!-- type="qwarn" message="1671" -->
+    <!-- type="qwarn" message="1672" -->
+    <!-- type="qwarn" message="1673" -->
+    <!-- type="qwarn" message="1674" -->
+    <!-- type="qwarn" message="1675" -->
+    <!-- type="qwarn" message="1676" -->
+    <!-- type="qwarn" message="1677" -->
+    <!-- type="qwarn" message="1678" -->
+    <!-- type="qwarn" message="1679" -->
+    <!-- type="qwarn" message="1680" -->
+    <!-- type="qwarn" message="1681" -->
+    <!-- type="qwarn" message="1682" -->
+    <!-- type="qwarn" message="1683" -->
+    <!-- type="qwarn" message="1684" -->
+    <!-- type="qwarn" message="1685" -->
+    <!-- type="qwarn" message="1686" -->
+    <!-- type="qwarn" message="1687" -->
+    <!-- type="qwarn" message="1688" -->
+    <!-- type="qwarn" message="1689" -->
+    <!-- type="qwarn" message="1690" -->
+    <!-- type="qwarn" message="1691" -->
+    <!-- type="qwarn" message="1692" -->
+    <!-- type="qwarn" message="1693" -->
+    <!-- type="qwarn" message="1694" -->
+    <!-- type="qwarn" message="1695" -->
+    <!-- type="qwarn" message="1696" -->
+    <!-- type="qwarn" message="1697" -->
+    <!-- type="qwarn" message="1698" -->
+    <!-- type="qwarn" message="1699" -->
+    <!-- type="qwarn" message="1700" -->
+    <!-- type="qwarn" message="1701" -->
+    <!-- type="qwarn" message="1702" -->
+    <!-- type="qwarn" message="1703" -->
+    <!-- type="qwarn" message="1704" -->
+    <!-- type="qwarn" message="1705" -->
+    <!-- type="qwarn" message="1706" -->
+    <!-- type="qwarn" message="1707" -->
+    <!-- type="qwarn" message="1708" -->
+    <!-- type="qwarn" message="1709" -->
+    <!-- type="qwarn" message="1710" -->
+    <!-- type="qwarn" message="1711" -->
+    <!-- type="qwarn" message="1712" -->
+    <!-- type="qwarn" message="1713" -->
+    <!-- type="qwarn" message="1714" -->
+    <!-- type="qwarn" message="1715" -->
+    <!-- type="qwarn" message="1716" -->
+    <!-- type="qwarn" message="1717" -->
+    <!-- type="qwarn" message="1718" -->
+    <!-- type="qwarn" message="1719" -->
+    <!-- type="qwarn" message="1720" -->
+    <!-- type="qwarn" message="1721" -->
+    <!-- type="qwarn" message="1722" -->
+    <!-- type="qwarn" message="1723" -->
+    <!-- type="qwarn" message="1724" -->
+    <!-- type="qwarn" message="1725" -->
+    <!-- type="qwarn" message="1726" -->
+    <!-- type="qwarn" message="1727" -->
+    <!-- type="qwarn" message="1728" -->
+    <!-- type="qwarn" message="1729" -->
+    <!-- type="qwarn" message="1730" -->
+    <!-- type="qwarn" message="1731" -->
+    <!-- type="qwarn" message="1732" -->
+    <!-- type="qwarn" message="1733" -->
+    <!-- type="qwarn" message="1734" -->
+    <!-- type="qwarn" message="1735" -->
+    <!-- type="qwarn" message="1736" -->
+    <!-- type="qwarn" message="1737" -->
+    <!-- type="qwarn" message="1738" -->
+    <!-- type="qwarn" message="1739" -->
+    <!-- type="qwarn" message="1740" -->
+    <!-- type="qwarn" message="1741" -->
+    <!-- type="qwarn" message="1742" -->
+    <!-- type="qwarn" message="1743" -->
+    <!-- type="qwarn" message="1744" -->
+    <!-- type="qwarn" message="1745" -->
+    <!-- type="qwarn" message="1746" -->
+    <!-- type="qwarn" message="1747" -->
+    <!-- type="qwarn" message="1748" -->
+    <!-- type="qwarn" message="1749" -->
+    <!-- type="qwarn" message="1750" -->
+    <!-- type="qwarn" message="1751" -->
+    <!-- type="qwarn" message="1752" -->
+    <!-- type="qwarn" message="1753" -->
+    <!-- type="qwarn" message="1754" -->
+    <!-- type="qwarn" message="1755" -->
+    <!-- type="qwarn" message="1756" -->
+    <!-- type="qwarn" message="1757" -->
+    <!-- type="qwarn" message="1758" -->
+    <!-- type="qwarn" message="1759" -->
+    <!-- type="qwarn" message="1760" -->
+    <!-- type="qwarn" message="1761" -->
+    <!-- type="qwarn" message="1762" -->
+    <!-- type="qwarn" message="1763" -->
+    <!-- type="qwarn" message="1764" -->
+    <!-- type="qwarn" message="1765" -->
+    <!-- type="qwarn" message="1766" -->
+    <!-- type="qwarn" message="1767" -->
+    <!-- type="qwarn" message="1768" -->
+    <!-- type="qwarn" message="1769" -->
+    <!-- type="qwarn" message="1770" -->
+    <!-- type="qwarn" message="1771" -->
+    <!-- type="qwarn" message="1772" -->
+    <!-- type="qwarn" message="1773" -->
+    <!-- type="qwarn" message="1774" -->
+    <!-- type="qwarn" message="1775" -->
+    <!-- type="qwarn" message="1776" -->
+    <!-- type="qwarn" message="1777" -->
+    <!-- type="qwarn" message="1778" -->
+    <!-- type="qwarn" message="1779" -->
+    <!-- type="qwarn" message="1780" -->
+    <!-- type="qwarn" message="1781" -->
+    <!-- type="qwarn" message="1782" -->
+    <!-- type="qwarn" message="1783" -->
+    <!-- type="qwarn" message="1784" -->
+    <!-- type="qwarn" message="1785" -->
+    <!-- type="qwarn" message="1786" -->
+    <!-- type="qwarn" message="1787" -->
+    <!-- type="qwarn" message="1788" -->
+    <!-- type="qwarn" message="1789" -->
+    <!-- type="qwarn" message="1790" -->
+    <!-- type="qwarn" message="1791" -->
+    <!-- type="qwarn" message="1792" -->
+    <!-- type="qwarn" message="1793" -->
+    <!-- type="qwarn" message="1794" -->
+    <!-- type="qwarn" message="1795" -->
+    <!-- type="qwarn" message="1796" -->
+    <!-- type="qwarn" message="1797" -->
+    <!-- type="qwarn" message="1798" -->
+    <!-- type="qwarn" message="1799" -->
+    <!-- type="qwarn" message="1800" -->
+    <!-- type="qwarn" message="1801" -->
+    <!-- type="qwarn" message="1802" -->
+    <!-- type="qwarn" message="1803" -->
+    <!-- type="qwarn" message="1804" -->
+    <!-- type="qwarn" message="1805" -->
+    <!-- type="qwarn" message="1806" -->
+    <!-- type="qwarn" message="1807" -->
+    <!-- type="qwarn" message="1808" -->
+    <!-- type="qwarn" message="1809" -->
+    <!-- type="qwarn" message="1810" -->
+    <!-- type="qwarn" message="1811" -->
+    <!-- type="qwarn" message="1812" -->
+    <!-- type="qwarn" message="1813" -->
+    <!-- type="qwarn" message="1814" -->
+    <!-- type="qwarn" message="1815" -->
+    <!-- type="qwarn" message="1816" -->
+    <!-- type="qwarn" message="1817" -->
+    <!-- type="qwarn" message="1818" -->
+    <!-- type="qwarn" message="1819" -->
+    <!-- type="qwarn" message="1820" -->
+    <!-- type="qwarn" message="1821" -->
+    <!-- type="qwarn" message="1822" -->
+    <!-- type="qwarn" message="1823" -->
+    <!-- type="qwarn" message="1824" -->
+    <!-- type="qwarn" message="1825" -->
+    <!-- type="qwarn" message="1826" -->
+    <!-- type="qwarn" message="1827" -->
+    <!-- type="qwarn" message="1828" -->
+    <!-- type="qwarn" message="1829" -->
+    <!-- type="qwarn" message="1830" -->
+    <!-- type="qwarn" message="1831" -->
+    <!-- type="qwarn" message="1832" -->
+    <!-- type="qwarn" message="1833" -->
+    <!-- type="qwarn" message="1834" -->
+    <!-- type="qwarn" message="1835" -->
+    <!-- type="qwarn" message="1836" -->
+    <!-- type="qwarn" message="1837" -->
+    <!-- type="qwarn" message="1838" -->
+    <!-- type="qwarn" message="1839" -->
+    <!-- type="qwarn" message="1840" -->
+    <!-- type="qwarn" message="1841" -->
+    <!-- type="qwarn" message="1842" -->
+    <!-- type="qwarn" message="1843" -->
+    <!-- type="qwarn" message="1844" -->
+    <!-- type="qwarn" message="1845" -->
+    <!-- type="qwarn" message="1846" -->
+    <!-- type="qwarn" message="1847" -->
+    <!-- type="qwarn" message="1848" -->
+    <!-- type="qwarn" message="1849" -->
+    <!-- type="qwarn" message="1850" -->
+    <!-- type="qwarn" message="1851" -->
+    <!-- type="qwarn" message="1852" -->
+    <!-- type="qwarn" message="1853" -->
+    <!-- type="qwarn" message="1854" -->
+    <!-- type="qwarn" message="1855" -->
+    <!-- type="qwarn" message="1856" -->
+    <!-- type="qwarn" message="1857" -->
+    <!-- type="qwarn" message="1858" -->
+    <!-- type="qwarn" message="1859" -->
+    <!-- type="qwarn" message="1860" -->
+    <!-- type="qwarn" message="1861" -->
+    <!-- type="qwarn" message="1862" -->
+    <!-- type="qwarn" message="1863" -->
+    <!-- type="qwarn" message="1864" -->
+    <!-- type="qwarn" message="1865" -->
+    <!-- type="qwarn" message="1866" -->
+    <!-- type="qwarn" message="1867" -->
+    <!-- type="qwarn" message="1868" -->
+    <!-- type="qwarn" message="1869" -->
+    <!-- type="qwarn" message="1870" -->
+    <!-- type="qwarn" message="1871" -->
+    <!-- type="qwarn" message="1872" -->
+    <!-- type="qwarn" message="1873" -->
+    <!-- type="qwarn" message="1874" -->
+    <!-- type="qwarn" message="1875" -->
+    <!-- type="qwarn" message="1876" -->
+    <!-- type="qwarn" message="1877" -->
+    <!-- type="qwarn" message="1878" -->
+    <!-- type="qwarn" message="1879" -->
+    <!-- type="qwarn" message="1880" -->
+    <!-- type="qwarn" message="1881" -->
+    <!-- type="qwarn" message="1882" -->
+    <!-- type="qwarn" message="1883" -->
+    <!-- type="qwarn" message="1884" -->
+    <!-- type="qwarn" message="1885" -->
+    <!-- type="qwarn" message="1886" -->
+    <!-- type="qwarn" message="1887" -->
+    <!-- type="qwarn" message="1888" -->
+    <!-- type="qwarn" message="1889" -->
+    <!-- type="qwarn" message="1890" -->
+    <!-- type="qwarn" message="1891" -->
+    <!-- type="qwarn" message="1892" -->
+    <!-- type="qwarn" message="1893" -->
+    <!-- type="qwarn" message="1894" -->
+    <!-- type="qwarn" message="1895" -->
+    <!-- type="qwarn" message="1896" -->
+    <!-- type="qwarn" message="1897" -->
+    <!-- type="qwarn" message="1898" -->
+    <!-- type="qwarn" message="1899" -->
+    <!-- type="qwarn" message="1900" -->
+    <!-- type="qwarn" message="1901" -->
+    <!-- type="qwarn" message="1902" -->
+    <!-- type="qwarn" message="1903" -->
+    <!-- type="qwarn" message="1904" -->
+    <!-- type="qwarn" message="1905" -->
+    <!-- type="qwarn" message="1906" -->
+    <!-- type="qwarn" message="1907" -->
+    <!-- type="qwarn" message="1908" -->
+    <!-- type="qwarn" message="1909" -->
+    <!-- type="qwarn" message="1910" -->
+    <!-- type="qwarn" message="1911" -->
+    <!-- type="qwarn" message="1912" -->
+    <!-- type="qwarn" message="1913" -->
+    <!-- type="qwarn" message="1914" -->
+    <!-- type="qwarn" message="1915" -->
+    <!-- type="qwarn" message="1916" -->
+    <!-- type="qwarn" message="1917" -->
+    <!-- type="qwarn" message="1918" -->
+    <!-- type="qwarn" message="1919" -->
+    <!-- type="qwarn" message="1920" -->
+    <!-- type="qwarn" message="1921" -->
+    <!-- type="qwarn" message="1922" -->
+    <!-- type="qwarn" message="1923" -->
+    <!-- type="qwarn" message="1924" -->
+    <!-- type="qwarn" message="1925" -->
+    <!-- type="qwarn" message="1926" -->
+    <!-- type="qwarn" message="1927" -->
+    <!-- type="qwarn" message="1928" -->
+    <!-- type="qwarn" message="1929" -->
+    <!-- type="qwarn" message="1930" -->
+    <!-- type="qwarn" message="1931" -->
+    <!-- type="qwarn" message="1932" -->
+    <!-- type="qwarn" message="1933" -->
+    <!-- type="qwarn" message="1934" -->
+    <!-- type="qwarn" message="1935" -->
+    <!-- type="qwarn" message="1936" -->
+    <!-- type="qwarn" message="1937" -->
+    <!-- type="qwarn" message="1938" -->
+    <!-- type="qwarn" message="1939" -->
+    <!-- type="qwarn" message="1940" -->
+    <!-- type="qwarn" message="1941" -->
+    <!-- type="qwarn" message="1942" -->
+    <!-- type="qwarn" message="1943" -->
+    <!-- type="qwarn" message="1944" -->
+    <!-- type="qwarn" message="1945" -->
+    <!-- type="qwarn" message="1946" -->
+    <!-- type="qwarn" message="1947" -->
+    <!-- type="qwarn" message="1948" -->
+    <!-- type="qwarn" message="1949" -->
+    <!-- type="qwarn" message="1950" -->
+    <!-- type="qwarn" message="1951" -->
+    <!-- type="qwarn" message="1952" -->
+    <!-- type="qwarn" message="1953" -->
+    <!-- type="qwarn" message="1954" -->
+    <!-- type="qwarn" message="1955" -->
+    <!-- type="qwarn" message="1956" -->
+    <!-- type="qwarn" message="1957" -->
+    <!-- type="qwarn" message="1958" -->
+    <!-- type="qwarn" message="1959" -->
+    <!-- type="qwarn" message="1960" -->
+    <!-- type="qwarn" message="1961" -->
+    <!-- type="qwarn" message="1962" -->
+    <!-- type="qwarn" message="1963" -->
+    <!-- type="qwarn" message="1964" -->
+    <!-- type="qwarn" message="1965" -->
+    <!-- type="qwarn" message="1966" -->
+    <!-- type="qwarn" message="1967" -->
+    <!-- type="qwarn" message="1968" -->
+    <!-- type="qwarn" message="1969" -->
+    <!-- type="qwarn" message="1970" -->
+    <!-- type="qwarn" message="1971" -->
+    <!-- type="qwarn" message="1972" -->
+    <!-- type="qwarn" message="1973" -->
+    <!-- type="qwarn" message="1974" -->
+    <!-- type="qwarn" message="1975" -->
+    <!-- type="qwarn" message="1976" -->
+    <!-- type="qwarn" message="1977" -->
+    <!-- type="qwarn" message="1978" -->
+    <!-- type="qwarn" message="1979" -->
+    <!-- type="qwarn" message="1980" -->
+    <!-- type="qwarn" message="1981" -->
+    <!-- type="qwarn" message="1982" -->
+    <!-- type="qwarn" message="1983" -->
+    <!-- type="qwarn" message="1984" -->
+    <!-- type="qwarn" message="1985" -->
+    <!-- type="qwarn" message="1986" -->
+    <!-- type="qwarn" message="1987" -->
+    <!-- type="qwarn" message="1988" -->
+    <!-- type="qwarn" message="1989" -->
+    <!-- type="qwarn" message="1990" -->
+    <!-- type="qwarn" message="1991" -->
+    <!-- type="qwarn" message="1992" -->
+    <!-- type="qwarn" message="1993" -->
+    <!-- type="qwarn" message="1994" -->
+    <!-- type="qwarn" message="1995" -->
+    <!-- type="qwarn" message="1996" -->
+    <!-- type="qwarn" message="1997" -->
+    <!-- type="qwarn" message="1998" -->
+    <!-- type="qwarn" message="1999" -->
+    <!-- type="qwarn" message="2000" -->
+    <!-- type="system" message="Maximum amount of warnings exceeded. Use &#x002D;maxwarnings to override." -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[0]]>
 <![CDATA[1]]>
diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml
index 8ab914842b..642dee30d3 100644
--- a/tests/auto/testlib/selftests/expected_multiexec.junitxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_Nothing">
+<testsuite name="tst_Nothing" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="nothing"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="nothing" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_Nothing">
+<testsuite name="tst_Nothing" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="nothing"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="nothing" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_Nothing">
+<testsuite name="tst_Nothing" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="nothing"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="nothing" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_Nothing">
+<testsuite name="tst_Nothing" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="nothing"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="nothing" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="3" name="tst_Nothing">
+<testsuite name="tst_Nothing" tests="3" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="nothing"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="nothing" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
index 653dde11c0..96b481b3f5 100644
--- a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
+++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="2" tests="4" name="tst_PairDiagnostics">
+<testsuite name="tst_PairDiagnostics" tests="4" failures="2" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="testQPair">
-    <failure message="Compared values are not the same
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testQPair" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (pair1): &quot;std::pair(1,1)&quot;
-   Expected (pair2): &quot;std::pair(1,2)&quot;" result="fail"/>
+   Expected (pair2): &quot;std::pair(1,2)&quot;"/>
   </testcase>
-  <testcase result="fail" name="testStdPair">
-    <failure message="Compared values are not the same
+  <testcase name="testStdPair" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (pair1): &quot;std::pair(1,1)&quot;
-   Expected (pair2): &quot;std::pair(1,2)&quot;" result="fail"/>
+   Expected (pair2): &quot;std::pair(1,2)&quot;"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_pass.junitxml b/tests/auto/testlib/selftests/expected_pass.junitxml
index b148593bd0..127cf67b4d 100644
--- a/tests/auto/testlib/selftests/expected_pass.junitxml
+++ b/tests/auto/testlib/selftests/expected_pass.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="5" name="tst_Pass">
+<testsuite name="tst_Pass" tests="5" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testNumber1"/>
-  <testcase result="pass" name="testNumber2"/>
-  <testcase result="pass" name="testNumber3"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testNumber1" result="pass"/>
+  <testcase name="testNumber2" result="pass"/>
+  <testcase name="testNumber3" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
index b352b8e6b9..e0a2930dd7 100644
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
+++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="5" name="tst_QExecStringList">
+<testsuite name="tst_QExecStringList" tests="5" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testA"/>
-  <testcase result="pass" name="testB"/>
-  <testcase result="pass" name="testC"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testA" result="pass"/>
+  <testcase name="testB" result="pass"/>
+  <testcase name="testC" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
 ********* Start testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
index 1077816d8d..5d4a5717f6 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
@@ -1,158 +1,158 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="124" failures="0" tests="13" name="tst_Signaldumper">
+<testsuite name="tst_Signaldumper" tests="13" failures="0" errors="124">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="noConnections">
-    <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="noConnections" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
   </testcase>
-  <testcase result="pass" name="oneSlot">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  <testcase name="oneSlot" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="oneSlotOldSyntax">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  <testcase name="oneSlotOldSyntax" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="twoSlots">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  <testcase name="twoSlots" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="twoSlotsOldSyntax">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  <testcase name="twoSlotsOldSyntax" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="signalForwarding">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  <testcase name="signalForwarding" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="signalForwardingOldSyntax">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  <testcase name="signalForwardingOldSyntax" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="slotEmittingSignal">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  <testcase name="slotEmittingSignal" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="slotEmittingSignalOldSyntax">
-    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" type="info" -->
-    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
-    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
-    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
-    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  <testcase name="slotEmittingSignalOldSyntax" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" tag="direct" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
   </testcase>
-  <testcase result="pass" name="variousTypes">
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&amp;)@_POINTER_)" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qListSignal (QList&lt;int&gt;())" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorSignal (QList&lt;int&gt;())" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QList&lt;int&gt;&amp;)@_POINTER_)" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QList&lt;int&gt;())" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QList&lt;int&gt;*)_POINTER_)" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QList&lt;int&gt;*)_POINTER_)" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" type="info" -->
+  <testcase name="variousTypes" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&amp;)@_POINTER_)" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qListSignal (QList&lt;int&gt;())" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorSignal (QList&lt;int&gt;())" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QList&lt;int&gt;&amp;)@_POINTER_)" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QList&lt;int&gt;())" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QList&lt;int&gt;*)_POINTER_)" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QList&lt;int&gt;*)_POINTER_)" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" -->
   </testcase>
-  <testcase result="pass" name="deletingSender">
-    <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+  <testcase name="deletingSender" result="pass">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
diff --git a/tests/auto/testlib/selftests/expected_silent.junitxml b/tests/auto/testlib/selftests/expected_silent.junitxml
index ea229d1dc7..266641d88d 100644
--- a/tests/auto/testlib/selftests/expected_silent.junitxml
+++ b/tests/auto/testlib/selftests/expected_silent.junitxml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="9" failures="3" tests="7" name="tst_Silent">
+<testsuite name="tst_Silent" tests="7" failures="3" errors="9">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="pass"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="pass" result="pass"/>
   <testcase name="skip">
-    <!-- message="This test should skip" type="skip" -->
+    <!-- type="skip" message="This test should skip" -->
   </testcase>
-  <testcase result="fail" name="fail">
-    <failure message="&apos;false&apos; returned FALSE. (This test should fail)" result="fail"/>
+  <testcase name="fail" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. (This test should fail)"/>
   </testcase>
-  <testcase result="xfail" name="xfail">
-    <!-- message="This test should XFAIL" type="info" -->
+  <testcase name="xfail" result="xfail">
+    <!-- type="info" message="This test should XFAIL" -->
   </testcase>
-  <testcase result="xpass" name="xpass">
-    <failure message="&apos;true&apos; returned TRUE unexpectedly. (This test should XPASS)" result="xpass"/>
+  <testcase name="xpass" result="xpass">
+    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. (This test should XPASS)"/>
   </testcase>
-  <testcase result="fail" name="messages">
-    <!-- message="This is a warning that should not appear in silent test output" type="qwarn" -->
-    <!-- message="This is an internal testlib warning that should not appear in silent test output" type="warn" -->
-    <!-- message="This is a debug message that should not appear in silent test output" type="qdebug" -->
-    <!-- message="This is a critical message that should not appear in silent test output" type="system" -->
-    <!-- message="This is an info message that should not appear in silent test output" type="qinfo" -->
-    <!-- message="This is an internal testlib info message that should not appear in silent test output" type="info" -->
-    <!-- message="This is a fatal error message that should still appear in silent test output" type="qfatal" -->
-    <failure message="Received a fatal error." result="fail"/>
+  <testcase name="messages" result="fail">
+    <!-- type="qwarn" message="This is a warning that should not appear in silent test output" -->
+    <!-- type="warn" message="This is an internal testlib warning that should not appear in silent test output" -->
+    <!-- type="qdebug" message="This is a debug message that should not appear in silent test output" -->
+    <!-- type="system" message="This is a critical message that should not appear in silent test output" -->
+    <!-- type="qinfo" message="This is an info message that should not appear in silent test output" -->
+    <!-- type="info" message="This is an internal testlib info message that should not appear in silent test output" -->
+    <!-- type="qfatal" message="This is a fatal error message that should still appear in silent test output" -->
+    <failure result="fail" message="Received a fatal error."/>
   </testcase>
   <system-err>
 <![CDATA[This test should skip]]>
diff --git a/tests/auto/testlib/selftests/expected_singleskip.junitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml
index 2b2da2f504..9057868930 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.junitxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="0" tests="3" name="tst_SingleSkip">
+<testsuite name="tst_SingleSkip" tests="3" failures="0" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
   <testcase name="myTest">
-    <!-- message="skipping test" type="skip" -->
+    <!-- type="skip" message="skipping test" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[skipping test]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml
index 63e582f96a..27e1324e2c 100644
--- a/tests/auto/testlib/selftests/expected_skip.junitxml
+++ b/tests/auto/testlib/selftests/expected_skip.junitxml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="4" failures="0" tests="5" name="tst_Skip">
+<testsuite name="tst_Skip" tests="5" failures="0" errors="4">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
   <testcase name="test">
-    <!-- message="skipping all" type="skip" -->
+    <!-- type="skip" message="skipping all" -->
   </testcase>
   <testcase name="emptytest">
-    <!-- message="skipping all" type="skip" -->
+    <!-- type="skip" message="skipping all" -->
   </testcase>
-  <testcase result="pass" name="singleSkip">
-    <!-- tag="local 1" message="skipping one" type="skip" -->
-    <!-- tag="local 2" message="this line should only be reached once (true)" type="qdebug" -->
+  <testcase name="singleSkip" result="pass">
+    <!-- type="skip" message="skipping one" tag="local 1" -->
+    <!-- type="qdebug" message="this line should only be reached once (true)" tag="local 2" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[skipping all]]>
 <![CDATA[skipping all]]>
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
index 9934584ec5..e6e8c875c0 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="0" tests="3" name="tst_SkipCleanup">
+<testsuite name="tst_SkipCleanup" tests="3" failures="0" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="aTestFunction"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="aTestFunction" result="pass"/>
   <testcase name="cleanupTestCase">
-    <!-- message="Skip inside cleanupTestCase." type="skip" -->
+    <!-- type="skip" message="Skip inside cleanupTestCase." -->
   </testcase>
   <system-err>
 <![CDATA[Skip inside cleanupTestCase.]]>
diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml
index bab08c375c..1158a530ee 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="0" tests="2" name="tst_SkipInit">
+<testsuite name="tst_SkipInit" tests="2" failures="0" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
   <testcase name="initTestCase">
-    <!-- message="Skip inside initTestCase. This should skip all tests in the class." type="skip" -->
+    <!-- type="skip" message="Skip inside initTestCase. This should skip all tests in the class." -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
index e61d50b06b..0ec652deb6 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="0" tests="1" name="tst_SkipInitData">
+<testsuite name="tst_SkipInitData" tests="1" failures="0" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
   <testcase name="initTestCase">
-    <!-- message="Skip inside initTestCase_data. This should skip all tests in the class." type="skip" -->
+    <!-- type="skip" message="Skip inside initTestCase_data. This should skip all tests in the class." -->
   </testcase>
   <system-err>
 <![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]>
diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml
index e4ed66bcb8..688719ebe2 100644
--- a/tests/auto/testlib/selftests/expected_sleep.junitxml
+++ b/tests/auto/testlib/selftests/expected_sleep.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="4" name="tst_Sleep">
+<testsuite name="tst_Sleep" tests="4" failures="0" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="sleep"/>
-  <testcase result="pass" name="wait"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="sleep" result="pass"/>
+  <testcase name="wait" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml
index 66dce857c9..bed04dce93 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.junitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="3" failures="5" tests="8" name="tst_StrCmp">
+<testsuite name="tst_StrCmp" tests="8" failures="5" errors="3">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="compareCharStars"/>
-  <testcase result="fail" name="compareByteArray">
-    <!-- message="Next test should fail" type="info" -->
-    <!-- message="Next test should fail" type="info" -->
-    <!-- message="Next test should fail" type="info" -->
-    <failure message="Compared values are not the same
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="compareCharStars" result="pass"/>
+  <testcase name="compareByteArray" result="fail">
+    <!-- type="info" message="Next test should fail" -->
+    <!-- type="info" message="Next test should fail" -->
+    <!-- type="info" message="Next test should fail" -->
+    <failure result="fail" message="Compared values are not the same
    Actual   (a): &quot;BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB&quot;...
-   Expected (b): &quot;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&quot;..." result="fail"/>
+   Expected (b): &quot;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&quot;..."/>
   </testcase>
-  <testcase result="fail" name="failByteArray">
-    <failure message="Compared values are not the same
+  <testcase name="failByteArray" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;abc&quot;)): &quot;abc&quot;
-   Expected (QByteArray(&quot;cba&quot;)): &quot;cba&quot;" result="fail"/>
+   Expected (QByteArray(&quot;cba&quot;)): &quot;cba&quot;"/>
   </testcase>
-  <testcase result="fail" name="failByteArrayNull">
-    <failure message="Compared values are not the same
+  <testcase name="failByteArrayNull" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;foo&quot;)): &quot;foo&quot;
-   Expected (QByteArray())     : &quot;&quot;" result="fail"/>
+   Expected (QByteArray())     : &quot;&quot;"/>
   </testcase>
-  <testcase result="fail" name="failByteArrayEmpty">
-    <failure message="Compared values are not the same
+  <testcase name="failByteArrayEmpty" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;&quot;))   : &quot;&quot;
-   Expected (QByteArray(&quot;foo&quot;)): &quot;foo&quot;" result="fail"/>
+   Expected (QByteArray(&quot;foo&quot;)): &quot;foo&quot;"/>
   </testcase>
-  <testcase result="fail" name="failByteArraySingleChars">
-    <failure message="Compared values are not the same
+  <testcase name="failByteArraySingleChars" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;6&quot;)): &quot;6&quot;
-   Expected (QByteArray(&quot;7&quot;)): &quot;7&quot;" result="fail"/>
+   Expected (QByteArray(&quot;7&quot;)): &quot;7&quot;"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[Next test should fail]]>
 <![CDATA[Next test should fail]]>
diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml
index b49c006940..a75e9b39a1 100644
--- a/tests/auto/testlib/selftests/expected_subtest.junitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.junitxml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="31" failures="2" tests="5" name="tst_Subtest">
+<testsuite name="tst_Subtest" tests="5" failures="2" errors="31">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase">
-    <!-- message="initTestCase initTestCase (null)" type="qdebug" -->
+  <testcase name="initTestCase" result="pass">
+    <!-- type="qdebug" message="initTestCase initTestCase (null)" -->
   </testcase>
-  <testcase result="pass" name="test1">
-    <!-- message="init test1 (null)" type="qdebug" -->
-    <!-- message="test1 test1 (null)" type="qdebug" -->
-    <!-- message="cleanup test1 (null)" type="qdebug" -->
+  <testcase name="test1" result="pass">
+    <!-- type="qdebug" message="init test1 (null)" -->
+    <!-- type="qdebug" message="test1 test1 (null)" -->
+    <!-- type="qdebug" message="cleanup test1 (null)" -->
   </testcase>
-  <testcase result="pass" name="test2">
-    <!-- message="test2_data test2 (null)" type="qdebug" -->
-    <!-- message="test2_data end" type="qdebug" -->
-    <!-- tag="data0" message="init test2 data0" type="qdebug" -->
-    <!-- tag="data0" message="test2 test2 data0" type="qdebug" -->
-    <!-- tag="data0" message="test2 end" type="qdebug" -->
-    <!-- tag="data0" message="cleanup test2 data0" type="qdebug" -->
-    <!-- tag="data1" message="init test2 data1" type="qdebug" -->
-    <!-- tag="data1" message="test2 test2 data1" type="qdebug" -->
-    <!-- tag="data1" message="test2 end" type="qdebug" -->
-    <!-- tag="data1" message="cleanup test2 data1" type="qdebug" -->
-    <!-- tag="data2" message="init test2 data2" type="qdebug" -->
-    <!-- tag="data2" message="test2 test2 data2" type="qdebug" -->
-    <!-- tag="data2" message="test2 end" type="qdebug" -->
-    <!-- tag="data2" message="cleanup test2 data2" type="qdebug" -->
+  <testcase name="test2" result="pass">
+    <!-- type="qdebug" message="test2_data test2 (null)" -->
+    <!-- type="qdebug" message="test2_data end" -->
+    <!-- type="qdebug" message="init test2 data0" tag="data0" -->
+    <!-- type="qdebug" message="test2 test2 data0" tag="data0" -->
+    <!-- type="qdebug" message="test2 end" tag="data0" -->
+    <!-- type="qdebug" message="cleanup test2 data0" tag="data0" -->
+    <!-- type="qdebug" message="init test2 data1" tag="data1" -->
+    <!-- type="qdebug" message="test2 test2 data1" tag="data1" -->
+    <!-- type="qdebug" message="test2 end" tag="data1" -->
+    <!-- type="qdebug" message="cleanup test2 data1" tag="data1" -->
+    <!-- type="qdebug" message="init test2 data2" tag="data2" -->
+    <!-- type="qdebug" message="test2 test2 data2" tag="data2" -->
+    <!-- type="qdebug" message="test2 end" tag="data2" -->
+    <!-- type="qdebug" message="cleanup test2 data2" tag="data2" -->
   </testcase>
-  <testcase result="fail" name="test3">
-    <!-- message="test3_data test3 (null)" type="qdebug" -->
-    <!-- message="test3_data end" type="qdebug" -->
-    <!-- tag="data0" message="init test3 data0" type="qdebug" -->
-    <!-- tag="data0" message="test2 test3 data0" type="qdebug" -->
-    <!-- tag="data0" message="test2 end" type="qdebug" -->
-    <!-- tag="data0" message="cleanup test3 data0" type="qdebug" -->
-    <!-- tag="data1" message="init test3 data1" type="qdebug" -->
-    <!-- tag="data1" message="test2 test3 data1" type="qdebug" -->
-    <failure tag="data1" message="Compared values are not the same
+  <testcase name="test3" result="fail">
+    <!-- type="qdebug" message="test3_data test3 (null)" -->
+    <!-- type="qdebug" message="test3_data end" -->
+    <!-- type="qdebug" message="init test3 data0" tag="data0" -->
+    <!-- type="qdebug" message="test2 test3 data0" tag="data0" -->
+    <!-- type="qdebug" message="test2 end" tag="data0" -->
+    <!-- type="qdebug" message="cleanup test3 data0" tag="data0" -->
+    <!-- type="qdebug" message="init test3 data1" tag="data1" -->
+    <!-- type="qdebug" message="test2 test3 data1" tag="data1" -->
+    <failure result="fail" message="Compared values are not the same
    Actual   (str)              : &quot;hello1&quot;
-   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;" result="fail"/>
-    <!-- tag="data1" message="cleanup test3 data1" type="qdebug" -->
-    <!-- tag="data2" message="init test3 data2" type="qdebug" -->
-    <!-- tag="data2" message="test2 test3 data2" type="qdebug" -->
-    <failure tag="data2" message="Compared values are not the same
+   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;" tag="data1"/>
+    <!-- type="qdebug" message="cleanup test3 data1" tag="data1" -->
+    <!-- type="qdebug" message="init test3 data2" tag="data2" -->
+    <!-- type="qdebug" message="test2 test3 data2" tag="data2" -->
+    <failure result="fail" message="Compared values are not the same
    Actual   (str)              : &quot;hello2&quot;
-   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;" result="fail"/>
-    <!-- tag="data2" message="cleanup test3 data2" type="qdebug" -->
+   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;" tag="data2"/>
+    <!-- type="qdebug" message="cleanup test3 data2" tag="data2" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase">
-    <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
+  <testcase name="cleanupTestCase" result="pass">
+    <!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" -->
   </testcase>
   <system-err>
 <![CDATA[initTestCase initTestCase (null)]]>
diff --git a/tests/auto/testlib/selftests/expected_testlib.junitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml
index c9c67c7c9a..27eaf2fa97 100644
--- a/tests/auto/testlib/selftests/expected_testlib.junitxml
+++ b/tests/auto/testlib/selftests/expected_testlib.junitxml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="1" tests="5" name="tst_TestLib">
+<testsuite name="tst_TestLib" tests="5" failures="1" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="basics">
-    <failure message="Compared pointers are not the same" result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="basics" result="fail">
+    <failure result="fail" message="Compared pointers are not the same"/>
   </testcase>
-  <testcase result="pass" name="delays"/>
-  <testcase result="pass" name="reals"/>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="delays" result="pass"/>
+  <testcase name="reals" result="pass"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
index 0a276a17f5..e1c9a049ca 100644
--- a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
+++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="2" tests="5" name="tst_TupleDiagnostics">
+<testsuite name="tst_TupleDiagnostics" tests="5" failures="2" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testEmptyTuple"/>
-  <testcase result="fail" name="testSimpleTuple">
-    <failure message="Compared values are not the same
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testEmptyTuple" result="pass"/>
+  <testcase name="testSimpleTuple" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (std::tuple&lt;int&gt;{1}): std::tuple(1)
-   Expected (std::tuple&lt;int&gt;{2}): std::tuple(2)" result="fail"/>
+   Expected (std::tuple&lt;int&gt;{2}): std::tuple(2)"/>
   </testcase>
-  <testcase result="fail" name="testTuple">
-    <failure message="Compared values are not the same
+  <testcase name="testTuple" result="fail">
+    <failure result="fail" message="Compared values are not the same
    Actual   (tuple1): std::tuple(42, &apos;Y&apos;, &quot;tuple1&quot;)
-   Expected (tuple2): std::tuple(42, &apos;Y&apos;, &quot;tuple2&quot;)" result="fail"/>
+   Expected (tuple2): std::tuple(42, &apos;Y&apos;, &quot;tuple2&quot;)"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml
index cb3a7815af..d0b7552555 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.junitxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="10" failures="8" tests="15" name="tst_Counting">
+<testsuite name="tst_Counting" tests="15" failures="8" errors="10">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testPassPass"/>
-  <testcase result="pass" name="testPassSkip">
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testPassPass" result="pass"/>
+  <testcase name="testPassSkip" result="pass">
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testPassFail">
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testPassFail" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="pass" name="testSkipPass">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
+  <testcase name="testSkipPass" result="pass">
+    <!-- type="skip" message="Skipping" tag="row 1" -->
   </testcase>
   <testcase name="testSkipSkip">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testSkipFail">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testSkipFail" result="fail">
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="fail" name="testFailPass">
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testFailPass" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
   </testcase>
-  <testcase result="fail" name="testFailSkip">
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+  <testcase name="testFailSkip" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testFailFail">
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testFailFail" result="fail">
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="fail" name="testFailInInit">
-    <failure tag="fail" message="Fail in init()" result="fail"/>
+  <testcase name="testFailInInit" result="fail">
+    <failure result="fail" message="Fail in init()" tag="fail"/>
   </testcase>
-  <testcase result="fail" name="testFailInCleanup">
-    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" -->
-    <failure tag="fail" message="Fail in cleanup()" result="fail"/>
+  <testcase name="testFailInCleanup" result="fail">
+    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" -->
+    <failure result="fail" message="Fail in cleanup()" tag="fail"/>
   </testcase>
-  <testcase result="pass" name="testSkipInInit">
-    <!-- tag="skip" message="Skip in init()" type="skip" -->
+  <testcase name="testSkipInInit" result="pass">
+    <!-- type="skip" message="Skip in init()" tag="skip" -->
   </testcase>
-  <testcase result="pass" name="testSkipInCleanup">
-    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" -->
-    <!-- tag="skip" message="Skip in cleanup()" type="skip" -->
+  <testcase name="testSkipInCleanup" result="pass">
+    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" -->
+    <!-- type="skip" message="Skip in cleanup()" tag="skip" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml
index 6764a5564f..9e368a0e53 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.junitxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="28" failures="8" tests="15" name="tst_Counting">
+<testsuite name="tst_Counting" tests="15" failures="8" errors="28">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testPassPass">
-    <!-- tag="row 1" message="QVERIFY(true)" type="info" -->
-    <!-- tag="row 1" message="QCOMPARE(2 + 1, 3)" type="info" -->
-    <!-- tag="row 2" message="QVERIFY(true)" type="info" -->
-    <!-- tag="row 2" message="QCOMPARE(2 + 1, 3)" type="info" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testPassPass" result="pass">
+    <!-- type="info" message="QVERIFY(true)" tag="row 1" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" -->
+    <!-- type="info" message="QVERIFY(true)" tag="row 2" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" -->
   </testcase>
-  <testcase result="pass" name="testPassSkip">
-    <!-- tag="row 1" message="QVERIFY(true)" type="info" -->
-    <!-- tag="row 1" message="QCOMPARE(2 + 1, 3)" type="info" -->
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+  <testcase name="testPassSkip" result="pass">
+    <!-- type="info" message="QVERIFY(true)" tag="row 1" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" -->
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testPassFail">
-    <!-- tag="row 1" message="QVERIFY(true)" type="info" -->
-    <!-- tag="row 1" message="QCOMPARE(2 + 1, 3)" type="info" -->
-    <!-- tag="row 2" message="QVERIFY(false)" type="info" -->
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testPassFail" result="fail">
+    <!-- type="info" message="QVERIFY(true)" tag="row 1" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" -->
+    <!-- type="info" message="QVERIFY(false)" tag="row 2" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="pass" name="testSkipPass">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <!-- tag="row 2" message="QVERIFY(true)" type="info" -->
-    <!-- tag="row 2" message="QCOMPARE(2 + 1, 3)" type="info" -->
+  <testcase name="testSkipPass" result="pass">
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <!-- type="info" message="QVERIFY(true)" tag="row 2" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" -->
   </testcase>
   <testcase name="testSkipSkip">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testSkipFail">
-    <!-- tag="row 1" message="Skipping" type="skip" -->
-    <!-- tag="row 2" message="QVERIFY(false)" type="info" -->
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testSkipFail" result="fail">
+    <!-- type="skip" message="Skipping" tag="row 1" -->
+    <!-- type="info" message="QVERIFY(false)" tag="row 2" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="fail" name="testFailPass">
-    <!-- tag="row 1" message="QVERIFY(false)" type="info" -->
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <!-- tag="row 2" message="QVERIFY(true)" type="info" -->
-    <!-- tag="row 2" message="QCOMPARE(2 + 1, 3)" type="info" -->
+  <testcase name="testFailPass" result="fail">
+    <!-- type="info" message="QVERIFY(false)" tag="row 1" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <!-- type="info" message="QVERIFY(true)" tag="row 2" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testFailSkip">
-    <!-- tag="row 1" message="QVERIFY(false)" type="info" -->
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <!-- tag="row 2" message="Skipping" type="skip" -->
+  <testcase name="testFailSkip" result="fail">
+    <!-- type="info" message="QVERIFY(false)" tag="row 1" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <!-- type="skip" message="Skipping" tag="row 2" -->
   </testcase>
-  <testcase result="fail" name="testFailFail">
-    <!-- tag="row 1" message="QVERIFY(false)" type="info" -->
-    <failure tag="row 1" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
-    <!-- tag="row 2" message="QVERIFY(false)" type="info" -->
-    <failure tag="row 2" message="&apos;false&apos; returned FALSE. ()" result="fail"/>
+  <testcase name="testFailFail" result="fail">
+    <!-- type="info" message="QVERIFY(false)" tag="row 1" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+    <!-- type="info" message="QVERIFY(false)" tag="row 2" -->
+    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
   </testcase>
-  <testcase result="fail" name="testFailInInit">
-    <failure tag="fail" message="Fail in init()" result="fail"/>
+  <testcase name="testFailInInit" result="fail">
+    <failure result="fail" message="Fail in init()" tag="fail"/>
   </testcase>
-  <testcase result="fail" name="testFailInCleanup">
-    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" -->
-    <failure tag="fail" message="Fail in cleanup()" result="fail"/>
+  <testcase name="testFailInCleanup" result="fail">
+    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" -->
+    <failure result="fail" message="Fail in cleanup()" tag="fail"/>
   </testcase>
-  <testcase result="pass" name="testSkipInInit">
-    <!-- tag="skip" message="Skip in init()" type="skip" -->
+  <testcase name="testSkipInInit" result="pass">
+    <!-- type="skip" message="Skip in init()" tag="skip" -->
   </testcase>
-  <testcase result="pass" name="testSkipInCleanup">
-    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" -->
-    <!-- tag="skip" message="Skip in cleanup()" type="skip" -->
+  <testcase name="testSkipInCleanup" result="pass">
+    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" -->
+    <!-- type="skip" message="Skip in cleanup()" tag="skip" -->
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[QVERIFY(true)]]>
 <![CDATA[QCOMPARE(2 + 1, 3)]]>
diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
index 003a31a1cc..38fcfed109 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="6" tests="11" name="tst_VerifyExceptionThrown">
+<testsuite name="tst_VerifyExceptionThrown" tests="11" failures="6" errors="0">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testCorrectStdTypes"/>
-  <testcase result="pass" name="testCorrectStdExceptions"/>
-  <testcase result="pass" name="testCorrectMyExceptions"/>
-  <testcase result="fail" name="testFailInt">
-    <failure message="Expected exception of type double to be thrown but unknown exception caught" result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testCorrectStdTypes" result="pass"/>
+  <testcase name="testCorrectStdExceptions" result="pass"/>
+  <testcase name="testCorrectMyExceptions" result="pass"/>
+  <testcase name="testFailInt" result="fail">
+    <failure result="fail" message="Expected exception of type double to be thrown but unknown exception caught"/>
   </testcase>
-  <testcase result="fail" name="testFailStdString">
-    <failure message="Expected exception of type char* to be thrown but unknown exception caught" result="fail"/>
+  <testcase name="testFailStdString" result="fail">
+    <failure result="fail" message="Expected exception of type char* to be thrown but unknown exception caught"/>
   </testcase>
-  <testcase result="fail" name="testFailStdRuntimeError">
-    <failure message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error" result="fail"/>
+  <testcase name="testFailStdRuntimeError" result="fail">
+    <failure result="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error"/>
   </testcase>
-  <testcase result="fail" name="testFailMyException">
-    <failure message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error" result="fail"/>
+  <testcase name="testFailMyException" result="fail">
+    <failure result="fail" message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error"/>
   </testcase>
-  <testcase result="fail" name="testFailMyDerivedException">
-    <failure message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException" result="fail"/>
+  <testcase name="testFailMyDerivedException" result="fail">
+    <failure result="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException"/>
   </testcase>
-  <testcase result="fail" name="testFailNoException">
-    <failure message="Expected exception of type std::exception to be thrown but no exception caught" result="fail"/>
+  <testcase name="testFailNoException" result="fail">
+    <failure result="fail" message="Expected exception of type std::exception to be thrown but no exception caught"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml
index 5cca215f12..f3001cef7c 100644
--- a/tests/auto/testlib/selftests/expected_warnings.junitxml
+++ b/tests/auto/testlib/selftests/expected_warnings.junitxml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="17" failures="4" tests="6" name="tst_Warnings">
+<testsuite name="tst_Warnings" tests="6" failures="4" errors="17">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testWarnings">
-    <!-- message="Warning" type="qwarn" -->
-    <!-- message="Warning" type="qwarn" -->
-    <!-- message="Debug" type="qdebug" -->
-    <!-- message="Debug" type="qdebug" -->
-    <!-- message="Info" type="qinfo" -->
-    <!-- message="Info" type="qinfo" -->
-    <!-- message="Baba" type="qdebug" -->
-    <!-- message="Baba" type="qdebug" -->
-    <!-- message="Bubublabla" type="qdebug" -->
-    <!-- message="Babablabla" type="qwarn" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testWarnings" result="pass">
+    <!-- type="qwarn" message="Warning" -->
+    <!-- type="qwarn" message="Warning" -->
+    <!-- type="qdebug" message="Debug" -->
+    <!-- type="qdebug" message="Debug" -->
+    <!-- type="qinfo" message="Info" -->
+    <!-- type="qinfo" message="Info" -->
+    <!-- type="qdebug" message="Baba" -->
+    <!-- type="qdebug" message="Baba" -->
+    <!-- type="qdebug" message="Bubublabla" -->
+    <!-- type="qwarn" message="Babablabla" -->
   </testcase>
-  <testcase result="fail" name="testMissingWarnings">
-    <!-- message="Did not receive message: &quot;Warning0&quot;" type="info" -->
-    <!-- message="Did not receive message: &quot;Warning1&quot;" type="info" -->
-    <failure message="Not all expected messages were received" result="fail"/>
+  <testcase name="testMissingWarnings" result="fail">
+    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
+    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
+    <failure result="fail" message="Not all expected messages were received"/>
   </testcase>
-  <testcase result="fail" name="testMissingWarningsRegularExpression">
-    <!-- message="Did not receive any message matching: &quot;Warning\s\d&quot;" type="info" -->
-    <failure message="Not all expected messages were received" result="fail"/>
+  <testcase name="testMissingWarningsRegularExpression" result="fail">
+    <!-- type="info" message="Did not receive any message matching: &quot;Warning\s\d&quot;" -->
+    <failure result="fail" message="Not all expected messages were received"/>
   </testcase>
-  <testcase result="fail" name="testMissingWarningsWithData">
-    <!-- tag="first row" message="Did not receive message: &quot;Warning0&quot;" type="info" -->
-    <!-- tag="first row" message="Did not receive message: &quot;Warning1&quot;" type="info" -->
-    <failure tag="first row" message="Not all expected messages were received" result="fail"/>
-    <!-- tag="second row" message="Did not receive message: &quot;Warning0&quot;" type="info" -->
-    <!-- tag="second row" message="Did not receive message: &quot;Warning1&quot;" type="info" -->
-    <failure tag="second row" message="Not all expected messages were received" result="fail"/>
+  <testcase name="testMissingWarningsWithData" result="fail">
+    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" tag="first row" -->
+    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" tag="first row" -->
+    <failure result="fail" message="Not all expected messages were received" tag="first row"/>
+    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" tag="second row" -->
+    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" tag="second row" -->
+    <failure result="fail" message="Not all expected messages were received" tag="second row"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[Warning]]>
 <![CDATA[Warning]]>
diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml
index 7e16ab2c34..79fe78483a 100644
--- a/tests/auto/testlib/selftests/expected_watchdog.junitxml
+++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="1" failures="1" tests="2" name="tst_Watchdog">
+<testsuite name="tst_Watchdog" tests="2" failures="1" errors="1">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="fail" name="delay">
-    <!-- message="Test function timed out" type="qfatal" -->
-    <failure message="Received a fatal error." result="fail"/>
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="delay" result="fail">
+    <!-- type="qfatal" message="Test function timed out" -->
+    <failure result="fail" message="Received a fatal error."/>
   </testcase>
   <system-err>
 <![CDATA[Test function timed out]]>
diff --git a/tests/auto/testlib/selftests/expected_xunit.junitxml b/tests/auto/testlib/selftests/expected_xunit.junitxml
index 395b6efdd9..263681d6bc 100644
--- a/tests/auto/testlib/selftests/expected_xunit.junitxml
+++ b/tests/auto/testlib/selftests/expected_xunit.junitxml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="5" failures="3" tests="9" name="tst_Xunit">
+<testsuite name="tst_Xunit" tests="9" failures="3" errors="5">
   <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="" name="QtBuild"/>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
   </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testFunc1">
-    <!-- message="just a QWARN() !" type="warn" -->
+  <testcase name="initTestCase" result="pass"/>
+  <testcase name="testFunc1" result="pass">
+    <!-- type="warn" message="just a QWARN() !" -->
   </testcase>
-  <testcase result="fail" name="testFunc2">
-    <!-- message="a qDebug() call with comment&#x002D;ending stuff &#x002D;&#x002D;&gt;" type="qdebug" -->
-    <failure message="Compared values are not the same
+  <testcase name="testFunc2" result="fail">
+    <!-- type="qdebug" message="a qDebug() call with comment&#x002D;ending stuff &#x002D;&#x002D;&gt;" -->
+    <failure result="fail" message="Compared values are not the same
    Actual   (2): 2
-   Expected (3): 3" result="fail"/>
+   Expected (3): 3"/>
   </testcase>
   <testcase name="testFunc3">
-    <!-- message="skipping this function!" type="skip" -->
+    <!-- type="skip" message="skipping this function!" -->
   </testcase>
-  <testcase result="fail" name="testFunc4">
-    <failure message="a forced failure!" result="fail"/>
+  <testcase name="testFunc4" result="fail">
+    <failure result="fail" message="a forced failure!"/>
   </testcase>
-  <testcase result="xfail" name="testFunc5">
-    <!-- message="this failure is expected" type="info" -->
+  <testcase name="testFunc5" result="xfail">
+    <!-- type="info" message="this failure is expected" -->
   </testcase>
-  <testcase result="xfail" name="testFunc6">
-    <!-- message="this failure is also expected" type="info" -->
+  <testcase name="testFunc6" result="xfail">
+    <!-- type="info" message="this failure is also expected" -->
   </testcase>
-  <testcase result="xpass" name="testFunc7">
-    <failure message="&apos;true&apos; returned TRUE unexpectedly. ()" result="xpass"/>
+  <testcase name="testFunc7" result="xpass">
+    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
   </testcase>
-  <testcase result="pass" name="cleanupTestCase"/>
+  <testcase name="cleanupTestCase" result="pass"/>
   <system-err>
 <![CDATA[just a QWARN() !]]>
 <![CDATA[a qDebug() call with comment-ending stuff -->]]>
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index b5bc6c1e3c..4c26132706 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -102,7 +102,7 @@ class Cleaner (object):
             # Build details:
             (r'(Config: Using QtTest library).*', r'\1'), # txt
             (r'( *<QtBuild)>[^<]+</QtBuild>', r'\1/>'), # xml, lightxml
-            (r'(<property value=")[^"]+(" name="QtBuild"/>)', r'\1\2'), # junitxml
+            (r'(<property name="QtBuild" value=")[^"]+"', r'\1"'), # junitxml
             # Line numbers in source files:
             (r'(ASSERT: ("|&quot;).*("|&quot;) in file .*, line) \d+', r'\1 0'), # lightxml
             (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 755f5fb39e..d25ea57183 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -221,7 +221,7 @@ bool compareOutput(const QString &logger, const QString &subdir,
 
         if (actualLineBA.startsWith("Config: Using QtTest library") // Text build string
             || actualLineBA.startsWith("    <QtBuild") // XML, Light XML build string
-            || (actualLineBA.startsWith("    <property value=") &&  actualLineBA.endsWith("name=\"QtBuild\"/>"))) { // XUNIT-XML build string
+            || (actualLineBA.startsWith("    <property name=\"QtBuild\" value="))) { // JUnit-XML build string
             continue;
         }
 
-- 
cgit v1.2.3