aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2019-05-06 15:18:24 +0200
committerChristian Stenger <christian.stenger@qt.io>2019-05-08 05:18:08 +0000
commit2330103ababa71a2cceff1cdd11176636cb5ed29 (patch)
tree889064ac6a567104660224ce0bd1aa5e87a2c3ec
parent98e6a218800a35dac1b806a05caf80997cb85201 (diff)
Squish: Update wizard handling for Qml UI prototype
Change-Id: Idb4a8e445f0cc0c749298a4bd86020377b8baeb4 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
-rw-r--r--tests/system/shared/project.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 3afc7fc2a7..00271bd77e 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -303,15 +303,22 @@ def createNewQtQuickApplication(workingDir, projectName = None,
return checkedTargets, projectName
def createNewQtQuickUI(workingDir, qtVersion = "5.6"):
- __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype')
+ available = __createProjectOrFileSelectType__(" Other Project", 'Qt Quick UI Prototype')
if workingDir == None:
workingDir = tempDir()
projectName = __createProjectSetNameAndPath__(workingDir)
- __createProjectHandleQtQuickSelection__(qtVersion)
- __createProjectHandleLastPage__()
- progressBarWait(10000)
+ requiredQt = __createProjectHandleQtQuickSelection__(qtVersion)
+ __modifyAvailableTargets__(available, requiredQt)
+ snooze(1)
+ checkedTargets = __chooseTargets__(available, available)
+ if len(checkedTargets):
+ clickButton(waitForObject(":Next_QPushButton"))
+ __createProjectHandleLastPage__()
+ progressBarWait(10000)
+ else:
+ clickButton(waitForObject("{type='QPushButton' text='Cancel' visible='1'}"))
- return projectName
+ return checkedTargets, projectName
def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_5_6_1_DEFAULT]):
available = __createProjectOrFileSelectType__(" Library", "Qt Quick 2 Extension Plugin")