Squish: Test building Quick controls

Change-Id: I51a71d18dd8b3cccc10145fdc5c9a7726c85c7d5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/tests/system/suite_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py
index 7f94684c8a..8b86dc94e5 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py
@@ -34,7 +34,8 @@ def main():
     if not startedWithoutPluginError():
         return
     for targ, qVer in [[Targets.DESKTOP_480_GCC, "1.1"], [Targets.DESKTOP_521_DEFAULT, "2.1"],
-                       [Targets.DESKTOP_521_DEFAULT, "2.2"]]:
+                       [Targets.DESKTOP_521_DEFAULT, "2.2"], [Targets.DESKTOP_521_DEFAULT, "Controls 1.0"],
+                       [Targets.DESKTOP_521_DEFAULT, "Controls 1.1"]]:
         # using a temporary directory won't mess up a potentially existing
         workingDir = tempDir()
         checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targ,
@@ -53,8 +54,10 @@ def main():
                 result = addExecutableAsAttachableAUT(projectName, 11223)
                 allowAppThroughWinFW(workingDir, projectName)
                 if result:
-                    result = runAndCloseApp(True, projectName, 11223,
-                                            "subprocessFunctionQuick%s" % qVer[0],
+                    function = "subprocessFunctionQuick2"
+                    if qVer[0] == "1":
+                        function = "subprocessFunctionQuick1"
+                    result = runAndCloseApp(True, projectName, 11223, function,
                                             SubprocessType.QT_QUICK_APPLICATION, quickVersion=qVer)
                 else:
                     result = runAndCloseApp(sType=SubprocessType.QT_QUICK_APPLICATION)
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
index 1703e325f4..64d6aaaa6b 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
@@ -33,7 +33,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    for quickVersion in ["1.1", "2.1", "2.2"]:
+    for quickVersion in ["1.1", "2.1", "2.2", "Controls 1.0", "Controls 1.1"]:
         # using a temporary directory won't mess up a potentially existing
         workingDir = tempDir()
         projectName = createNewQtQuickUI(workingDir, quickVersion)