feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Avoid pointless waiting and warning in selectBuildConfig()

Browse Source 
Change-Id: Ia092d7e7f9af78c23512fa193635ff52fead822d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2014-06-03 14:06:58 +02:00
parent 712b13f607
commit e167864063
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/system/shared/build_utils.py
View File

@@ -164,8 +164,8 @@ def iterateBuildConfigs(kitCount, filter = ""):
def selectBuildConfig(targetCount, currentTarget, configName, afterSwitchTo=ViewConstants.EDIT): def selectBuildConfig(targetCount, currentTarget, configName, afterSwitchTo=ViewConstants.EDIT):
switchViewTo(ViewConstants.PROJECTS) switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD) switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD)
selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) if selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) or targetCount > 1:
progressBarWait(30000) progressBarWait(30000)
return getQtInformationForBuildSettings(targetCount, True, afterSwitchTo) return getQtInformationForBuildSettings(targetCount, True, afterSwitchTo)
# This will not trigger a rebuild. If needed, caller has to do this. # This will not trigger a rebuild. If needed, caller has to do this.