From 49adb78ec967be09cfb934d997fb9bc54f1c535e Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Tue, 3 Sep 2013 16:47:09 +0200
Subject: [PATCH] Squish: Fix tst_create_proj_wizard
Change-Id: Ie4fb69873edb8be5cfb0e82a920cb90e822f6a7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
tests/system/objects.map | 2 +-
tests/system/suite_general/tst_create_proj_wizard/test.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/system/objects.map b/tests/system/objects.map
index c427b28aaa7..9960a89452e 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -97,7 +97,7 @@
:Installed Plugins_Core::Internal::PluginDialog {type='Core::Internal::PluginDialog' unnamed='1' visible='1' windowTitle='Installed Plugins'}
:JavaScript.QmlProfilerV8ProfileTable_QmlProfiler::Internal::QmlProfilerEventsMainView {container=':*Qt Creator.JavaScript_QDockWidget' name='QmlProfilerV8ProfileTable' type='QmlProfiler::Internal::QmlProfilerEventsMainView' visible='1'}
:Kits_Or_Compilers_QTreeView {container=':qt_tabwidget_stackedwidget_QWidget' type='QTreeView' unnamed='1' visible='1'}
-:Kits_QtVersion_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' occurrence='4' type='QComboBox' unnamed='1' visible='1'}
+:Kits_QtVersion_QComboBox {container=':qt_tabwidget_stackedwidget_QWidget' occurrence='5' type='QComboBox' unnamed='1' visible='1'}
:Locals and Expressions_Debugger::Internal::WatchTreeView {container=':DebugModeWidget.Locals and Expressions_QDockWidget' name='WatchWindow' type='Debugger::Internal::WatchTreeView' visible='1' windowTitle='Locals and Expressions'}
:New.comboBox_QComboBox {name='comboBox' type='QComboBox' visible='1' window=':New_Core::Internal::NewDialog'}
:New.frame_QFrame {name='frame' type='QFrame' visible='1' window=':New_Core::Internal::NewDialog'}
diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py
index 065a59f4f86..21a8d29525a 100644
--- a/tests/system/suite_general/tst_create_proj_wizard/test.py
+++ b/tests/system/suite_general/tst_create_proj_wizard/test.py
@@ -83,7 +83,7 @@ def performTest(templateDir, qmlFile, isMaddeDisabled):
template = template.replace(".", "\\.")
# skip non-configurable
if not (template in ("Qt Quick 1 UI", "Qt Quick 2 UI", "Qt Quick 2 UI with Controls")
- or "(CMake Build)" in template):
+ or "(CMake Build)" in template or "(Qbs Build)" in template):
availableProjectTypes.append({category:template})
clickButton(waitForObject("{text='Cancel' type='QPushButton' unnamed='1' visible='1'}"))
for current in availableProjectTypes:
--
GitLab