Squish: Adjust tests that use Qt Quick UI wizards

Qt Quick UI had been slightly renamed and Qt Quick Controls UI is
gone.

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

3 files changed, 8 insertions, 15 deletions

diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 88c2c8aca0..ec216a8b97 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -303,12 +303,8 @@ def createNewQtQuickApplication(workingDir, projectName = None,
 
     return checkedTargets, projectName
 
-def createNewQtQuickUI(workingDir, qtVersion = "5.3", withControls = False):
-    if withControls:
-        template = 'Qt Quick Controls UI'
-    else:
-        template = 'Qt Quick UI'
-    __createProjectOrFileSelectType__("  Other Project", template)
+def createNewQtQuickUI(workingDir, qtVersion = "5.3"):
+    __createProjectOrFileSelectType__("  Other Project", 'Qt Quick UI Prototype')
     if workingDir == None:
         workingDir = tempDir()
     projectName = __createProjectSetNameAndPath__(workingDir)
diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py
index a172b664c7..917f7d76a6 100644
--- a/tests/system/suite_general/tst_create_proj_wizard/test.py
+++ b/tests/system/suite_general/tst_create_proj_wizard/test.py
@@ -65,7 +65,7 @@ def main():
         for template in dumpItems(templatesView.model(), templatesView.rootIndex()):
             template = template.replace(".", "\\.")
             # skip non-configurable
-            if not template in ["Qt Quick UI", "Qt Quick Controls UI", "Qt Canvas 3D Application",
+            if not template in ["Qt Quick UI Prototype", "Qt Canvas 3D Application",
                                 "Auto Test Project"]: # FIXME
                 availableProjectTypes.append({category:template})
     safeClickButton("Cancel")
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
index a19be52c58..c04b39de8a 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
@@ -29,14 +29,14 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    available = [("5.6", False), ("5.6", True)]
+    available = ["5.6"]
     if platform.system() != 'Darwin':
-        available.extend([("5.4", False), ("5.4", True)])
+        available.extend(["5.4"])
 
-    for qtVersion, controls in available:
+    for qtVersion in available:
         # using a temporary directory won't mess up a potentially existing
         workingDir = tempDir()
-        projectName = createNewQtQuickUI(workingDir, qtVersion, controls)
+        projectName = createNewQtQuickUI(workingDir, qtVersion)
         if qtVersion == "5.6":
             kit = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT)
             if addAndActivateKit(Targets.DESKTOP_561_DEFAULT):
@@ -53,10 +53,7 @@ def main():
             else:
                 test.fatal("Failed to activate kit %s" % kit)
                 continue
-        additionalText = ''
-        if controls:
-            additionalText = ' Controls '
-        test.log("Running project Qt Quick%sUI (%s)" % (additionalText, kit))
+        test.log("Running project Qt Quick UI Prototype (%s)" % kit)
         qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(2, 1, workingDir, projectName, 11223, quick)
         if qmlViewer!=None:
             qmlViewerPath = os.path.dirname(qmlViewer)