diff --git a/tests/system/settings/unix/Nokia/qtversion.xml b/tests/system/settings/unix/Nokia/qtversion.xml
index 8d8ce4b3c78..b565bd54aee 100644
--- a/tests/system/settings/unix/Nokia/qtversion.xml
+++ b/tests/system/settings/unix/Nokia/qtversion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorQtVersions>
-<!-- Written by Qt Creator 2.2.81, 2011-06-06T16:08:30. -->
+<!-- Written by Qt Creator 2.5.81, 2012-05-07T16:05:36. -->
 <qtcreator>
  <data>
   <variable>QtVersion.0</variable>
@@ -49,8 +49,7 @@
    <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
    <value type="QString" key="QMakePath">~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/qmake</value>
    <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
-   <value type="QString" key="autodetectionSource">SDK.MeeGo_1.2_Harmattan_API</value>
-   <value type="bool" key="isAutodetected">true</value>
+   <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
  <data>
diff --git a/tests/system/settings/windows/Nokia/qtversion.xml b/tests/system/settings/windows/Nokia/qtversion.xml
index cfc45474e60..26c0cad3fd2 100644
--- a/tests/system/settings/windows/Nokia/qtversion.xml
+++ b/tests/system/settings/windows/Nokia/qtversion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorQtVersions>
-<!-- Written by Qt Creator 2.3.81, 2011-09-20T17:17:57. -->
+<!-- Written by Qt Creator 2.5.81, 2012-05-07T16:19:11. -->
 <qtcreator>
  <data>
   <variable>QtVersion.0</variable>
@@ -9,8 +9,7 @@
    <value type="QString" key="Name">Qt 4.7.4 for Desktop - MSVC2008 (Qt SDK)</value>
    <value type="QString" key="QMakePath">c:/qtsdk/desktop/qt/4.7.4/msvc2008/bin/qmake.exe</value>
    <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
-   <value type="QString" key="autodetectionSource">SDK.Desktop4.7.4.msvc2008</value>
-   <value type="bool" key="isAutodetected">true</value>
+   <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
  <data>
@@ -20,100 +19,6 @@
    <value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
    <value type="QString" key="QMakePath">c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe</value>
    <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
-   <value type="QString" key="autodetectionSource">SDK.Maemo4.7.0</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.2</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">8</value>
-   <value type="QString" key="Name">Qt 4.7.4 for Desktop - MinGW 4.4 (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/desktop/qt/4.7.4/mingw/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
-   <value type="QString" key="autodetectionSource">SDK.Desktop4.7.4.mingw44</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.3</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">9</value>
-   <value type="QString" key="Name">Simulator Qt for MinGW 4.4 (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/simulator/qt/mingw/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
-   <value type="QString" key="autodetectionSource">SDK.Simulator.mingw</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.4</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">10</value>
-   <value type="QString" key="Name">Simulator Qt for Visual Studio 2008 (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/simulator/qt/msvc2008/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
-   <value type="QString" key="autodetectionSource">SDK.Simulator.msvc2008</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.5</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">11</value>
-   <value type="QString" key="Name">Qt 4.7.4 for Symbian Belle (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbiansr1qt474/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
-   <value type="QString" key="SBSv2Directory">C:/QtSDK/Symbian/tools/sbs/bin</value>
-   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/SymbianSR1Qt474/</value>
-   <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/SymbianSR1Qt474</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.6</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">12</value>
-   <value type="QString" key="Name">Qt 4.7.4 for Symbian Anna (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian3qt474/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
-   <value type="QString" key="SBSv2Directory">C:/QtSDK/Symbian/tools/sbs/bin</value>
-   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian3Qt474/</value>
-   <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/Symbian3Qt474</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.7</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">13</value>
-   <value type="QString" key="Name">Qt 4.7.3 for S60 5th Edition (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian1qt473/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
-   <value type="QString" key="SBSv2Directory"></value>
-   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian1Qt473/</value>
-   <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/Symbian1Qt473</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.8</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">15</value>
-   <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan_10.2011.34-1/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
-   <value type="QString" key="autodetectionSource">SDK.MeeGo_1.2_Harmattan_API</value>
-   <value type="bool" key="isAutodetected">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.9</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">1</value>
-   <value type="QString" key="Name">Qt 4.8 for Desktop - MSVC2008 (Qt SDK)</value>
-   <value type="QString" key="QMakePath">C:/QtSDK/Desktop/Qt/4.8.0/msvc2008/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
@@ -128,7 +33,7 @@
   </valuemap>
  </data>
  <data>
-  <variable>QtVersion.10</variable>
+  <variable>QtVersion.11</variable>
   <valuemap type="QVariantMap">
    <value type="int" key="Id">3</value>
    <value type="QString" key="Name">Qt 4.8 for Desktop - MinGW (Qt SDK)</value>
@@ -137,6 +42,92 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
+ <data>
+  <variable>QtVersion.2</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">8</value>
+   <value type="QString" key="Name">Qt 4.7.4 for Desktop - MinGW 4.4 (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/desktop/qt/4.7.4/mingw/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.3</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">9</value>
+   <value type="QString" key="Name">Simulator Qt for MinGW 4.4 (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/simulator/qt/mingw/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.4</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">10</value>
+   <value type="QString" key="Name">Simulator Qt for Visual Studio 2008 (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/simulator/qt/msvc2008/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">11</value>
+   <value type="QString" key="Name">Qt 4.7.4 for Symbian Belle (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbiansr1qt474/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
+   <value type="QString" key="SBSv2Directory">C:/QtSDK/Symbian/tools/sbs/bin</value>
+   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/SymbianSR1Qt474/</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.6</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">12</value>
+   <value type="QString" key="Name">Qt 4.7.4 for Symbian Anna (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian3qt474/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
+   <value type="QString" key="SBSv2Directory">C:/QtSDK/Symbian/tools/sbs/bin</value>
+   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian3Qt474/</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.7</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">13</value>
+   <value type="QString" key="Name">Qt 4.7.3 for S60 5th Edition (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian1qt473/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value>
+   <value type="QString" key="SBSv2Directory"></value>
+   <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian1Qt473/</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.8</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">15</value>
+   <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan_10.2011.34-1/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.9</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">1</value>
+   <value type="QString" key="Name">Qt 4.8 for Desktop - MSVC2008 (Qt SDK)</value>
+   <value type="QString" key="QMakePath">C:/QtSDK/Desktop/Qt/4.8.0/msvc2008/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
  <data>
   <variable>QtVersion.Count</variable>
   <value type="int">12</value>