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

Squish: Fix for UI change

Browse Source 
Additionally changed waiting for TargetSelector
from 20s to only 5s.

Change-Id: I2e342faa6f87b86335bb01f28832ad9c01a27ffb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Christian Stenger
2012-06-14 14:28:00 +02:00
committed by Robert Löhning
parent b9a4f9413f
commit eeb7ecbb40
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/system/shared/hook_utils.py
View File

@@ -78,8 +78,9 @@ def modifyRunSettingsForHookIntoQtQuickUI(projectName, port):
"window=':Qt Creator_Core::Internal::MainWindow' occurrence='2'}")
clickButton(addRunConfig)
activateItem(waitForObject("{type='QMenu' visible='1' unnamed='1'}"), "Custom Executable")
exePathChooser = waitForObject("{buddy={window=':Qt Creator_Core::Internal::MainWindow' text='Executable:' "
"type='QLabel'} type='Utils::PathChooser' unnamed='1' visible='1'}")
exePathChooser = waitForObject("{buddy={window=':Qt Creator_Core::Internal::MainWindow' text='Command:' "
"type='QLabel' unnamed='1' visible='1'} type='Utils::PathChooser' "
"unnamed='1' visible='1'}")
exeLineEd = getChildByClass(exePathChooser, "Utils::BaseValidatingLineEdit")
argLineEd = waitForObject("{buddy={window=':Qt Creator_Core::Internal::MainWindow' type='QLabel' "
"text='Arguments:' visible='1'} type='QLineEdit' unnamed='1' visible='1'}")

2
tests/system/shared/project_explorer.py
View File

@@ -76,7 +76,7 @@ def prepareBuildSettings(targetCount, currentTarget, setReleaseBuild=True, disab
def switchToBuildOrRunSettingsFor(targetCount, currentTarget, projectSettings, isQtQuickUI=False):
try:
targetSel = waitForObject("{type='ProjectExplorer::Internal::TargetSelector' unnamed='1' "
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}")
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 5000)
except LookupError:
# if it's a QtQuick UI - this depends on the creator version - so better not fatal
if isQtQuickUI: