feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix compiler toolchains on macOS

Browse Source 
Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2020-02-17 09:08:48 +01:00
parent da42176da8
commit 4205134847
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
View File

@@ -9,7 +9,7 @@
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">x86-linux-generic-elf-64bit</value> <value type="QString">x86-linux-generic-elf-64bit</value>
<value type="QString">x86-linux-generic-elf-32bit</value> <value type="QString">x86-linux-generic-elf-32bit</value>
<value type="QString">x86-macos-generic-mach_o-64bit</value> <value type="QString">x86-darwin-generic-mach_o-64bit</value>
</valuelist> </valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
@@ -23,8 +23,8 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">x86-macos-generic-mach_o-64bit</value> <value type="QString">x86-darwin-generic-mach_o-64bit</value>
<value type="QString">x86-macos-generic-mach_o-32bit</value> <value type="QString">x86-darwin-generic-mach_o-32bit</value>
</valuelist> </valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
@@ -38,8 +38,8 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">x86-macos-generic-mach_o-64bit</value> <value type="QString">x86-darwin-generic-mach_o-64bit</value>
<value type="QString">x86-macos-generic-mach_o-32bit</value> <value type="QString">x86-darwin-generic-mach_o-32bit</value>
</valuelist> </valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
@@ -55,7 +55,7 @@
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">x86-linux-generic-elf-64bit</value> <value type="QString">x86-linux-generic-elf-64bit</value>
<value type="QString">x86-linux-generic-elf-32bit</value> <value type="QString">x86-linux-generic-elf-32bit</value>
<value type="QString">x86-macos-generic-mach_o-64bit</value> <value type="QString">x86-darwin-generic-mach_o-64bit</value>
</valuelist> </valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>

2
tests/system/shared/qtcreator.py
View File

@@ -212,7 +212,7 @@ def __guessABI__(supportedABIs, use64Bit):
if platform.system() == 'Linux': if platform.system() == 'Linux':
supportedABIs = filter(lambda x: 'linux' in x, supportedABIs) supportedABIs = filter(lambda x: 'linux' in x, supportedABIs)
elif platform.system() == 'Darwin': elif platform.system() == 'Darwin':
supportedABIs = filter(lambda x: 'macos' in x, supportedABIs) supportedABIs = filter(lambda x: 'darwin' in x, supportedABIs)
if use64Bit: if use64Bit:
searchFor = "64bit" searchFor = "64bit"
else: else: