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

Squish: Improve openQmakeProject()

Browse Source 
Change-Id: I847604f81d1bdb10a56360af3d0969e451b3344c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Christian Stenger
2012-03-27 16:10:59 +02:00
parent 07460d167d
commit 857261f99d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,11 +11,12 @@ def __handleProcessExited__(object, exitCode):
global processExited global processExited
processExited = True processExited = True
def openQmakeProject(projectPath): def openQmakeProject(projectPath, targets=QtQuickConstants.Targets.DESKTOP):
invokeMenuItem("File", "Open File or Project...") invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(projectPath) selectFromFileDialog(projectPath)
selectFromCombo(waitForObject(":Qt Creator.Create Build Configurations:_QComboBox", 180000), selectFromCombo(waitForObject(":Qt Creator.Create Build Configurations:_QComboBox", 180000),
"For Each Qt Version One Debug And One Release") "For Each Qt Version One Debug And One Release")
__chooseTargets__(targets)
configureButton = waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'" configureButton = waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
"window=':Qt Creator_Core::Internal::MainWindow'}", 20000) "window=':Qt Creator_Core::Internal::MainWindow'}", 20000)
clickButton(configureButton) clickButton(configureButton)
@@ -265,6 +266,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP, availableTargets
QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN] QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
available += [QtQuickConstants.Targets.SYMBIAN] available += [QtQuickConstants.Targets.SYMBIAN]
available.remove(QtQuickConstants.Targets.EMBEDDED_LINUX)
for current in available: for current in available:
mustCheck = targets & current == current mustCheck = targets & current == current
try: try: