diff options
| author | Christian Stenger <christian.stenger@nokia.com> | 2012-06-13 13:34:33 +0200 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@nokia.com> | 2012-06-18 19:49:46 +0200 |
| commit | 89aaa9603156e7921e946ef85c101ff8bfc4c797 (patch) | |
| tree | 2894bcad76b4bf13f3cf1ca235fd4da5a67bd4dd | |
| parent | 56c7facc687f10fb9f55ce3b99aadc381b377b07 (diff) | |
| download | qt-creator-89aaa9603156e7921e946ef85c101ff8bfc4c797.tar.gz | |
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: Robert Löhning <robert.loehning@nokia.com>
| -rw-r--r-- | tests/system/shared/project.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index ac8a7add4a..78ffe84209 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -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] |