From 2a2ecdc3236d0f76db08e4ea80e1b983c1cfee2f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 26 Aug 2013 11:30:54 +0200 Subject: [PATCH] Squish: Prepare enabling Qt5 for suite_qtquick Change-Id: I7c4ac62be8f30867953f776ad56ab3ffbf6cd909 Reviewed-by: Robert Loehning --- tests/system/shared/project.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 706dfeb0554..85c5166f6e2 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -255,20 +255,21 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N progressBarWait(10000) return checkedTargets, projectName -def createNewQtQuickUI(workingDir): - __createProjectOrFileSelectType__(" Applications", "Qt Quick 1 UI") +def createNewQtQuickUI(workingDir, qtQuickVersion=1): + __createProjectOrFileSelectType__(" Applications", "Qt Quick %d UI" % qtQuickVersion) if workingDir == None: workingDir = tempDir() projectName = __createProjectSetNameAndPath__(workingDir) __createProjectHandleLastPage__() return projectName -def createNewQmlExtension(workingDir): - available = __createProjectOrFileSelectType__(" Libraries", "Qt Quick 1 Extension Plugin") +def createNewQmlExtension(workingDir, targets=Targets.DESKTOP_474_GCC, qtQuickVersion=1): + available = __createProjectOrFileSelectType__(" Libraries", "Qt Quick %d Extension Plugin" + % qtQuickVersion) if workingDir == None: workingDir = tempDir() __createProjectSetNameAndPath__(workingDir) - checkedTargets = __chooseTargets__(Targets.DESKTOP_474_GCC, available) + checkedTargets = __chooseTargets__(targets, available) nextButton = waitForObject(":Next_QPushButton") clickButton(nextButton) nameLineEd = waitForObject("{buddy={type='QLabel' text='Object class-name:' unnamed='1' visible='1'} "