diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2014-06-03 14:06:58 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2014-06-03 14:57:34 +0200 |
| commit | e1678640638f8e1ce0cd52ccc2f268468afa9751 (patch) | |
| tree | 6e347b3fa5ab89079cc8c9f5e1fe0e4e1fd75116 /tests/system | |
| parent | 712b13f60771e7dff77514e220748f087cde43d3 (diff) | |
| download | qt-creator-e1678640638f8e1ce0cd52ccc2f268468afa9751.tar.gz | |
Squish: Avoid pointless waiting and warning in selectBuildConfig()
Change-Id: Ia092d7e7f9af78c23512fa193635ff52fead822d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system')
| -rw-r--r-- | tests/system/shared/build_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index dfedf09596..51eb4c71d0 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -164,8 +164,8 @@ def iterateBuildConfigs(kitCount, filter = ""): def selectBuildConfig(targetCount, currentTarget, configName, afterSwitchTo=ViewConstants.EDIT): switchViewTo(ViewConstants.PROJECTS) switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD) - selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) - progressBarWait(30000) + if selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) or targetCount > 1: + progressBarWait(30000) return getQtInformationForBuildSettings(targetCount, True, afterSwitchTo) # This will not trigger a rebuild. If needed, caller has to do this. |