Commit 5d01b60d authored by Robert Loehning's avatar Robert Loehning Committed by Robert Löhning
Browse files

Squish: Avoid warning about missing Harmattan target in APTW01



Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c
Reviewed-by: default avatarChristian Stenger <christian.stenger@nokia.com>
parent 046f42b2
...@@ -153,7 +153,9 @@ def __verifyFileCreation__(path, expectedFiles): ...@@ -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)
......
...@@ -187,7 +187,10 @@ class JIRA: ...@@ -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):
......
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