diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2016-09-09 06:58:03 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2016-09-30 10:09:10 +0000 |
| commit | 3adef3cc7c84fb24fcf9630b47d2ac91cff6dd42 (patch) | |
| tree | b3292c0c7ca2f684cb4439ddf5a57741e570190f /tests | |
| parent | fd5f3073ec1c15621e79ce4c5442991920c64356 (diff) | |
| download | qt-creator-3adef3cc7c84fb24fcf9630b47d2ac91cff6dd42.tar.gz | |
Squish: Remove OSX specific workaround
Change-Id: I9e43c47c5ef2422d46e10b9f2fd88454b4352c30
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/shared/editor_utils.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 588ee3e642..e3afb02afc 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -344,20 +344,10 @@ def validateSearchResult(expectedCount): def invokeContextMenuItem(editorArea, command1, command2 = None): ctxtMenu = openContextMenuOnTextCursorPosition(editorArea) snooze(1) - if platform.system() == 'Darwin': - item1 = waitForObjectItem(ctxtMenu, command1) - subMenu = item1.menu() - activateItem(item1) - # subMenu could have been triggered by hovering, but closed again by clicking - if subMenu and not subMenu.visible: - activateItem(item1) - if command2: - activateItem(subMenu, command2) - else: - activateItem(waitForObjectItem(objectMap.realName(ctxtMenu), command1, 2000)) - if command2: - activateItem(waitForObjectItem("{title='%s' type='QMenu' visible='1' window=%s}" - % (command1, objectMap.realName(ctxtMenu)), command2, 2000)) + activateItem(waitForObjectItem(objectMap.realName(ctxtMenu), command1, 2000)) + if command2: + activateItem(waitForObjectItem("{title='%s' type='QMenu' visible='1' window=%s}" + % (command1, objectMap.realName(ctxtMenu)), command2, 2000)) # this function invokes the "Find Usages" item from context menu # param editor an editor object |