Commit dae21983 authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Fix tests for disabled Madde Plugin



Part 1: Fix expected targets

Change-Id: I4acfcde6c6d347065047e91f6d65b6418aade7b3
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent d3eddd32
...@@ -269,7 +269,8 @@ def __chooseComponents__(components=QtQuickConstants.Components.BUILTIN): ...@@ -269,7 +269,8 @@ def __chooseComponents__(components=QtQuickConstants.Components.BUILTIN):
# parameter target can be an OR'd value of QtQuickConstants.Targets # parameter target can be an OR'd value of QtQuickConstants.Targets
# parameter availableTargets should be the result of __createProjectSelectType__() # parameter availableTargets should be the result of __createProjectSelectType__()
# or use None as a fallback # or use None as a fallback
def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availableTargets=None): def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availableTargets=None,
isMaddeDisabled=True):
if availableTargets != None: if availableTargets != None:
available = availableTargets available = availableTargets
else: else:
...@@ -280,6 +281,10 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availabl ...@@ -280,6 +281,10 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availabl
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
available.remove(QtQuickConstants.Targets.EMBEDDED_LINUX) available.remove(QtQuickConstants.Targets.EMBEDDED_LINUX)
available.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008) available.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
if isMaddeDisabled:
for target in filter(lambda x: x in available,
(QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.HARMATTAN)):
available.remove(target)
checkedTargets = [] checkedTargets = []
for current in available: for current in available:
mustCheck = targets & current == current mustCheck = targets & current == current
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment