Squish: Updated iterateBuildConfigs() to handle multiple kits

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

3 files changed, 10 insertions, 10 deletions

diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py
index 4474bbdc32..db6771c9f2 100644
--- a/tests/system/suite_debugger/tst_build_new_project/test.py
+++ b/tests/system/suite_debugger/tst_build_new_project/test.py
@@ -5,11 +5,11 @@ project = "SquishProject"
 def main():
     startApplication("qtcreator" + SettingsPath)
     createProject_Qt_Console(tempDir(), project)
-    availableConfigs = iterateBuildConfigs(1, 0)
+    availableConfigs = iterateBuildConfigs(1)
     if not availableConfigs:
         test.fatal("Haven't found a suitable Qt version - leaving without building.")
-    for config in availableConfigs:
-        selectBuildConfig(1, 0, config)
+    for kit, config in availableConfigs:
+        selectBuildConfig(1, kit, config)
         test.log("Testing build configuration: " + config)
         runAndCloseApp()
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py
index 02b4588f06..f04e0e4959 100644
--- a/tests/system/suite_debugger/tst_cli_output_console/test.py
+++ b/tests/system/suite_debugger/tst_cli_output_console/test.py
@@ -36,11 +36,11 @@ def main():
     test.verify("CONFIG   += console" in str(proEditor.plainText), "Verifying that program is configured with console")
     setRunInTerminal(1, 0, False)
 
-    availableConfigs = iterateBuildConfigs(1, 0)
+    availableConfigs = iterateBuildConfigs(1)
     if not availableConfigs:
         test.fatal("Haven't found a suitable Qt version - leaving without building.")
-    for config in availableConfigs:
-        selectBuildConfig(1, 0, config)
+    for kit, config in availableConfigs:
+        selectBuildConfig(1, kit, config)
         test.log("Testing build configuration: " + config)
 
         test.log("Running application")
diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py
index 525ce8502a..5d0a12490e 100644
--- a/tests/system/suite_debugger/tst_simple_debug/test.py
+++ b/tests/system/suite_debugger/tst_simple_debug/test.py
@@ -33,13 +33,13 @@ def main():
         if result:
             expectedBreakpointsOrder = [{"main.cpp":9}, {"main.qml":13}]
             # Only use 4.7.4 to work around QTBUG-25187
-            availableConfigs = iterateBuildConfigs(1, 0, "Debug")
+            availableConfigs = iterateBuildConfigs(1, "Debug")
             if not availableConfigs:
                 test.fatal("Haven't found a suitable Qt version (need Qt 4.7.4) - leaving without debugging.")
-            for config in availableConfigs:
+            for kit, config in availableConfigs:
                 test.log("Selecting '%s' as build config" % config)
-                selectBuildConfig(1, 0, config)
-                verifyBuildConfig(1, 0, True, enableQmlDebug=True)
+                selectBuildConfig(1, kit, config)
+                verifyBuildConfig(1, kit, True, enableQmlDebug=True)
                 # explicitly build before start debugging for adding the executable as allowed program to WinFW
                 invokeMenuItem("Build", "Rebuild All")
                 waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}",