Squish: Fix tests for disabled Madde Plugin

Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2013-02-07 15:42:15 +01:00
parent dae2198346
commit b090616016
3 changed files with 18 additions and 11 deletions
+2 -4
View File
@@ -441,7 +441,6 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
if 'Supported Platforms' in text:
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ")
result = []
addSimulator = False
if 'Desktop' in supports:
result.append(QtQuickConstants.Targets.DESKTOP_474_GCC)
if platform.system() in ("Linux", "Darwin"):
@@ -450,13 +449,12 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
if 'MeeGo/Harmattan' in supports:
result.append(QtQuickConstants.Targets.HARMATTAN)
addSimulator = True
if 'Maemo/Fremantle' in supports:
result.append(QtQuickConstants.Targets.MAEMO5)
addSimulator = True
if len(result) == 0 or addSimulator:
if not re.search("custom Qt Creator plugin", text):
result.append(QtQuickConstants.Targets.SIMULATOR)
elif 'Platform independent' in text:
# MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.MAEMO5,
QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):