Squish: Updated __selectQtVersionDesktop__

Change-Id: I45b870c9f0def59f11196c98a446a506ce672049
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

3 files changed, 12 insertions, 25 deletions

diff --git a/tests/system/objects.map b/tests/system/objects.map
index 7a393d2b77..05aba5e16d 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -66,8 +66,8 @@
 :scrollArea.Edit build configuration:_QComboBox	{container=':Qt Creator.scrollArea_QScrollArea' leftWidget=':scrollArea.Edit build configuration:_QLabel' type='QComboBox' unnamed='1' visible='1'}
 :scrollArea.Edit build configuration:_QLabel	{container=':Qt Creator.scrollArea_QScrollArea' text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'}
 :scrollArea.Library not available_QLabel	{container=':Qt Creator.scrollArea_QScrollArea' name='qmlDebuggingWarningText' text?='Library not available*' type='QLabel' visible='1'}
-:scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' text?='*Qt 4.* for *(Qt SDK) debug' type='QCheckBox' unnamed='1' visible='1'}
-:scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' text?='*Qt 4.* for *(Qt SDK) release' type='QCheckBox' unnamed='1' visible='1'}
+:scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' occurrence='1' text='Debug' type='QCheckBox' unnamed='1' visible='1'}
+:scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' occurrence='1' text='Release' type='QCheckBox' unnamed='1' visible='1'}
 :scrollArea.Qt Version:_QComboBox	{aboveWidget=':scrollArea.Use Shadow Building_QCheckBox' container=':Qt Gui Application.scrollArea_QScrollArea' leftWidget=':scrollArea.Qt Version:_QLabel' type='QComboBox' unnamed='1' visible='1'}
 :scrollArea.Qt Version:_QLabel	{container=':Qt Gui Application.scrollArea_QScrollArea' text='Qt Version:' type='QLabel' unnamed='1' visible='1'}
 :scrollArea.Use Shadow Building_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' text='Shadow build' type='QCheckBox' unnamed='1' visible='1'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 7121578ef6..8c0062b022 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -112,24 +112,13 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True):
     return str(projectName)
 
 # Selects the Qt versions for a project
-# param qtVersion is the name of a Qt version. In the project, build configurations will be
-#                 created for this version. If it is None, all Qt versions will be used
 # param checks turns tests in the function on if set to True
 # param available a list holding the available targets
-def __selectQtVersionDesktop__(qtVersion, checks, available=None):
+def __selectQtVersionDesktop__(checks, available=None):
     __chooseTargets__(QtQuickConstants.Targets.DESKTOP, available)
-    if qtVersion == None:
-        selectFromCombo(":scrollArea.Create Build Configurations:_QComboBox_2",
-                        "For Each Qt Version One Debug And One Release")
-        ensureChecked(":scrollArea.Use Shadow Building_QCheckBox")
-    else:
-        selectFromCombo(":scrollArea.Create Build Configurations:_QComboBox_2",
-                        "For One Qt Version One Debug And One Release")
-        ensureChecked(":scrollArea.Use Shadow Building_QCheckBox")
-        selectFromCombo(":scrollArea.Qt Version:_QComboBox", qtVersion)
-        if checks:
-            verifyChecked(":scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox")
-            verifyChecked(":scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox")
+    if checks:
+        verifyChecked(":scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox")
+        verifyChecked(":scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox")
     clickButton(waitForObject(":Next_QPushButton"))
 
 def __createProjectHandleLastPage__(expectedFiles = None):
@@ -153,15 +142,13 @@ def __verifyFileCreation__(path, expectedFiles):
 # Creates a Qt GUI project
 # param path specifies where to create the project
 # param projectName is the name for the new project
-# param qtVersion is the name of a Qt version. In the project, build configurations will be
-#                 created for this version. If it is None, all Qt versions will be used
 # param checks turns tests in the function on if set to True
-def createProject_Qt_GUI(path, projectName, qtVersion = None, checks = True):
+def createProject_Qt_GUI(path, projectName, checks = True):
     template = "Qt Gui Application"
     available = __createProjectSelectType__("  Applications", template)
     JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, available)
     __createProjectSetNameAndPath__(path, projectName, checks)
-    __selectQtVersionDesktop__(qtVersion, checks, available)
+    __selectQtVersionDesktop__(checks, available)
 
     if checks:
         exp_filename = "mainwindow"
@@ -195,13 +182,11 @@ def createProject_Qt_GUI(path, projectName, qtVersion = None, checks = True):
 # Creates a Qt Console project
 # param path specifies where to create the project
 # param projectName is the name for the new project
-# param qtVersion is the name of a Qt version. In the project, build configurations will be
-#                 created for this version. If it is None, all Qt versions will be used
 # param checks turns tests in the function on if set to True
-def createProject_Qt_Console(path, projectName, qtVersion = None, checks = True):
+def createProject_Qt_Console(path, projectName, checks = True):
     available = __createProjectSelectType__("  Applications", "Qt Console Application")
     __createProjectSetNameAndPath__(path, projectName, checks)
-    __selectQtVersionDesktop__(qtVersion, checks, available)
+    __selectQtVersionDesktop__(checks, available)
 
     expectedFiles = None
     if checks:
diff --git a/tests/system/suite_APTW/objects.map b/tests/system/suite_APTW/objects.map
index 4ea1ec9a5c..fe24c5737a 100644
--- a/tests/system/suite_APTW/objects.map
+++ b/tests/system/suite_APTW/objects.map
@@ -20,5 +20,7 @@
 :scrollArea.Create Build Configurations:_QLabel_2	{container=':Qt Gui Application.scrollArea_QScrollArea' text='Create build configurations:' type='QLabel' unnamed='1' visible='1'}
 :scrollArea.Edit build configuration:_QComboBox	{container=':Qt Creator.scrollArea_QScrollArea' leftWidget=':scrollArea.Edit build configuration:_QLabel' type='QComboBox' unnamed='1' visible='1'}
 :scrollArea.Edit build configuration:_QLabel	{container=':Qt Creator.scrollArea_QScrollArea' text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'}
+:scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' occurence='1' text='Debug' type='QCheckBox' unnamed='1' visible='1'}
+:scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' occurence='1' text='Release' type='QCheckBox' unnamed='1' visible='1'}
 :scrollArea.Use Shadow Building_QCheckBox	{container=':Qt Gui Application.scrollArea_QScrollArea' text='Shadow build' type='QCheckBox' unnamed='1' visible='1'}
 :sourceFileLineEdit_Utils::FileNameValidatingLineEdit	{buddy=':Qt Gui Application.Source file:_QLabel' name='sourceFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}