Squish: Refactor selecting configured Kits in project

The design of the Projects mode changed several times. We wrote lots of
workarounds to keep even more old code alive because we never had the time
for a proper refactoring. This time is now.

Leads to more stable code with far less variables flying around.

Task-number: QTCREATORBUG-20265
Change-Id: I29e5956ea3279cdb1d6da61bf5b461666de436bc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

3 files changed, 14 insertions, 14 deletions

diff --git a/tests/system/suite_APTW/tst_APTW01/test.py b/tests/system/suite_APTW/tst_APTW01/test.py
index e6fcc937c12..52ae22b787f 100644
--- a/tests/system/suite_APTW/tst_APTW01/test.py
+++ b/tests/system/suite_APTW/tst_APTW01/test.py
@@ -32,8 +32,8 @@ def main():
     startCreator(False)
     if not startedWithoutPluginError():
         return
-    checkedTargets = createProject_Qt_GUI(tempDir(), "SampleApp")
+    createProject_Qt_GUI(tempDir(), "SampleApp")
     # run project for debug and release and verify results
-    runVerify(checkedTargets)
+    runVerify()
     #close Qt Creator
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_APTW/tst_APTW02/test.py b/tests/system/suite_APTW/tst_APTW02/test.py
index 6294be9edda..dd76b788d3e 100644
--- a/tests/system/suite_APTW/tst_APTW02/test.py
+++ b/tests/system/suite_APTW/tst_APTW02/test.py
@@ -30,8 +30,8 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    checkedTargets, projectName = createNewQtQuickApplication(tempDir(), "SampleApp")
+    createNewQtQuickApplication(tempDir(), "SampleApp")
     # run project for debug and release and verify results
-    runVerify(checkedTargets)
+    runVerify()
     #close Qt Creator
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py
index 905dea914e4..022c1ba8130 100644
--- a/tests/system/suite_APTW/tst_APTW03/test.py
+++ b/tests/system/suite_APTW/tst_APTW03/test.py
@@ -56,11 +56,11 @@ def handleInsertVirtualFunctions(expected):
     clickButton("{text='OK' type='QPushButton' unnamed='1' visible='1'}")
 
 def checkSimpleCppLib(projectName, static):
-    checkedTargets, projectName, className = createNewCPPLib(tempDir(), projectName, "MyClass",
-                                                             target=Targets.desktopTargetClasses(),
-                                                             isStatic=static)
-    for kit, config in iterateBuildConfigs(len(checkedTargets), "Release"):
-        verifyBuildConfig(len(checkedTargets), kit, config, False, True)
+    projectName, className = createNewCPPLib(tempDir(), projectName, "MyClass",
+                                             target=Targets.desktopTargetClasses(),
+                                             isStatic=static)
+    for kit, config in iterateBuildConfigs("Release"):
+        verifyBuildConfig(kit, config, False, True)
         invokeMenuItem('Build', 'Build Project "%s"' % projectName)
         waitForCompile(10000)
         checkCompile()
@@ -81,12 +81,12 @@ def main():
 
     # Qt Plugin needs Qt4.8 for QGenericPlugin which is tested by default
     targets = Targets.desktopTargetClasses()
-    checkedTargets, projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin",
-                                                               target=targets)
+    projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin",
+                                               target=targets)
     virtualFunctionsAdded = False
-    for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"):
-        is487Kit = checkedTargets[kit] in (Targets.DESKTOP_4_8_7_DEFAULT, Targets.EMBEDDED_LINUX)
-        verifyBuildConfig(len(checkedTargets), kit, config, True, True)
+    for kit, config in iterateBuildConfigs("Debug"):
+        is487Kit = kit in (Targets.DESKTOP_4_8_7_DEFAULT, Targets.EMBEDDED_LINUX)
+        verifyBuildConfig(kit, config, True, True)
         if virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') and is487Kit:
             test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.")
             continue