diff --git a/tests/system/README b/tests/system/README
index 7564980161753d4cbc9a032cf5e5772a15b91ca6..203c9212b29473e15cabebf940c4ce025bbd446a 100644
--- a/tests/system/README
+++ b/tests/system/README
@@ -11,7 +11,10 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK.
 After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages.
 You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files.
 
-Third - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
+Third - some of the test suites/test cases expect Qt 5.0.1 installed in its default location.
+On Linux/Mac this is ~/Qt5.0.1, and on Windows this is C:\Qt\5.0.1.
+
+Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
 These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).
 You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH.
 This folder must contain the following:
@@ -20,7 +23,7 @@ This folder must contain the following:
  * a speedcrunch repository (or source copy) inside 'creator-test-data' named 'speedcrunch'
  * additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below
 
-Fourth - you'll have to make sure that some needed tools are available (no matter on which OS you're on).
+Fifth - you'll have to make sure that some needed tools are available (no matter on which OS you're on).
  * cmake
  * wget or curl
 Normally it should be okay to just install them as usual and add their executables' path(s) to the PATH variable.
diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
index a58ef9831de535f2401170055abd28365de8d964..341dcd6bdaacaaf31ae27b21f283b282dec0261b 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by Qt Creator 2.5.83, 2012-09-26T12:18:04. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-26T13:04:29. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
@@ -18,6 +19,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{4d9ea3ed-a7f0-4b0e-885f-da3b82931988}</value>
    <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -25,8 +27,9 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
@@ -36,6 +39,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{68d379f6-357c-42a6-83c6-7743840db4ea}</value>
    <value type="QString" key="PE.Profile.Name">Qt Simulator</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -43,6 +47,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
     <value type="QString" key="PE.Profile.Device">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
@@ -54,6 +59,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{f559999e-8f5d-4246-9321-ea9d1c444c85}</value>
    <value type="QString" key="PE.Profile.Name">Fremantle</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -61,6 +67,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">/usr/bin/gdb</value>
      <value type="int" key="EngineType">1</value>
@@ -75,6 +82,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{744799ff-3430-41e1-ad7d-d76c50c1c621}</value>
    <value type="QString" key="PE.Profile.Name">Harmattan</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -82,6 +90,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">/usr/bin/gdb</value>
      <value type="int" key="EngineType">1</value>
@@ -96,11 +105,32 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{f16848fc-b615-43b5-b0cc-16a9f57fb573}</value>
    <value type="QString" key="PE.Profile.Name">Embedded Linux</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Profile.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">7</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{9c58fcfd-9e49-4a08-971f-a677dc9ce185}</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
   <variable>Profile.Count</variable>
-  <value type="int">5</value>
+  <value type="int">6</value>
  </data>
  <data>
   <variable>Profile.Default</variable>
diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
index fed739fd8d880a00e7854862681b7143afb9811a..6ec99af4c7cd08f3e2141ce68d0c8ad08db76eb2 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
@@ -52,6 +52,16 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
+ <data>
+  <variable>QtVersion.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">7</value>
+   <value type="QString" key="Name">Desktop Qt 5.0.1 (SQUISH_DEFAULT_COMPILER)</value>
+   <value type="QString" key="QMakePath">~/Qt5.0.1/5.0.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
  <data>
   <variable>Version</variable>
   <value type="int">1</value>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index ef02ba7560771dc7e5092926410d66fcf7852027..4514ec2409ae46d0a6dde771cd367d1c777e3cde 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by Qt Creator 2.5.83, 2012-09-25T18:19:53. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
@@ -18,6 +19,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{897290fe-c35a-4e5e-b5e2-d8e448e2aed1}</value>
    <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -25,8 +27,9 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
@@ -36,6 +39,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{0ce9f69f-0f60-4b04-8691-c328ee5bfe14}</value>
    <value type="QString" key="PE.Profile.Name">Qt Simulator</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -43,6 +47,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-linux-gnueabi.exe</value>
     <value type="QString" key="PE.Profile.Device">{0d112162-56a5-40cb-a911-e0545489da5c}</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
@@ -54,6 +59,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{618722a5-c008-4869-9404-07f755973496}</value>
    <value type="QString" key="PE.Profile.Name">Fremantle</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -61,6 +67,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">C:\QtSDK\pythongdb\python_2.7based\gdb-arm-none-linux-gnueabi.exe</value>
      <value type="int" key="EngineType">1</value>
@@ -75,6 +82,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{3800d54f-6c86-4cd1-88a9-7456bbef6dce}</value>
    <value type="QString" key="PE.Profile.Name">Harmattan</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -82,11 +90,12 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
      <value type="int" key="EngineType">4</value>
     </valuemap>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37}</value>
@@ -96,11 +105,35 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{9b35bbe6-25a7-4cce-ba07-487c795f5265}</value>
    <value type="QString" key="PE.Profile.Name">Desktop 474 MSVC2008</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Profile.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <valuemap type="QVariantMap" key="Debugger.Information">
+     <value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
+     <value type="int" key="EngineType">4</value>
+    </valuemap>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">18</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{175f6238-a585-4e62-b2d3-d15e90296bb6}</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
   <variable>Profile.Count</variable>
-  <value type="int">5</value>
+  <value type="int">6</value>
  </data>
  <data>
   <variable>Profile.Default</variable>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
index 83ca6e82cf581e71702877fa08bd345fcc7a2370..128df0933e5352bdd0ec51f09dabbcdbced120b2 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorQtVersions>
-<!-- Written by Qt Creator 2.5.81, 2012-06-28T17:40:43. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
 <qtcreator>
  <data>
   <variable>QtVersion.0</variable>
@@ -22,26 +22,6 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
- <data>
-  <variable>QtVersion.10</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.11</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">16</value>
-   <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="bool" key="isAutodetected">false</value>
-  </valuemap>
- </data>
  <data>
   <variable>QtVersion.2</variable>
   <valuemap type="QVariantMap">
@@ -92,6 +72,36 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
+ <data>
+  <variable>QtVersion.7</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.8</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">16</value>
+   <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="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.9</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">18</value>
+   <value type="QString" key="Name">Desktop Qt 5.0.1 (msvc2010)</value>
+   <value type="QString" key="QMakePath">C:/Qt/5.0.1/5.0.1/msvc2010/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>Version</variable>
   <value type="int">1</value>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
index 27bae2abb87e2ef8f4bdfd77284781e2c9c7a12f..e5d2fa114d95933462dbcb9d179e80f208c39737 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorToolChains>
-<!-- Written by Qt Creator 2.5.83, 2012-09-25T18:19:53. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
 <qtcreator>
  <data>
   <variable>ToolChain.0</variable>
@@ -43,6 +43,17 @@
  </data>
  <data>
   <variable>ToolChain.3</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2010-pe-32bit</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value>
+   <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">true</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">Microsoft Visual C++ Compiler 10.0 (x86)</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.4</variable>
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2008-pe-32bit</value>
    <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat</value>
@@ -53,7 +64,7 @@
  </data>
  <data>
   <variable>ToolChain.Count</variable>
-  <value type="int">4</value>
+  <value type="int">5</value>
  </data>
  <data>
   <variable>Version</variable>
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index 96b1cc137ef9a14d53f8f4fc49bc80c1c2498289..e9ca05051ad760b0cf5435bc696689684a680b76 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -12,6 +12,7 @@ class QtQuickConstants:
         HARMATTAN = 8
         EMBEDDED_LINUX = 16
         DESKTOP_474_MSVC2008 = 32
+        DESKTOP_501_DEFAULT = 64
 
     @staticmethod
     def desktopTargetClasses():
@@ -45,6 +46,8 @@ class QtQuickConstants:
             return "Embedded Linux"
         elif target==QtQuickConstants.Targets.DESKTOP_474_MSVC2008:
             return "Desktop 474 MSVC2008"
+        elif target==QtQuickConstants.Targets.DESKTOP_501_DEFAULT:
+            return "Desktop 501 default"
         else:
             return None
 
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index b37e3cbb504ff44b8a76eece8a3e14cb452614e0..626a7aa42b31e6a12b65744f8b470015427bbce9 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -273,7 +273,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availabl
         available = availableTargets
     else:
         # following targets depend on the build environment - added for further/later tests
-        available = [QtQuickConstants.Targets.DESKTOP_474_GCC,
+        available = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.DESKTOP_501_DEFAULT,
                      QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.EMBEDDED_LINUX,
                      QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
@@ -466,6 +466,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         result = []
         if 'Desktop' in supports:
             result.append(QtQuickConstants.Targets.DESKTOP_474_GCC)
+            result.append(QtQuickConstants.Targets.DESKTOP_501_DEFAULT)
             if platform.system() in ("Linux", "Darwin"):
                 result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
             elif platform.system() in ('Windows', 'Microsoft'):
@@ -478,8 +479,9 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
             result.append(QtQuickConstants.Targets.SIMULATOR)
     elif 'Platform independent' in text:
         # MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
-        result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.MAEMO5,
-                  QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
+        result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.DESKTOP_501_DEFAULT,
+                  QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
+                  QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
             result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
     else:
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 6d62b54fa43c9f2d508609fcb85545397290c859..d1c5a61eb924c7209b83cf01b87f06ef106a9a88 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -112,22 +112,40 @@ def __removeTestingDir__():
     waitFor('os.path.getmtime(devicesXML) > lastMTime', 5000)
     waitFor('__removeIt__(testingDir)', 2000)
 
-def substituteTildeWithinToolchains(settingsDir):
-    toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
-    origToolchains = toolchains + "_orig"
-    home = os.path.expanduser("~")
-    os.rename(toolchains, origToolchains)
-    origFile = open(origToolchains, "r")
-    modifiedFile = open(toolchains, "w")
+def __substitute__(fileName, search, replace):
+    origFileName = fileName + "_orig"
+    os.rename(fileName, origFileName)
+    origFile = open(origFileName, "r")
+    modifiedFile = open(fileName, "w")
     for line in origFile:
-        if "~" in line:
-            line = line.replace("~", home)
-        modifiedFile.write(line)
+        modifiedFile.write(line.replace(search, replace))
     origFile.close()
     modifiedFile.close()
-    os.remove(origToolchains)
+    os.remove(origFileName)
+
+def substituteTildeWithinToolchains(settingsDir):
+    toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
+    home = os.path.expanduser("~")
+    __substitute__(toolchains, "~", home)
     test.log("Substituted all tildes with '%s' inside toolchains.xml..." % home)
 
+def substituteDefaultCompiler(settingsDir):
+    compiler = None
+    if platform.system() == 'Darwin':
+        compiler = "clang_64"
+    elif platform.system() == 'Linux':
+        if __is64BitOS__():
+            compiler = "gcc_64"
+        else:
+            compiler = "gcc"
+    else:
+        test.warning("Called substituteDefaultCompiler() on wrong platform.",
+                     "This is a script error.")
+    if compiler:
+        qtversion = os.path.join(settingsDir, "QtProject", 'qtcreator', 'qtversion.xml')
+        __substitute__(qtversion, "SQUISH_DEFAULT_COMPILER", compiler)
+        test.log("Injected default compiler '%s' to qtversion.xml..." % compiler)
+
 def __guessABI__(supportedABIs, use64Bit):
     if use64Bit:
         searchFor = "64bit"
@@ -216,6 +234,7 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]):
                 shutil.copy(os.path.join(r, ff), currentPath)
     if platform.system() in ('Linux', 'Darwin'):
         substituteTildeWithinToolchains(tmpSettingsDir)
+        substituteDefaultCompiler(tmpSettingsDir)
     substituteUnchosenTargetABIs(tmpSettingsDir)
     SettingsPath = ' -settingspath "%s"' % tmpSettingsDir
 
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
index 1ff2ef3d360d8bccc8169ce4964e2e6f4b57d44b..ee952828f0af84c0bf2d5d1b5420f073234b95e2 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
@@ -10,9 +10,9 @@ def main():
     test.log("Running project")
     # TODO replace this quickfix with a proper identification of kits
     # changes to createNewQtQuickUI(...) after fixing QTCREATORBUG-8704 will probably handle this
-    kitCount = 1
+    kitCount = 2
     if platform.system() in ('Windows', 'Microsoft'):
-        kitCount = 2
+        kitCount = 3
     qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, 11223)
     if qmlViewer!=None:
         qmlViewerPath = os.path.dirname(qmlViewer)