Squish: Fix suite_qtquick

* adapt category label to expected
* adjust to removed library wizard

Change-Id: I799882c9c7557c5d7f4c36fb4d2198f8e586b435
Reviewed-by: Robert Loehning <robert.loehning@qt.io>

3 files changed, 18 insertions, 11 deletions

diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 5caf3ee601..fa03531e72 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -284,13 +284,19 @@ def createNewQtQuickApplication(workingDir, projectName = None,
                                 targets=Targets.desktopTargetClasses(), minimumQtVersion="5.3",
                                 withControls = False, fromWelcome = False, buildSystem = None):
     if withControls:
-        template = "Qt Quick Controls Application"
+        template = "Qt Quick Controls 2 Application"
     else:
         template = "Qt Quick Application"
     available = __createProjectOrFileSelectType__("  Application", template, fromWelcome)
     projectName = __createProjectSetNameAndPath__(workingDir, projectName)
     __handleBuildSystem__(buildSystem)
-    requiredQt = __createProjectHandleQtQuickSelection__(minimumQtVersion)
+    if withControls:
+        requiredQt = "5.7"
+        # TODO use parameter to define style to choose
+        test.log("Using default controls style")
+        clickButton(waitForObject(":Next_QPushButton"))
+    else:
+        requiredQt = __createProjectHandleQtQuickSelection__(minimumQtVersion)
     __modifyAvailableTargets__(available, requiredQt)
     checkedTargets = __chooseTargets__(targets, available)
     snooze(1)
@@ -314,9 +320,8 @@ def createNewQtQuickUI(workingDir, qtVersion = "5.3"):
 
     return projectName
 
-def createNewQmlExtension(workingDir, targets=Targets.DESKTOP_474_GCC, qtQuickVersion=1):
-    available = __createProjectOrFileSelectType__("  Library", "Qt Quick %d Extension Plugin"
-                                                  % qtQuickVersion)
+def createNewQmlExtension(workingDir, targets=[Targets.DESKTOP_531_DEFAULT]):
+    available = __createProjectOrFileSelectType__("  Library", "Qt Quick 2 Extension Plugin")
     if workingDir == None:
         workingDir = tempDir()
     __createProjectSetNameAndPath__(workingDir)
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py
index 72ab1e1049..233ec3d8a0 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py
@@ -47,7 +47,10 @@ def main():
                                                                   minimumQtVersion=qtVersion,
                                                                   withControls = controls)
         if len(checkedTargets) == 0:
-            test.fatal("Could not check wanted target")
+            if controls and qtVersion < "5.7":
+                test.xfail("Could not check wanted target.", "Quick Controls 2 wizard needs Qt5.7+")
+            else:
+                test.fatal("Could not check wanted target")
             continue
         additionalText = ''
         if controls:
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
index a93d9a25ff..3fc99ae0bf 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
@@ -29,14 +29,13 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    for targ, quickVer in [[[Targets.DESKTOP_480_DEFAULT], 1], [[Targets.DESKTOP_561_DEFAULT], 2],
-                           [[Targets.DESKTOP_531_DEFAULT], 2]]:
+    for target in [Targets.DESKTOP_561_DEFAULT, Targets.DESKTOP_531_DEFAULT]:
         # using a temporary directory won't mess up a potentially existing
-        createNewQmlExtension(tempDir(), targ, quickVer)
+        createNewQmlExtension(tempDir(), [target])
         # wait for parsing to complete
         progressBarWait(30000)
-        test.log("Building project Qt Quick %d Extension Plugin (%s)"
-                 % (quickVer, Targets.getStringForTarget(targ)))
+        test.log("Building project Qt Quick 2 Extension Plugin (%s)"
+                 % Targets.getStringForTarget(target))
         invokeMenuItem("Build","Build All")
         waitForCompile()
         checkCompile()