diff options
author | Robert Loehning <robert.loehning@qt.io> | 2017-01-05 18:01:57 +0100 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2017-01-06 10:23:12 +0000 |
commit | 611a970819793cda07c6deeb213167110a956f04 (patch) | |
tree | 22904938d2248d6cb501c5466417d5a517039277 /tests/system/settings | |
parent | ca0a8a6cf76ba292cfcaf8e70e6534f27e2e92c4 (diff) | |
download | qt-creator-611a970819793cda07c6deeb213167110a956f04.tar.gz |
Squish: Configure C-toolchains for Windows
Task-number: QTCREATORBUG-17406
Change-Id: Iafa1b38f75fa56691e646aaf2fad61504f0706e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system/settings')
-rw-r--r-- | tests/system/settings/windows/QtProject/qtcreator/profiles.xml | 26 | ||||
-rw-r--r-- | tests/system/settings/windows/QtProject/qtcreator/toolchains.xml | 38 |
2 files changed, 61 insertions, 3 deletions
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index ace7dc6199..ee44082aa5 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.0.83, 2016-07-20T17:07:18. --> +<!-- Written by QtCreator 4.2.1, 2017-01-05T18:03:28. --> <qtcreator> <data> <variable>Profile.0</variable> @@ -15,6 +15,10 @@ <valuelist type="QVariantList" key="PE.Profile.Environment"/> <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{41d0a157-7cf1-4c83-bab8-d77b3f136b85}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">8</value> </valuemap> @@ -39,6 +43,10 @@ <valuelist type="QVariantList" key="PE.Profile.Environment"/> <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{41d0a157-7cf1-4c83-bab8-d77b3f136b85}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">9</value> </valuemap> @@ -105,6 +113,10 @@ <valuelist type="QVariantList" key="PE.Profile.Environment"/> <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{88921fca-56c4-4ea8-9681-ee0fa5085814}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">2</value> </valuemap> @@ -129,6 +141,10 @@ <valuelist type="QVariantList" key="PE.Profile.Environment"/> <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{88921fca-56c4-4ea8-9681-ee0fa5085814}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">20</value> </valuemap> @@ -153,6 +169,10 @@ <valuelist type="QVariantList" key="PE.Profile.Environment"/> <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{777132b1-5d59-4adf-ab0d-3a6df2a0a0fb}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">22</value> </valuemap> @@ -177,6 +197,10 @@ <valuelist type="QVariantList" key="PE.Profile.Environment"/> <value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.ToolChain">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{3cdb6753-cdee-4bb7-8fb3-2e7a60e279e3}</value> + <value type="QString" key="Cxx">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">24</value> </valuemap> diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml index 027bed7ed1..70616db5c7 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 QtCreator 4.0.83, 2016-07-20T17:07:18. --> +<!-- Written by QtCreator 4.2.1, 2017-01-05T17:54:30. --> <qtcreator> <data> <variable>ToolChain.0</variable> @@ -72,6 +72,40 @@ <data> <variable>ToolChain.5</variable> <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.GccToolChain.OriginalTargetTriple">mingw32</value> + <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/QtSDK/mingw/bin/gcc.exe</value> + <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformCodeGenFlags"/> + <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformLinkerFlags"/> + <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 4.4</value> + <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{41d0a157-7cf1-4c83-bab8-d77b3f136b85}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">1</value> + </valuemap> + </data> + <data> + <variable>ToolChain.6</variable> + <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.GccToolChain.OriginalTargetTriple">i686-w64-mingw32</value> + <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/gcc.exe</value> + <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformCodeGenFlags"/> + <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformLinkerFlags"/> + <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 4.9</value> + <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{777132b1-5d59-4adf-ab0d-3a6df2a0a0fb}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">1</value> + </valuemap> + </data> + <data> + <variable>ToolChain.7</variable> + <valuemap type="QVariantMap"> <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2013-pe-32bit</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value> @@ -82,7 +116,7 @@ </data> <data> <variable>ToolChain.Count</variable> - <value type="int">6</value> + <value type="int">8</value> </data> <data> <variable>Version</variable> |