diff options
author | Christian Stenger <christian.stenger@qt.io> | 2017-01-17 13:52:45 +0100 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2017-01-18 14:50:26 +0000 |
commit | bdd0c8375125a618f930d869ff135bffcda76b36 (patch) | |
tree | e2a2f69118f876eda63acf260ab0f1d29132f49d | |
parent | 178430dcd1d58b9062f727245b66a6dfeeb01f95 (diff) |
Squish: Configure C-toolchains for macOS
Change-Id: I3d4fcc25ecca8a02e8dbbace4fc063a72cd85a40
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
-rw-r--r-- | tests/system/settings/mac/QtProject/qtcreator/profiles.xml | 20 | ||||
-rw-r--r-- | tests/system/settings/mac/QtProject/qtcreator/toolchains.xml | 37 |
2 files changed, 56 insertions, 1 deletions
diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml index 124113a265..6e254742ab 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml @@ -13,6 +13,10 @@ <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> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{461bb8dc-22ff-461f-82fe-ebe8b21b697f}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">4</value> </valuemap> @@ -97,6 +101,10 @@ <value type="QByteArray" key="PE.Profile.DeviceType">GenericLinuxOsType</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> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{461bb8dc-22ff-461f-82fe-ebe8b21b697f}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">4</value> </valuemap> @@ -119,6 +127,10 @@ <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.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{0db093b8-890b-4fad-a4bc-9078124fe866}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">9</value> </valuemap> @@ -141,6 +153,10 @@ <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> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{461bb8dc-22ff-461f-82fe-ebe8b21b697f}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">2</value> </valuemap> @@ -163,6 +179,10 @@ <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.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value> + <valuemap type="QVariantMap" key="PE.Profile.ToolChains"> + <value type="QByteArray" key="C">{0db093b8-890b-4fad-a4bc-9078124fe866}</value> + <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value> + </valuemap> <value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="int" key="QtSupport.QtInformation">11</value> </valuemap> diff --git a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml index 672ebb50fb..69bbde66b7 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml @@ -15,6 +15,7 @@ <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> + <value type="int" key="ProjectExplorer.ToolChain.Language">2</value> </valuemap> </data> <data> @@ -28,6 +29,7 @@ <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC for Fremantle</value> <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">2</value> </valuemap> </data> <data> @@ -41,6 +43,7 @@ <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC for Harmattan</value> <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">2</value> </valuemap> </data> <data> @@ -55,11 +58,43 @@ <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">Clang (x86 64bit)</value> <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Clang:{6afe7dea-8caa-424e-b370-b7b0a34015fb}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">2</value> + </valuemap> + </data> + <data> + <variable>ToolChain.4</variable> + <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value> + <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> + <value type="QString">x86-macos-generic-mach_o-64bit</value> + <value type="QString">x86-macos-generic-mach_o-32bit</value> + </valuelist> + <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> + <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> + <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">Clang [C]</value> + <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Clang:{0db093b8-890b-4fad-a4bc-9078124fe866}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">1</value> + </valuemap> + </data> + <data> + <variable>ToolChain.5</variable> + <valuemap type="QVariantMap"> + <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</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> + <value type="QString">x86-macos-generic-mach_o-64bit</value> + </valuelist> + <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> + <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> + <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC [C]</value> + <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{461bb8dc-22ff-461f-82fe-ebe8b21b697f}</value> + <value type="int" key="ProjectExplorer.ToolChain.Language">1</value> </valuemap> </data> <data> <variable>ToolChain.Count</variable> - <value type="int">4</value> + <value type="int">6</value> </data> <data> <variable>Version</variable> |