Commit 506c0685 authored by Robert Loehning's avatar Robert Loehning

Squish: Avoid menu problems with Squish 6.0.0

Change-Id: I43219d36f07e2b5636f84f891f94220148f4dd7f
Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
parent 974fe9f8
......@@ -345,6 +345,7 @@ def validateSearchResult(expectedCount):
# this function invokes context menu and command from it
def invokeContextMenuItem(editorArea, command1, command2 = None):
ctxtMenu = openContextMenuOnTextCursorPosition(editorArea)
snooze(1)
if platform.system() == 'Darwin':
activateItem(ctxtMenu, command1)
else:
......
......@@ -211,6 +211,7 @@ def invokeMenuItem(menu, item, *subItems):
nativeType("<Command+q>")
return
menuObject = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", menu)
snooze(1)
waitFor("menuObject.visible", 1000)
activateItem(menuObject)
itemObject = waitForObjectItem(objectMap.realName(menuObject), item)
......
......@@ -48,6 +48,7 @@ def main():
for con in connections:
selectFromLocator("mainwindow.ui")
openContextMenu(waitForObject(con[0]), 5, 5, 0)
snooze(1)
# hack for Squish 5/Qt5.2 problems of handling menus on Mac - remove asap
if platform.system() == 'Darwin':
waitFor("macHackActivateContextMenuItem('Go to slot...', con[0])", 6000)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment