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

Squish: Make deep copies of Targets.ALL_TARGETS

Browse Source 
Fixes crash in tst_generic_highlighter

Change-Id: I186cf47990e80ee6902c0812e6d6e3a260dfeec5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-03-31 15:48:03 +02:00
parent 1bdaa78fa5
commit 40d112d5ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/system/shared/project.py
View File

@@ -389,7 +389,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None):
available = availableTargets available = availableTargets
else: else:
# following targets depend on the build environment - added for further/later tests # following targets depend on the build environment - added for further/later tests
available = Targets.ALL_TARGETS available = list(Targets.ALL_TARGETS)
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
available.remove(Targets.EMBEDDED_LINUX) available.remove(Targets.EMBEDDED_LINUX)
elif platform.system() == 'Darwin': elif platform.system() == 'Darwin':
@@ -632,7 +632,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result.append(Targets.SIMULATOR) result.append(Targets.SIMULATOR)
elif 'Platform independent' in text: elif 'Platform independent' in text:
# MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not # MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
result = Targets.ALL_TARGETS result = list(Targets.ALL_TARGETS)
result.remove(Targets.EMBEDDED_LINUX) result.remove(Targets.EMBEDDED_LINUX)
if platform.system() == 'Darwin': if platform.system() == 'Darwin':
result.remove(Targets.DESKTOP_541_GCC) result.remove(Targets.DESKTOP_541_GCC)