From 857261f99df8cec10f6f58b321fcc19d0dbdc4e9 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@nokia.com>
Date: Tue, 27 Mar 2012 16:10:59 +0200
Subject: [PATCH] Squish: Improve openQmakeProject()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I847604f81d1bdb10a56360af3d0969e451b3344c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
---
tests/system/shared/project.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 32821c7afd6..aba43b65bf5 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -11,11 +11,12 @@ def __handleProcessExited__(object, exitCode):
global processExited
processExited = True
-def openQmakeProject(projectPath):
+def openQmakeProject(projectPath, targets=QtQuickConstants.Targets.DESKTOP):
invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(projectPath)
selectFromCombo(waitForObject(":Qt Creator.Create Build Configurations:_QComboBox", 180000),
"For Each Qt Version One Debug And One Release")
+ __chooseTargets__(targets)
configureButton = waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
"window=':Qt Creator_Core::Internal::MainWindow'}", 20000)
clickButton(configureButton)
@@ -265,6 +266,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP, availableTargets
QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):
available += [QtQuickConstants.Targets.SYMBIAN]
+ available.remove(QtQuickConstants.Targets.EMBEDDED_LINUX)
for current in available:
mustCheck = targets & current == current
try:
--
GitLab