From d3b68556faac6704addadaa2efffec6de2362180 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 3 Apr 2013 13:57:02 +0200 Subject: [PATCH] Squish: Let iterateBuildConfigs() give information about kit Change-Id: I283fbc773c0490c4c9cb5558e9aedfdb94ba5366 Reviewed-by: Christian Stenger --- tests/system/shared/build_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index c858333fdea..491c4bb7df2 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -158,13 +158,14 @@ def iterateBuildConfigs(kitCount, filter = ""): # param targetCount specifies the number of targets currently defined (must be correct!) # param currentTarget specifies the target for which to switch into the specified settings (zero based index) # param configName is the name of the configuration that should be selected +# returns information about the selected kit, see getQtInformationForBuildSettings def selectBuildConfig(targetCount, currentTarget, configName): switchViewTo(ViewConstants.PROJECTS) switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD) if selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName): waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") - switchViewTo(ViewConstants.EDIT) + return getQtInformationForBuildSettings(targetCount, True, ViewConstants.EDIT) # This will not trigger a rebuild. If needed, caller has to do this. def verifyBuildConfig(targetCount, currentTarget, shouldBeDebug=False, enableShadowBuild=False, enableQmlDebug=False):