From 203b03f823748d31c3a3d9dcce445cf27339bd59 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 4 Sep 2012 15:11:08 +0200 Subject: [PATCH] Squish: Fix for missing scrollArea Change-Id: I5419b30b8dd0cc67af4d54a3bb89edd5368cb983 Reviewed-by: Robert Loehning --- tests/system/objects.map | 2 -- tests/system/shared/project.py | 6 ++++-- tests/system/suite_APTW/objects.map | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 028ceba9e14..538e4e00d0b 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -71,8 +71,6 @@ :scrollArea.Edit build configuration:_QComboBox {leftWidget=':scrollArea.Edit build configuration:_QLabel' type='QComboBox' unnamed='1' visible='1'} :scrollArea.Edit build configuration:_QLabel {text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'} :scrollArea.Library not available_QLabel {name='qmlDebuggingWarningText' text?='Library not available*' type='QLabel' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox {container=':Qt Gui Application.scrollArea_QScrollArea' occurrence='1' text='Debug' type='QCheckBox' unnamed='1' visible='1'} -:scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox {container=':Qt Gui Application.scrollArea_QScrollArea' occurrence='1' text='Release' type='QCheckBox' unnamed='1' visible='1'} :scrollArea.Use Shadow Building_QCheckBox {container=':Qt Gui Application.scrollArea_QScrollArea' text='Shadow build' type='QCheckBox' unnamed='1' visible='1'} :scrollArea.qmlDebuggingLibraryCheckBox_QCheckBox {name='qmlDebuggingLibraryCheckBox' type='QCheckBox' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :scrollArea_QTableView {type='QTableView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 8fc7177e9ce..9bce4e75633 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -112,8 +112,10 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True): def __selectQtVersionDesktop__(checks, available=None): __chooseTargets__(QtQuickConstants.Targets.DESKTOP, available) if checks: - verifyChecked(":scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox") - verifyChecked(":scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox") + cbObject = ("{type='QCheckBox' text='%s' unnamed='1' visible='1' " + "container={type='Utils::DetailsWidget' visible='1' unnamed='1'}}") + verifyChecked(cbObject % "Debug") + verifyChecked(cbObject % "Release") clickButton(waitForObject(":Next_QPushButton")) def __createProjectHandleLastPage__(expectedFiles = None): diff --git a/tests/system/suite_APTW/objects.map b/tests/system/suite_APTW/objects.map index 1eba3dab36d..be982b486c6 100644 --- a/tests/system/suite_APTW/objects.map +++ b/tests/system/suite_APTW/objects.map @@ -21,7 +21,5 @@ :scrollArea.Create Build Configurations:_QLabel_2 {container=':Qt Gui Application.scrollArea_QScrollArea' text='Create build configurations:' type='QLabel' unnamed='1' visible='1'} :scrollArea.Edit build configuration:_QComboBox {leftWidget=':scrollArea.Edit build configuration:_QLabel' type='QComboBox' unnamed='1' visible='1'} :scrollArea.Edit build configuration:_QLabel {text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'} -:scrollArea.Qt 4 for Desktop - (Qt SDK) debug_QCheckBox {container=':Qt Gui Application.scrollArea_QScrollArea' occurence='1' text='Debug' type='QCheckBox' unnamed='1' visible='1'} -:scrollArea.Qt 4 for Desktop - (Qt SDK) release_QCheckBox {container=':Qt Gui Application.scrollArea_QScrollArea' occurence='1' text='Release' type='QCheckBox' unnamed='1' visible='1'} :scrollArea.Use Shadow Building_QCheckBox {container=':Qt Gui Application.scrollArea_QScrollArea' text='Shadow build' type='QCheckBox' unnamed='1' visible='1'} :sourceFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Source file:_QLabel' name='sourceFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}