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

Squish: Avoid warning about missing Harmattan target in APTW01

Browse Source 
Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
Robert Loehning
2012-06-04 18:53:56 +02:00
committed by Robert Löhning
parent 046f42b282
commit 5d01b60d56
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,9 @@ def __verifyFileCreation__(path, expectedFiles):
# created for this version. If it is None, all Qt versions will be used # created for this version. If it is None, all Qt versions will be used
# param checks turns tests in the function on if set to True # param checks turns tests in the function on if set to True
def createProject_Qt_GUI(path, projectName, qtVersion = None, checks = True): def createProject_Qt_GUI(path, projectName, qtVersion = None, checks = True):
available = __createProjectSelectType__(" Applications", "Qt Gui Application") template = "Qt Gui Application"
available = __createProjectSelectType__(" Applications", template)
JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, available)
__createProjectSetNameAndPath__(path, projectName, checks) __createProjectSetNameAndPath__(path, projectName, checks)
__selectQtVersionDesktop__(qtVersion, checks, available) __selectQtVersionDesktop__(qtVersion, checks, available)

5
tests/system/shared/workarounds.py
View File

@@ -187,7 +187,10 @@ class JIRA:
def _workaroundCreator6994_(self, *args): def _workaroundCreator6994_(self, *args):
if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'): if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'):
args[1].remove('Harmattan') if QtQuickConstants.Targets.HARMATTAN in args[1]:
args[1].remove(QtQuickConstants.Targets.HARMATTAN)
else:
args[1].remove(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN))
test.xverify(False, "Removed Harmattan from expected targets.") test.xverify(False, "Removed Harmattan from expected targets.")
def _workaroundCreator6853_(self, *args): def _workaroundCreator6853_(self, *args):