summaryrefslogtreecommitdiff
path: root/tests/system/shared/build_utils.py
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2013-12-18 16:04:03 +0100
committerRobert Loehning <robert.loehning@digia.com>2013-12-19 11:39:03 +0100
commit5e42856947c1ba3888eaff52afe5239f007672c6 (patch)
tree9bfc896dc19b6d8f30b71fbc871bb3c022e2ca4b /tests/system/shared/build_utils.py
parent9c2923b05f17293f24e8e9d94fe76aac1f17d8fb (diff)
downloadqt-creator-5e42856947c1ba3888eaff52afe5239f007672c6.tar.gz
Squish: Fix bug in selectBuildConfig()
Function did not wait when configName did not change, even when the active kit did change. Change-Id: Ia0954ee7da45864aefe88ad1919124c065af2ac1 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system/shared/build_utils.py')
-rw-r--r--tests/system/shared/build_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py
index 5a34aac4a3..5a2ff968cc 100644
--- a/tests/system/shared/build_utils.py
+++ b/tests/system/shared/build_utils.py
@@ -184,8 +184,8 @@ def iterateBuildConfigs(kitCount, filter = ""):
def selectBuildConfig(targetCount, currentTarget, configName):
switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD)
- if selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName):
- progressBarWait(30000)
+ selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName)
+ progressBarWait(30000)
return getQtInformationForBuildSettings(targetCount, True, ViewConstants.EDIT)
# This will not trigger a rebuild. If needed, caller has to do this.