diff --git a/tests/system/settings/unix/Nokia/qtcreator/profiles.xml b/tests/system/settings/unix/Nokia/qtcreator/profiles.xml
index b8a2932fbbfc0013c4f250bda1b31119a79bdd5b..4aec8bfea3782ebbc1bf061cd1783cd648a31daf 100644
--- a/tests/system/settings/unix/Nokia/qtcreator/profiles.xml
+++ b/tests/system/settings/unix/Nokia/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
-<!-- Written by Qt Creator 2.5.81, 2012-07-06T16:56:24. -->
+<!-- Written by Qt Creator 2.5.81, 2012-07-17T17:54:08. -->
<qtcreator>
<data>
<variable>Profile.0</variable>
@@ -11,7 +11,7 @@
<value type="QByteArray" 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:{c8745d08-6963-45af-94fb-5f83c7f32ae4}</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">4</value>
</valuemap>
diff --git a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml b/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fec8907ff4f330797c248874b02e2b0f4548d2b
--- /dev/null
+++ b/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorToolChains>
+<!-- Written by Qt Creator 2.5.81, 2012-07-17T17:54:08. -->
+<qtcreator>
+ <data>
+ <variable>ToolChain.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/g++</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
+ <value type="QString">x86-linux-generic-elf-64bit</value>
+ <value type="QString">x86-linux-generic-elf-32bit</value>
+ </valuelist>
+ <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
+ <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC</value>
+ <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ToolChain.Count</variable>
+ <value type="int">1</value>
+ </data>
+ <data>
+ <variable>Version</variable>
+ <value type="int">1</value>
+ </data>
+</qtcreator>
diff --git a/tests/system/settings/unix/Nokia/toolChains.xml b/tests/system/settings/unix/Nokia/toolChains.xml
deleted file mode 100644
index 5d641648ccbbdadaec5a71f30df50c076fc465ee..0000000000000000000000000000000000000000
--- a/tests/system/settings/unix/Nokia/toolChains.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorToolChains>
-<!-- Written by Qt Creator 2.2.81, 2011-06-06T16:08:33. -->
-<qtcreator>
- <data>
- <variable>ToolChain.Count</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">1</value>
- </data>
-</qtcreator>
diff --git a/tests/system/settings/windows/Nokia/qtcreator/profiles.xml b/tests/system/settings/windows/Nokia/qtcreator/profiles.xml
index 53c7204a4e2376913797e03199d31f0b2aa456ae..f1fbebce1a08b0cc94dc2a234af1661eccf21f6c 100644
--- a/tests/system/settings/windows/Nokia/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/Nokia/qtcreator/profiles.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
-<!-- Written by Qt Creator 2.5.81, 2012-07-06T17:38:45. -->
+<!-- Written by Qt Creator 2.5.81, 2012-07-17T18:31:05. -->
<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="Debugger.Information">C:/Program Files/Debugging Tools for Windows (x64)/cdb.exe</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="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:{8c68b42d-1b79-45cc-822f-dadfdd41b396}</value>
+ <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
- <value type="int" key="QtSupport.QtInformation">7</value>
+ <value type="int" key="QtSupport.QtInformation">8</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{897290fe-c35a-4e5e-b5e2-d8e448e2aed1}</value>
diff --git a/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml b/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5350264958f9b525928c2207c7360ffe5571ebd9
--- /dev/null
+++ b/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorToolChains>
+<!-- Written by Qt Creator 2.5.81, 2012-07-17T18:31:05. -->
+<qtcreator>
+ <data>
+ <variable>ToolChain.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/QtSDK/mingw/bin/g++.exe</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
+ <value type="QString">x86-windows-msys-pe-32bit</value>
+ </valuelist>
+ <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">x86-windows-msys-pe-32bit</value>
+ <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
+ <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MinGW</value>
+ <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ToolChain.Count</variable>
+ <value type="int">1</value>
+ </data>
+ <data>
+ <variable>Version</variable>
+ <value type="int">1</value>
+ </data>
+</qtcreator>
diff --git a/tests/system/settings/windows/Nokia/toolChains.xml b/tests/system/settings/windows/Nokia/toolChains.xml
deleted file mode 100644
index 2b189f62fe8c869bef2b4ef3d789648b05fd29d1..0000000000000000000000000000000000000000
--- a/tests/system/settings/windows/Nokia/toolChains.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorToolChains>
-<!-- Written by Qt Creator 2.2.81, 2011-05-30T15:56:04. -->
-<qtcreator>
- <data>
- <variable>ToolChain.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.GccToolChain.Debugger">C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
- <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/QtSDK/mingw/bin/g++.exe</value>
- <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">x86-windows-msys-pe-32bit</value>
- <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">MinGW from SDK</value>
- <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:C:/QtSDK/mingw/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
- </valuemap>
- </data>
- <data>
- <variable>ToolChain.1</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.GccToolChain.Debugger">C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-symbianelf.exe</value>
- <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/QtSDK/Symbian/tools/gcce4/bin/arm-none-symbianelf-g++.exe</value>
- <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">arm-symbian-device-elf-32bit</value>
- <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCCE from SDK</value>
- <value type="QString" key="ProjectExplorer.ToolChain.Id">Qt4ProjectManager.ToolChain.GCCE:C:/QtSDK/Symbian/tools/gcce4/bin/arm-none-symbianelf-g++.exe.arm-symbian-device-elf-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-symbianelf.exe</value>
- </valuemap>
- </data>
- <data>
- <variable>ToolChain.Count</variable>
- <value type="int">2</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">1</value>
- </data>
-</qtcreator>