summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2017-02-10 17:42:54 +0100
committerRobert Loehning <robert.loehning@qt.io>2017-02-14 13:02:15 +0000
commit0115cc3103fec00fc3b4f1490b7bce19d1d16ec2 (patch)
tree553ebb4231fad469772726d4d25f57a55499cac9
parent6e87ebfe833b97790e52d194d375c1de2d978b01 (diff)
downloadqt-creator-0115cc3103fec00fc3b4f1490b7bce19d1d16ec2.tar.gz
Squish: Use cdb from Windows 10 kit
Change-Id: I7e30848f583fd767bf6ad8a4accac7df41ce9167 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/debuggers.xml12
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/profiles.xml8
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
index 926bc49c9c..e5518c8c99 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorDebuggers>
-<!-- Written by QtCreator 3.3.81, 2015-02-17T18:11:11. -->
+<!-- Written by QtCreator 4.2.2, 2017-02-10T17:36:35. -->
<qtcreator>
<data>
<variable>DebuggerItem.0</variable>
<valuemap type="QVariantMap">
<valuelist type="QVariantList" key="Abis">
- <value type="QString">x86-windows-msvc2010-pe-64bit</value>
+ <value type="QString">x86-windows-msvc2015-pe-64bit</value>
</valuelist>
<value type="bool" key="AutoDetected">true</value>
<value type="QString" key="AutoDetectionSource"></value>
- <value type="QString" key="Binary">C:/Program Files/Debugging Tools for Windows (x64)/cdb.exe</value>
- <value type="QString" key="DisplayName">Auto-detected CDB at C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
+ <value type="QString" key="Binary">C:/Program Files (x86)/Windows Kits/10/Debuggers/x64/cdb.exe</value>
+ <value type="QString" key="DisplayName">Auto-detected CDB at C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe</value>
<value type="int" key="EngineType">4</value>
- <value type="QString" key="Id">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+ <value type="QString" key="Id">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
+ <value type="QDateTime" key="LastModified"></value>
<value type="QString" key="Version"></value>
+ <value type="QString" key="WorkingDirectory"></value>
</valuemap>
</data>
<data>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index f7656fd7e4..b88210ec3e 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 4.2.1, 2017-01-05T18:03:28. -->
+<!-- Written by QtCreator 4.2.2, 2017-02-10T17:44:37. -->
<qtcreator>
<data>
<variable>Profile.0</variable>
@@ -37,7 +37,7 @@
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
- <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+ <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
<value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<valuelist type="QVariantList" key="PE.Profile.Environment"/>
@@ -65,7 +65,7 @@
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
- <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+ <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
<value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<valuelist type="QVariantList" key="PE.Profile.Environment"/>
@@ -121,7 +121,7 @@
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
- <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+ <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
<value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<valuelist type="QVariantList" key="PE.Profile.Environment"/>