Commit 89aaa960 authored by Christian Stenger's avatar Christian Stenger Committed by Robert Löhning

Squish: Fix project.py

* add Desktop as available target in __chooseTargets__()
* do shadow builds for Desktop targets in openQmakeProject()

This patch makes https://codereview.qt-project.org/#change,28038
pass for me on Linux as well.

Change-Id: I3a4395a401198756e6a7d6a38c0b024167088dc3
Reviewed-by: default avatarRobert Löhning <robert.loehning@nokia.com>
parent 56c7facc
......@@ -26,6 +26,10 @@ def openQmakeProject(projectPath, targets=QtQuickConstants.Targets.DESKTOP):
selectFromCombo(waitForObject(":Qt Creator.Create Build Configurations:_QComboBox", 180000),
"For Each Qt Version One Debug And One Release")
__chooseTargets__(targets)
if targets & QtQuickConstants.Targets.DESKTOP:
ensureChecked("{text='Shadow build' type='QCheckBox' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
configureButton = waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
"window=':Qt Creator_Core::Internal::MainWindow'}", 20000)
clickButton(configureButton)
......@@ -273,7 +277,8 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP, availableTargets
available = availableTargets
else:
# following targets depend on the build environment - added for further/later tests
available = [QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.EMBEDDED_LINUX,
available = [QtQuickConstants.Targets.DESKTOP,
QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.EMBEDDED_LINUX,
QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'):
available += [QtQuickConstants.Targets.SYMBIAN]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment