aboutsummaryrefslogtreecommitdiffstats
path: root/tests/system
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2019-06-26 12:18:12 +0200
committerRobert Loehning <robert.loehning@qt.io>2019-06-27 12:59:32 +0000
commitf25408c4364c977c97511ccad1b61ecd7b3df872 (patch)
tree3b72051b7540166866454d393c0a45d454d9c138 /tests/system
parent0b5d60db535179f361fb990851603417a557de86 (diff)
Squish: Remove outdated code
Change-Id: Ic4c3cf43aed15756aaeaa4a5e7ed5240bed2545c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system')
-rw-r--r--tests/system/objects.map1
-rw-r--r--tests/system/suite_tools/tst_designer_goto_slot/test.py10
2 files changed, 2 insertions, 9 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map
index b1989cbe7a..c6064297c7 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -182,7 +182,6 @@
:Select a Git Commit.workingDirectoryEdit_QLineEdit {type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Select a Git Commit_Git::Internal::ChangeSelectionDialog'}
:Select a Git Commit_Git::Internal::ChangeSelectionDialog {name='Git__Internal__ChangeSelectionDialog' type='Git::Internal::ChangeSelectionDialog' visible='1' windowTitle='Select a Git Commit'}
:Select signal.signalList_QTreeView {container=':Go to slot.Select signal_QGroupBox' name='signalList' type='QTreeView' visible='1'}
-:Select signal.signalList_QTreeWidget {container=':Go to slot.Select signal_QGroupBox' name='signalList' type='QTreeWidget' visible='1'}
:Send to Codepaster.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
:Send to Codepaster.Description:_QLabel {name='descriptionLabel' text='Description:' type='QLabel' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
:Send to Codepaster.Paste_QPushButton {text='Paste' type='QPushButton' unnamed='1' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
diff --git a/tests/system/suite_tools/tst_designer_goto_slot/test.py b/tests/system/suite_tools/tst_designer_goto_slot/test.py
index eadea648ae..f1e47727db 100644
--- a/tests/system/suite_tools/tst_designer_goto_slot/test.py
+++ b/tests/system/suite_tools/tst_designer_goto_slot/test.py
@@ -50,14 +50,8 @@ def main():
waitFor("macHackActivateContextMenuItem('Go to slot...', con[0])", 6000)
else:
activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1'}", "Go to slot..."))
- try:
- # Creator built with Qt <= 5.9
- signalWidgetObject = waitForObject(":Select signal.signalList_QTreeWidget", 5000)
- signalName = con[2]
- except:
- # Creator built with Qt >= 5.10
- signalWidgetObject = waitForObject(":Select signal.signalList_QTreeView")
- signalName = con[1] + "." + con[2]
+ signalWidgetObject = waitForObject(":Select signal.signalList_QTreeView")
+ signalName = con[1] + "." + con[2]
waitForObjectItem(signalWidgetObject, signalName)
clickItem(signalWidgetObject, signalName, 5, 5, 0, Qt.LeftButton)
clickButton(waitForObject(":Go to slot.OK_QPushButton"))