diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 09:49:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 09:49:28 +0200 |
| commit | a2171c2d82b810e7f596f371a7d1d3cc6989a9dd (patch) | |
| tree | ec43bcfea024aafa51bc0c698c37b9a0762a047e /tests/system/shared/build_utils.py | |
| parent | 364c95476e3a74898bf4d0884670765bb7b9f592 (diff) | |
| parent | 6999e3c33907c0b4b09902f18dee0407c6d6293e (diff) | |
| download | qt-creator-a2171c2d82b810e7f596f371a7d1d3cc6989a9dd.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
Diffstat (limited to 'tests/system/shared/build_utils.py')
| -rw-r--r-- | tests/system/shared/build_utils.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index c99a62b0ec..55ef8e8195 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -160,8 +160,7 @@ 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)") + progressBarWait(30000) return getQtInformationForBuildSettings(targetCount, True, ViewConstants.EDIT) # This will not trigger a rebuild. If needed, caller has to do this. |