Squish: Use list instead of bitfield for kits

Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-03-02 17:28:00 +01:00
parent 350db24891
commit f78327a571
14 changed files with 30 additions and 34 deletions
+3 -10
View File
@@ -39,9 +39,10 @@ class Targets:
@staticmethod
def desktopTargetClasses():
desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.EMBEDDED_LINUX)
desktopTargets = list(Targets.ALL_TARGETS)
desktopTargets.remove(Targets.EMBEDDED_LINUX)
if platform.system() == 'Darwin':
desktopTargets &= ~Targets.DESKTOP_541_GCC
desktopTargets.remove(Targets.DESKTOP_541_GCC)
return desktopTargets
@staticmethod
@@ -79,14 +80,6 @@ class Targets:
test.fatal("You've passed at least one unknown target!")
return result
@staticmethod
def intToArray(targets):
return filter(lambda x: x & targets, Targets.ALL_TARGETS)
@staticmethod
def arrayToInt(targetArr):
return reduce(operator.or_, targetArr, 0)
@staticmethod
def getDefaultKit():
return Targets.DESKTOP_531_DEFAULT