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

Squish: Updated class for new target name

Browse Source 
Change-Id: I5eca3251b290e15eaa2a462bc22f1d1ac7153834
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
Robert Loehning
2012-09-04 16:39:24 +02:00
committed by Christian Stenger
parent cc275c062d
commit 3767ecf872
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ class QtQuickConstants:
if target==QtQuickConstants.Targets.DESKTOP: if target==QtQuickConstants.Targets.DESKTOP:
return "Desktop" return "Desktop"
elif target==QtQuickConstants.Targets.MAEMO5: elif target==QtQuickConstants.Targets.MAEMO5:
return "Maemo5" return "Fremantle"
elif target==QtQuickConstants.Targets.SIMULATOR: elif target==QtQuickConstants.Targets.SIMULATOR:
return "Qt Simulator" return "Qt Simulator"
elif target==QtQuickConstants.Targets.HARMATTAN: elif target==QtQuickConstants.Targets.HARMATTAN:

3
tests/system/shared/utils.py
View File

@@ -319,7 +319,8 @@ def getCorrectlyConfiguredTargets():
for targetName in result.keys(): for targetName in result.keys():
targetInfo = result[targetName] targetInfo = result[targetName]
if targetInfo[0] == "Maemo": if targetInfo[0] == "Maemo":
result.update({targetName:("Maemo5", targetInfo[1])}) result.update({targetName:
(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.MAEMO5), targetInfo[1])})
test.log("Correctly configured targets: %s" % str(result)) test.log("Correctly configured targets: %s" % str(result))
return result return result