From 1e4912c70ee2ce8ce7e62bc1daad625070bc4a44 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Wed, 28 Apr 2010 11:51:07 +0200
Subject: tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt
 version.

Otherwise, the tests break when the Qt version changes
---
 tests/auto/selftests/expected_assert.lightxml               | 4 ++--
 tests/auto/selftests/expected_assert.xml                    | 4 ++--
 tests/auto/selftests/expected_assert.xunitxml               | 4 ++--
 tests/auto/selftests/expected_badxml.lightxml               | 4 ++--
 tests/auto/selftests/expected_badxml.xml                    | 4 ++--
 tests/auto/selftests/expected_badxml.xunitxml               | 4 ++--
 tests/auto/selftests/expected_benchlibcallgrind.lightxml    | 4 ++--
 tests/auto/selftests/expected_benchlibcallgrind.xml         | 4 ++--
 tests/auto/selftests/expected_benchlibcallgrind.xunitxml    | 4 ++--
 tests/auto/selftests/expected_benchlibeventcounter.lightxml | 4 ++--
 tests/auto/selftests/expected_benchlibeventcounter.xml      | 4 ++--
 tests/auto/selftests/expected_benchlibeventcounter.xunitxml | 4 ++--
 tests/auto/selftests/expected_benchliboptions.lightxml      | 4 ++--
 tests/auto/selftests/expected_benchliboptions.xml           | 4 ++--
 tests/auto/selftests/expected_benchliboptions.xunitxml      | 4 ++--
 tests/auto/selftests/expected_benchlibtickcounter.lightxml  | 4 ++--
 tests/auto/selftests/expected_benchlibtickcounter.xml       | 4 ++--
 tests/auto/selftests/expected_benchlibtickcounter.xunitxml  | 4 ++--
 tests/auto/selftests/expected_benchlibwalltime.lightxml     | 4 ++--
 tests/auto/selftests/expected_benchlibwalltime.xml          | 4 ++--
 tests/auto/selftests/expected_benchlibwalltime.xunitxml     | 4 ++--
 tests/auto/selftests/expected_cmptest.lightxml              | 4 ++--
 tests/auto/selftests/expected_cmptest.xml                   | 4 ++--
 tests/auto/selftests/expected_cmptest.xunitxml              | 4 ++--
 tests/auto/selftests/expected_commandlinedata.lightxml      | 4 ++--
 tests/auto/selftests/expected_commandlinedata.xml           | 4 ++--
 tests/auto/selftests/expected_commandlinedata.xunitxml      | 4 ++--
 tests/auto/selftests/expected_crashes.lightxml              | 4 ++--
 tests/auto/selftests/expected_crashes.xml                   | 4 ++--
 tests/auto/selftests/expected_crashes.xunitxml              | 4 ++--
 tests/auto/selftests/expected_datatable.lightxml            | 4 ++--
 tests/auto/selftests/expected_datatable.xml                 | 4 ++--
 tests/auto/selftests/expected_datatable.xunitxml            | 4 ++--
 tests/auto/selftests/expected_datetime.lightxml             | 4 ++--
 tests/auto/selftests/expected_datetime.xml                  | 4 ++--
 tests/auto/selftests/expected_datetime.xunitxml             | 4 ++--
 tests/auto/selftests/expected_exceptionthrow.lightxml       | 4 ++--
 tests/auto/selftests/expected_exceptionthrow.xml            | 4 ++--
 tests/auto/selftests/expected_exceptionthrow.xunitxml       | 4 ++--
 tests/auto/selftests/expected_expectfail.lightxml           | 4 ++--
 tests/auto/selftests/expected_expectfail.xml                | 4 ++--
 tests/auto/selftests/expected_expectfail.xunitxml           | 4 ++--
 tests/auto/selftests/expected_failinit.lightxml             | 4 ++--
 tests/auto/selftests/expected_failinit.xml                  | 4 ++--
 tests/auto/selftests/expected_failinit.xunitxml             | 4 ++--
 tests/auto/selftests/expected_failinitdata.lightxml         | 4 ++--
 tests/auto/selftests/expected_failinitdata.xml              | 4 ++--
 tests/auto/selftests/expected_failinitdata.xunitxml         | 4 ++--
 tests/auto/selftests/expected_fetchbogus.lightxml           | 4 ++--
 tests/auto/selftests/expected_fetchbogus.xml                | 4 ++--
 tests/auto/selftests/expected_fetchbogus.xunitxml           | 4 ++--
 tests/auto/selftests/expected_globaldata.lightxml           | 4 ++--
 tests/auto/selftests/expected_globaldata.xml                | 4 ++--
 tests/auto/selftests/expected_globaldata.xunitxml           | 4 ++--
 tests/auto/selftests/expected_longstring.lightxml           | 4 ++--
 tests/auto/selftests/expected_longstring.xml                | 4 ++--
 tests/auto/selftests/expected_longstring.xunitxml           | 4 ++--
 tests/auto/selftests/expected_maxwarnings.lightxml          | 4 ++--
 tests/auto/selftests/expected_maxwarnings.xml               | 4 ++--
 tests/auto/selftests/expected_maxwarnings.xunitxml          | 4 ++--
 tests/auto/selftests/expected_multiexec.lightxml            | 4 ++--
 tests/auto/selftests/expected_multiexec.xml                 | 4 ++--
 tests/auto/selftests/expected_multiexec.xunitxml            | 4 ++--
 tests/auto/selftests/expected_singleskip.lightxml           | 4 ++--
 tests/auto/selftests/expected_singleskip.xml                | 4 ++--
 tests/auto/selftests/expected_singleskip.xunitxml           | 4 ++--
 tests/auto/selftests/expected_skip.lightxml                 | 4 ++--
 tests/auto/selftests/expected_skip.xml                      | 4 ++--
 tests/auto/selftests/expected_skip.xunitxml                 | 4 ++--
 tests/auto/selftests/expected_skipglobal.lightxml           | 4 ++--
 tests/auto/selftests/expected_skipglobal.xml                | 4 ++--
 tests/auto/selftests/expected_skipglobal.xunitxml           | 4 ++--
 tests/auto/selftests/expected_skipinit.lightxml             | 4 ++--
 tests/auto/selftests/expected_skipinit.xml                  | 4 ++--
 tests/auto/selftests/expected_skipinit.xunitxml             | 4 ++--
 tests/auto/selftests/expected_skipinitdata.lightxml         | 4 ++--
 tests/auto/selftests/expected_skipinitdata.xml              | 4 ++--
 tests/auto/selftests/expected_skipinitdata.xunitxml         | 4 ++--
 tests/auto/selftests/expected_sleep.lightxml                | 4 ++--
 tests/auto/selftests/expected_sleep.xml                     | 4 ++--
 tests/auto/selftests/expected_sleep.xunitxml                | 4 ++--
 tests/auto/selftests/expected_strcmp.lightxml               | 4 ++--
 tests/auto/selftests/expected_strcmp.xml                    | 4 ++--
 tests/auto/selftests/expected_strcmp.xunitxml               | 4 ++--
 tests/auto/selftests/expected_subtest.lightxml              | 4 ++--
 tests/auto/selftests/expected_subtest.xml                   | 4 ++--
 tests/auto/selftests/expected_subtest.xunitxml              | 4 ++--
 tests/auto/selftests/expected_warnings.lightxml             | 4 ++--
 tests/auto/selftests/expected_warnings.xml                  | 4 ++--
 tests/auto/selftests/expected_warnings.xunitxml             | 4 ++--
 tests/auto/selftests/expected_xunit.lightxml                | 4 ++--
 tests/auto/selftests/expected_xunit.xml                     | 4 ++--
 tests/auto/selftests/expected_xunit.xunitxml                | 4 ++--
 tests/auto/selftests/tst_selftests.cpp                      | 2 +-
 94 files changed, 187 insertions(+), 187 deletions(-)

diff --git a/tests/auto/selftests/expected_assert.lightxml b/tests/auto/selftests/expected_assert.lightxml
index 50b5376..f49cdf0 100644
--- a/tests/auto/selftests/expected_assert.lightxml
+++ b/tests/auto/selftests/expected_assert.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_assert.xml b/tests/auto/selftests/expected_assert.xml
index 2a77999..3a7152c 100644
--- a/tests/auto/selftests/expected_assert.xml
+++ b/tests/auto/selftests/expected_assert.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Assert">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_assert.xunitxml b/tests/auto/selftests/expected_assert.xunitxml
index 264ae93..2a7d5eb 100644
--- a/tests/auto/selftests/expected_assert.xunitxml
+++ b/tests/auto/selftests/expected_assert.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="1" tests="3" name="tst_Assert">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="testNumber1"/>
diff --git a/tests/auto/selftests/expected_badxml.lightxml b/tests/auto/selftests/expected_badxml.lightxml
index d6a76f2..244f9b3 100644
--- a/tests/auto/selftests/expected_badxml.lightxml
+++ b/tests/auto/selftests/expected_badxml.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_badxml.xml b/tests/auto/selftests/expected_badxml.xml
index c1962c7..86fdd54 100644
--- a/tests/auto/selftests/expected_badxml.xml
+++ b/tests/auto/selftests/expected_badxml.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_BadXml">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_badxml.xunitxml b/tests/auto/selftests/expected_badxml.xunitxml
index 3a410e7..724aed5 100644
--- a/tests/auto/selftests/expected_badxml.xunitxml
+++ b/tests/auto/selftests/expected_badxml.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="8" failures="5" tests="5" name="tst_BadXml">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="fail" name="badDataTag">
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/selftests/expected_benchlibcallgrind.lightxml
index b3959ad..b47cdc4 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.lightxml
+++ b/tests/auto/selftests/expected_benchlibcallgrind.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xml b/tests/auto/selftests/expected_benchlibcallgrind.xml
index e27fbab..12da64f 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.xml
+++ b/tests/auto/selftests/expected_benchlibcallgrind.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_BenchlibCallgrind">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/selftests/expected_benchlibcallgrind.xunitxml
index 61b4b5a..cc58f7f 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml
+++ b/tests/auto/selftests/expected_benchlibcallgrind.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="3" name="tst_BenchlibCallgrind">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="twoHundredMillionInstructions">
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/selftests/expected_benchlibeventcounter.lightxml
index 3e6c444..2d6b727 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.lightxml
+++ b/tests/auto/selftests/expected_benchlibeventcounter.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xml b/tests/auto/selftests/expected_benchlibeventcounter.xml
index 0e29bc4..7fa1fdd 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.xml
+++ b/tests/auto/selftests/expected_benchlibeventcounter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_BenchlibEventCounter">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/selftests/expected_benchlibeventcounter.xunitxml
index 72a8b9e..60dca28 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml
+++ b/tests/auto/selftests/expected_benchlibeventcounter.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="3" name="tst_BenchlibEventCounter">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="events">
diff --git a/tests/auto/selftests/expected_benchliboptions.lightxml b/tests/auto/selftests/expected_benchliboptions.lightxml
index 1138462..7a42cc7 100644
--- a/tests/auto/selftests/expected_benchliboptions.lightxml
+++ b/tests/auto/selftests/expected_benchliboptions.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_benchliboptions.xml b/tests/auto/selftests/expected_benchliboptions.xml
index bcf1ea0..40bff95 100644
--- a/tests/auto/selftests/expected_benchliboptions.xml
+++ b/tests/auto/selftests/expected_benchliboptions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_BenchlibOneHundredMinimum">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_benchliboptions.xunitxml b/tests/auto/selftests/expected_benchliboptions.xunitxml
index f5c776d..7317e90 100644
--- a/tests/auto/selftests/expected_benchliboptions.xunitxml
+++ b/tests/auto/selftests/expected_benchliboptions.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="3" name="tst_BenchlibOneHundredMinimum">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="threeEvents">
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/selftests/expected_benchlibtickcounter.lightxml
index 0071ceb..ea926c2 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.lightxml
+++ b/tests/auto/selftests/expected_benchlibtickcounter.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xml b/tests/auto/selftests/expected_benchlibtickcounter.xml
index 3a63d74..3cd82a2 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.xml
+++ b/tests/auto/selftests/expected_benchlibtickcounter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_BenchlibTickCounter">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/selftests/expected_benchlibtickcounter.xunitxml
index 15ff5ae..28c8f11 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml
+++ b/tests/auto/selftests/expected_benchlibtickcounter.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="3" name="tst_BenchlibTickCounter">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="threeBillionTicks">
diff --git a/tests/auto/selftests/expected_benchlibwalltime.lightxml b/tests/auto/selftests/expected_benchlibwalltime.lightxml
index aa0cc01..500647d 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.lightxml
+++ b/tests/auto/selftests/expected_benchlibwalltime.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_benchlibwalltime.xml b/tests/auto/selftests/expected_benchlibwalltime.xml
index 155fca9..1379d4b 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.xml
+++ b/tests/auto/selftests/expected_benchlibwalltime.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_BenchlibWalltime">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/selftests/expected_benchlibwalltime.xunitxml
index 5b713a9..e4ffca4 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.xunitxml
+++ b/tests/auto/selftests/expected_benchlibwalltime.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="5" name="tst_BenchlibWalltime">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="waitForOneThousand">
diff --git a/tests/auto/selftests/expected_cmptest.lightxml b/tests/auto/selftests/expected_cmptest.lightxml
index 9824dae..a6d35e4 100644
--- a/tests/auto/selftests/expected_cmptest.lightxml
+++ b/tests/auto/selftests/expected_cmptest.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_cmptest.xml b/tests/auto/selftests/expected_cmptest.xml
index 4dd1bc5..7064fcb 100644
--- a/tests/auto/selftests/expected_cmptest.xml
+++ b/tests/auto/selftests/expected_cmptest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Cmptest">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_cmptest.xunitxml b/tests/auto/selftests/expected_cmptest.xunitxml
index dc77fd2..01bfda8 100644
--- a/tests/auto/selftests/expected_cmptest.xunitxml
+++ b/tests/auto/selftests/expected_cmptest.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="4" tests="5" name="tst_Cmptest">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="compare_boolfuncs"/>
diff --git a/tests/auto/selftests/expected_commandlinedata.lightxml b/tests/auto/selftests/expected_commandlinedata.lightxml
index 8763a91..ad1f893 100644
--- a/tests/auto/selftests/expected_commandlinedata.lightxml
+++ b/tests/auto/selftests/expected_commandlinedata.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_commandlinedata.xml b/tests/auto/selftests/expected_commandlinedata.xml
index 95b7a50..bcc8cbd 100644
--- a/tests/auto/selftests/expected_commandlinedata.xml
+++ b/tests/auto/selftests/expected_commandlinedata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_DataTable">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_commandlinedata.xunitxml b/tests/auto/selftests/expected_commandlinedata.xunitxml
index 9c4dbfd..45b833c 100644
--- a/tests/auto/selftests/expected_commandlinedata.xunitxml
+++ b/tests/auto/selftests/expected_commandlinedata.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="6" failures="0" tests="4" name="tst_DataTable">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="fiveTablePasses">
diff --git a/tests/auto/selftests/expected_crashes.lightxml b/tests/auto/selftests/expected_crashes.lightxml
index 60ef540..2eee3cc 100644
--- a/tests/auto/selftests/expected_crashes.lightxml
+++ b/tests/auto/selftests/expected_crashes.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_crashes.xml b/tests/auto/selftests/expected_crashes.xml
index d20cee3..be01e63 100644
--- a/tests/auto/selftests/expected_crashes.xml
+++ b/tests/auto/selftests/expected_crashes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Crashes">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_crashes.xunitxml b/tests/auto/selftests/expected_crashes.xunitxml
index 7b5b552..558491c 100644
--- a/tests/auto/selftests/expected_crashes.xunitxml
+++ b/tests/auto/selftests/expected_crashes.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="1" tests="2" name="tst_Crashes">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="fail" name="crash">
diff --git a/tests/auto/selftests/expected_datatable.lightxml b/tests/auto/selftests/expected_datatable.lightxml
index 681aa10..a1c9d2b 100644
--- a/tests/auto/selftests/expected_datatable.lightxml
+++ b/tests/auto/selftests/expected_datatable.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_datatable.xml b/tests/auto/selftests/expected_datatable.xml
index 4472451..0d12594 100644
--- a/tests/auto/selftests/expected_datatable.xml
+++ b/tests/auto/selftests/expected_datatable.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_DataTable">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_datatable.xunitxml b/tests/auto/selftests/expected_datatable.xunitxml
index 8b23938..6bac80e 100644
--- a/tests/auto/selftests/expected_datatable.xunitxml
+++ b/tests/auto/selftests/expected_datatable.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="13" tests="10" name="tst_DataTable">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="singleTestFunction1"/>
diff --git a/tests/auto/selftests/expected_datetime.lightxml b/tests/auto/selftests/expected_datetime.lightxml
index 054d306..edad6aa 100644
--- a/tests/auto/selftests/expected_datetime.lightxml
+++ b/tests/auto/selftests/expected_datetime.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_datetime.xml b/tests/auto/selftests/expected_datetime.xml
index 7ac35d8..b7b870e 100644
--- a/tests/auto/selftests/expected_datetime.xml
+++ b/tests/auto/selftests/expected_datetime.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_DateTime">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_datetime.xunitxml b/tests/auto/selftests/expected_datetime.xunitxml
index 0c66aa6..b30d1c4 100644
--- a/tests/auto/selftests/expected_datetime.xunitxml
+++ b/tests/auto/selftests/expected_datetime.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="3" tests="4" name="tst_DateTime">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="fail" name="dateTime">
diff --git a/tests/auto/selftests/expected_exceptionthrow.lightxml b/tests/auto/selftests/expected_exceptionthrow.lightxml
index f092a0c..90371e4 100644
--- a/tests/auto/selftests/expected_exceptionthrow.lightxml
+++ b/tests/auto/selftests/expected_exceptionthrow.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_exceptionthrow.xml b/tests/auto/selftests/expected_exceptionthrow.xml
index 69d6e2a..bddbb7d 100644
--- a/tests/auto/selftests/expected_exceptionthrow.xml
+++ b/tests/auto/selftests/expected_exceptionthrow.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Exception">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_exceptionthrow.xunitxml b/tests/auto/selftests/expected_exceptionthrow.xunitxml
index 6fcf70f..ab0d379 100644
--- a/tests/auto/selftests/expected_exceptionthrow.xunitxml
+++ b/tests/auto/selftests/expected_exceptionthrow.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="1" tests="2" name="tst_Exception">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="fail" name="throwException">
diff --git a/tests/auto/selftests/expected_expectfail.lightxml b/tests/auto/selftests/expected_expectfail.lightxml
index 2424ada..d3fb05b 100644
--- a/tests/auto/selftests/expected_expectfail.lightxml
+++ b/tests/auto/selftests/expected_expectfail.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_expectfail.xml b/tests/auto/selftests/expected_expectfail.xml
index 849b16a..670467e 100644
--- a/tests/auto/selftests/expected_expectfail.xml
+++ b/tests/auto/selftests/expected_expectfail.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_ExpectFail">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_expectfail.xunitxml b/tests/auto/selftests/expected_expectfail.xunitxml
index 429093c..32a5cfc 100644
--- a/tests/auto/selftests/expected_expectfail.xunitxml
+++ b/tests/auto/selftests/expected_expectfail.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="7" failures="0" tests="5" name="tst_ExpectFail">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="xfail" name="expectAndContinue">
diff --git a/tests/auto/selftests/expected_failinit.lightxml b/tests/auto/selftests/expected_failinit.lightxml
index 13ba15d..93a4e3f 100644
--- a/tests/auto/selftests/expected_failinit.lightxml
+++ b/tests/auto/selftests/expected_failinit.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/failinit/tst_failinit.cpp" line="55">
diff --git a/tests/auto/selftests/expected_failinit.xml b/tests/auto/selftests/expected_failinit.xml
index 0943586..e1f9e8d 100644
--- a/tests/auto/selftests/expected_failinit.xml
+++ b/tests/auto/selftests/expected_failinit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_FailInit">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/failinit/tst_failinit.cpp" line="55">
diff --git a/tests/auto/selftests/expected_failinit.xunitxml b/tests/auto/selftests/expected_failinit.xunitxml
index 40f9134..3c2e31b 100644
--- a/tests/auto/selftests/expected_failinit.xunitxml
+++ b/tests/auto/selftests/expected_failinit.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="1" tests="2" name="tst_FailInit">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="fail" name="initTestCase">
     <failure message="&apos;false&apos; returned FALSE. ()" result="fail"/>
diff --git a/tests/auto/selftests/expected_failinitdata.lightxml b/tests/auto/selftests/expected_failinitdata.lightxml
index 9fac6f9..56d8c71 100644
--- a/tests/auto/selftests/expected_failinitdata.lightxml
+++ b/tests/auto/selftests/expected_failinitdata.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/failinitdata/tst_failinitdata.cpp" line="56">
diff --git a/tests/auto/selftests/expected_failinitdata.xml b/tests/auto/selftests/expected_failinitdata.xml
index 7ef3e0f..47be1b6 100644
--- a/tests/auto/selftests/expected_failinitdata.xml
+++ b/tests/auto/selftests/expected_failinitdata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_FailInitData">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/failinitdata/tst_failinitdata.cpp" line="56">
diff --git a/tests/auto/selftests/expected_failinitdata.xunitxml b/tests/auto/selftests/expected_failinitdata.xunitxml
index e2c11b0..f32ccd5 100644
--- a/tests/auto/selftests/expected_failinitdata.xunitxml
+++ b/tests/auto/selftests/expected_failinitdata.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="1" tests="1" name="tst_FailInitData">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="fail" name="initTestCase">
     <failure message="&apos;false&apos; returned FALSE. ()" result="fail"/>
diff --git a/tests/auto/selftests/expected_fetchbogus.lightxml b/tests/auto/selftests/expected_fetchbogus.lightxml
index edce196..c53d851 100644
--- a/tests/auto/selftests/expected_fetchbogus.lightxml
+++ b/tests/auto/selftests/expected_fetchbogus.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_fetchbogus.xml b/tests/auto/selftests/expected_fetchbogus.xml
index 9df9b6d..7daa065 100644
--- a/tests/auto/selftests/expected_fetchbogus.xml
+++ b/tests/auto/selftests/expected_fetchbogus.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_FetchBogus">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_fetchbogus.xunitxml b/tests/auto/selftests/expected_fetchbogus.xunitxml
index 864e8a0..fe31b4b 100644
--- a/tests/auto/selftests/expected_fetchbogus.xunitxml
+++ b/tests/auto/selftests/expected_fetchbogus.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="1" tests="2" name="tst_FetchBogus">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="fail" name="fetchBogus">
diff --git a/tests/auto/selftests/expected_globaldata.lightxml b/tests/auto/selftests/expected_globaldata.lightxml
index 47ef0e9..2d195ee 100644
--- a/tests/auto/selftests/expected_globaldata.lightxml
+++ b/tests/auto/selftests/expected_globaldata.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_globaldata.xml b/tests/auto/selftests/expected_globaldata.xml
index 8cafbf8..ea4beb1 100644
--- a/tests/auto/selftests/expected_globaldata.xml
+++ b/tests/auto/selftests/expected_globaldata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Subtest">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_globaldata.xunitxml b/tests/auto/selftests/expected_globaldata.xunitxml
index f444676..d88fdbf 100644
--- a/tests/auto/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/selftests/expected_globaldata.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="3" failures="0" tests="6" name="tst_Subtest">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="testGlobal"/>
diff --git a/tests/auto/selftests/expected_longstring.lightxml b/tests/auto/selftests/expected_longstring.lightxml
index df615a1..a186ccc 100644
--- a/tests/auto/selftests/expected_longstring.lightxml
+++ b/tests/auto/selftests/expected_longstring.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_longstring.xml b/tests/auto/selftests/expected_longstring.xml
index ca352fc..45ad286 100644
--- a/tests/auto/selftests/expected_longstring.xml
+++ b/tests/auto/selftests/expected_longstring.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_LongString">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_longstring.xunitxml b/tests/auto/selftests/expected_longstring.xunitxml
index 0d05f57..6486817 100644
--- a/tests/auto/selftests/expected_longstring.xunitxml
+++ b/tests/auto/selftests/expected_longstring.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="1" tests="3" name="tst_LongString">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="fail" name="failWithLongString">
diff --git a/tests/auto/selftests/expected_maxwarnings.lightxml b/tests/auto/selftests/expected_maxwarnings.lightxml
index fc4552d..f9320ea 100644
--- a/tests/auto/selftests/expected_maxwarnings.lightxml
+++ b/tests/auto/selftests/expected_maxwarnings.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_maxwarnings.xml b/tests/auto/selftests/expected_maxwarnings.xml
index 934607b..2c3736e 100644
--- a/tests/auto/selftests/expected_maxwarnings.xml
+++ b/tests/auto/selftests/expected_maxwarnings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="MaxWarnings">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_maxwarnings.xunitxml b/tests/auto/selftests/expected_maxwarnings.xunitxml
index 1444130..b1b0215 100644
--- a/tests/auto/selftests/expected_maxwarnings.xunitxml
+++ b/tests/auto/selftests/expected_maxwarnings.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="2002" failures="0" tests="3" name="MaxWarnings">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="warn">
diff --git a/tests/auto/selftests/expected_multiexec.lightxml b/tests/auto/selftests/expected_multiexec.lightxml
index 092479c..1f42eac 100644
--- a/tests/auto/selftests/expected_multiexec.lightxml
+++ b/tests/auto/selftests/expected_multiexec.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_multiexec.xml b/tests/auto/selftests/expected_multiexec.xml
index 2a88d32..7f71f6e 100644
--- a/tests/auto/selftests/expected_multiexec.xml
+++ b/tests/auto/selftests/expected_multiexec.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Nothing">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_multiexec.xunitxml b/tests/auto/selftests/expected_multiexec.xunitxml
index 8b7f3ba..6bc04c3 100644
--- a/tests/auto/selftests/expected_multiexec.xunitxml
+++ b/tests/auto/selftests/expected_multiexec.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="3" name="tst_Nothing">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="nothing"/>
diff --git a/tests/auto/selftests/expected_singleskip.lightxml b/tests/auto/selftests/expected_singleskip.lightxml
index 1d414e8..971a999 100644
--- a/tests/auto/selftests/expected_singleskip.lightxml
+++ b/tests/auto/selftests/expected_singleskip.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_singleskip.xml b/tests/auto/selftests/expected_singleskip.xml
index 89119e3..483863e 100644
--- a/tests/auto/selftests/expected_singleskip.xml
+++ b/tests/auto/selftests/expected_singleskip.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_SingleSkip">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_singleskip.xunitxml b/tests/auto/selftests/expected_singleskip.xunitxml
index 0ac8be0..70968fa 100644
--- a/tests/auto/selftests/expected_singleskip.xunitxml
+++ b/tests/auto/selftests/expected_singleskip.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="0" tests="3" name="tst_SingleSkip">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase name="myTest">
diff --git a/tests/auto/selftests/expected_skip.lightxml b/tests/auto/selftests/expected_skip.lightxml
index 86a2a96..145704e 100644
--- a/tests/auto/selftests/expected_skip.lightxml
+++ b/tests/auto/selftests/expected_skip.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_skip.xml b/tests/auto/selftests/expected_skip.xml
index 5c61eb8..3c7b107 100644
--- a/tests/auto/selftests/expected_skip.xml
+++ b/tests/auto/selftests/expected_skip.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Skip">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_skip.xunitxml b/tests/auto/selftests/expected_skip.xunitxml
index 4749906..956d51f 100644
--- a/tests/auto/selftests/expected_skip.xunitxml
+++ b/tests/auto/selftests/expected_skip.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="4" failures="0" tests="5" name="tst_Skip">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase name="test">
diff --git a/tests/auto/selftests/expected_skipglobal.lightxml b/tests/auto/selftests/expected_skipglobal.lightxml
index 61c778f..66084fc 100644
--- a/tests/auto/selftests/expected_skipglobal.lightxml
+++ b/tests/auto/selftests/expected_skipglobal.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipglobal/tst_skipglobal.cpp" line="72">
diff --git a/tests/auto/selftests/expected_skipglobal.xml b/tests/auto/selftests/expected_skipglobal.xml
index 54a5671..4d25bc9 100644
--- a/tests/auto/selftests/expected_skipglobal.xml
+++ b/tests/auto/selftests/expected_skipglobal.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_SkipGlobal">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipglobal/tst_skipglobal.cpp" line="72">
diff --git a/tests/auto/selftests/expected_skipglobal.xunitxml b/tests/auto/selftests/expected_skipglobal.xunitxml
index cf6152f..cc43ec8 100644
--- a/tests/auto/selftests/expected_skipglobal.xunitxml
+++ b/tests/auto/selftests/expected_skipglobal.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="0" tests="1" name="tst_SkipGlobal">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase name="initTestCase">
     <!-- message="Skippy Skippy" type="skip" -->
diff --git a/tests/auto/selftests/expected_skipinit.lightxml b/tests/auto/selftests/expected_skipinit.lightxml
index 0fbcdfb..ea07bd7 100644
--- a/tests/auto/selftests/expected_skipinit.lightxml
+++ b/tests/auto/selftests/expected_skipinit.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipinit/tst_skipinit.cpp" line="55">
diff --git a/tests/auto/selftests/expected_skipinit.xml b/tests/auto/selftests/expected_skipinit.xml
index e8f2772..5118fd1 100644
--- a/tests/auto/selftests/expected_skipinit.xml
+++ b/tests/auto/selftests/expected_skipinit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_SkipInit">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipinit/tst_skipinit.cpp" line="55">
diff --git a/tests/auto/selftests/expected_skipinit.xunitxml b/tests/auto/selftests/expected_skipinit.xunitxml
index 848b539..f62df71 100644
--- a/tests/auto/selftests/expected_skipinit.xunitxml
+++ b/tests/auto/selftests/expected_skipinit.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="0" tests="2" name="tst_SkipInit">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase name="initTestCase">
     <!-- message="Skip inside initTestCase. This should skip all tests in the class." type="skip" -->
diff --git a/tests/auto/selftests/expected_skipinitdata.lightxml b/tests/auto/selftests/expected_skipinitdata.lightxml
index 2caf2cc..bac851e 100644
--- a/tests/auto/selftests/expected_skipinitdata.lightxml
+++ b/tests/auto/selftests/expected_skipinitdata.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp" line="56">
diff --git a/tests/auto/selftests/expected_skipinitdata.xml b/tests/auto/selftests/expected_skipinitdata.xml
index ced753e..05e57b1 100644
--- a/tests/auto/selftests/expected_skipinitdata.xml
+++ b/tests/auto/selftests/expected_skipinitdata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_SkipInitData">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp" line="56">
diff --git a/tests/auto/selftests/expected_skipinitdata.xunitxml b/tests/auto/selftests/expected_skipinitdata.xunitxml
index b761deb..93967eb 100644
--- a/tests/auto/selftests/expected_skipinitdata.xunitxml
+++ b/tests/auto/selftests/expected_skipinitdata.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="1" failures="0" tests="1" name="tst_SkipInitData">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase name="initTestCase">
     <!-- message="Skip inside initTestCase. This should skip all tests in the class." type="skip" -->
diff --git a/tests/auto/selftests/expected_sleep.lightxml b/tests/auto/selftests/expected_sleep.lightxml
index b235385..d7e8ea9 100644
--- a/tests/auto/selftests/expected_sleep.lightxml
+++ b/tests/auto/selftests/expected_sleep.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_sleep.xml b/tests/auto/selftests/expected_sleep.xml
index 2733c75..cbc4d14 100644
--- a/tests/auto/selftests/expected_sleep.xml
+++ b/tests/auto/selftests/expected_sleep.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Sleep">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_sleep.xunitxml b/tests/auto/selftests/expected_sleep.xunitxml
index ec2dac7..409621e 100644
--- a/tests/auto/selftests/expected_sleep.xunitxml
+++ b/tests/auto/selftests/expected_sleep.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" tests="3" name="tst_Sleep">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="sleep"/>
diff --git a/tests/auto/selftests/expected_strcmp.lightxml b/tests/auto/selftests/expected_strcmp.lightxml
index 96e5e2d..40b5da4 100644
--- a/tests/auto/selftests/expected_strcmp.lightxml
+++ b/tests/auto/selftests/expected_strcmp.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_strcmp.xml b/tests/auto/selftests/expected_strcmp.xml
index 953286f..13fe772 100644
--- a/tests/auto/selftests/expected_strcmp.xml
+++ b/tests/auto/selftests/expected_strcmp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_StrCmp">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_strcmp.xunitxml b/tests/auto/selftests/expected_strcmp.xunitxml
index 6ce0c35..c2b694b 100644
--- a/tests/auto/selftests/expected_strcmp.xunitxml
+++ b/tests/auto/selftests/expected_strcmp.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="3" failures="5" tests="8" name="tst_StrCmp">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="compareCharStars"/>
diff --git a/tests/auto/selftests/expected_subtest.lightxml b/tests/auto/selftests/expected_subtest.lightxml
index d9d311c..c2b8d4d 100644
--- a/tests/auto/selftests/expected_subtest.lightxml
+++ b/tests/auto/selftests/expected_subtest.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_subtest.xml b/tests/auto/selftests/expected_subtest.xml
index 8ca16a4..5ecb0a2 100644
--- a/tests/auto/selftests/expected_subtest.xml
+++ b/tests/auto/selftests/expected_subtest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Subtest">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_subtest.xunitxml b/tests/auto/selftests/expected_subtest.xunitxml
index 7d958ff..a5f75fe 100644
--- a/tests/auto/selftests/expected_subtest.xunitxml
+++ b/tests/auto/selftests/expected_subtest.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="7" tests="7" name="tst_Subtest">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="test1"/>
diff --git a/tests/auto/selftests/expected_warnings.lightxml b/tests/auto/selftests/expected_warnings.lightxml
index 9c8be34..4e0ae8a 100644
--- a/tests/auto/selftests/expected_warnings.lightxml
+++ b/tests/auto/selftests/expected_warnings.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_warnings.xml b/tests/auto/selftests/expected_warnings.xml
index 8d22b8c..13e6c1d 100644
--- a/tests/auto/selftests/expected_warnings.xml
+++ b/tests/auto/selftests/expected_warnings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Warnings">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_warnings.xunitxml b/tests/auto/selftests/expected_warnings.xunitxml
index 9c377e5..a96393d 100644
--- a/tests/auto/selftests/expected_warnings.xunitxml
+++ b/tests/auto/selftests/expected_warnings.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="8" failures="1" tests="4" name="tst_Warnings">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="testWarnings">
diff --git a/tests/auto/selftests/expected_xunit.lightxml b/tests/auto/selftests/expected_xunit.lightxml
index d7573f3..726f08d 100644
--- a/tests/auto/selftests/expected_xunit.lightxml
+++ b/tests/auto/selftests/expected_xunit.lightxml
@@ -1,6 +1,6 @@
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0"/>
diff --git a/tests/auto/selftests/expected_xunit.xml b/tests/auto/selftests/expected_xunit.xml
index 39c132b..8992f49 100644
--- a/tests/auto/selftests/expected_xunit.xml
+++ b/tests/auto/selftests/expected_xunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TestCase name="tst_Xunit">
 <Environment>
-    <QtVersion>4.6.3</QtVersion>
-    <QTestVersion>4.6.3</QTestVersion>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
diff --git a/tests/auto/selftests/expected_xunit.xunitxml b/tests/auto/selftests/expected_xunit.xunitxml
index 8d5403c..e77004f 100644
--- a/tests/auto/selftests/expected_xunit.xunitxml
+++ b/tests/auto/selftests/expected_xunit.xunitxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <testsuite errors="5" failures="3" tests="9" name="tst_Xunit">
   <properties>
-    <property value="4.6.3" name="QTestVersion"/>
-    <property value="4.6.3" name="QtVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase"/>
   <testcase result="pass" name="testFunc1">
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index f34e2fb..0ef000c 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -396,7 +396,7 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QString const& logger, Q
             continue;
 
         const QString output(QString::fromLatin1(line));
-        const QString expected(QString::fromLatin1(exp.at(i)).replace("<INSERT_QT_VERSION_HERE>", QT_VERSION_STR));
+        const QString expected(QString::fromLatin1(exp.at(i)).replace("@INSERT_QT_VERSION_HERE@", QT_VERSION_STR));
 
         if (line.contains("ASSERT") && output != expected) {
             QEXPECT_FAIL("assert",          "QTestLib prints out the absolute path.", Continue);
-- 
cgit v0.12