feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix menu handling on macOS

Browse Source 
Some menus inside QC have special numbering - but this only
applies to Linux and Windows. On macOS we do not add this
special numbering.
Additionally this patch stabilizes the triggering of
submenus. When they get triggered it takes a split of a
second until the items inside the menu are usable.
Let squish wait until the sub menu is fully present before
trying to activate some of its items.

Change-Id: I32c688a937ada1da07506d4ebd22730e4f2bcaef
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Christian Stenger
2023-07-18 15:14:40 +02:00
parent c0b29f28c0
commit a86356ce8a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/system/shared/utils.py
View File

@@ -171,6 +171,10 @@ def invokeMenuItem(menu, item, *subItems):
numberedPrefix = "%d | " numberedPrefix = "%d | "
for subItem in subItems: for subItem in subItems:
# we might have numbered sub items (e.g. "Recent Files") - these have this special prefix # we might have numbered sub items (e.g. "Recent Files") - these have this special prefix
# but on macOS we don't add these prefixes
if platform.system() == 'Darwin' and subItem.startswith(numberedPrefix):
subItem = subItem[5:]
if subItem.startswith(numberedPrefix): if subItem.startswith(numberedPrefix):
triggered = False triggered = False
for i in range(1, 10): for i in range(1, 10):
@@ -186,7 +190,10 @@ def invokeMenuItem(menu, item, *subItems):
"Function arguments: '%s', '%s', %s" % (menu, item, str(subItems))) "Function arguments: '%s', '%s', %s" % (menu, item, str(subItems)))
break # we failed to trigger - no need to process subItems further break # we failed to trigger - no need to process subItems further
else: else:
noAmpersandItem = item.replace('&', '')
waitForObject("{type='QMenu' title='%s'}" % noAmpersandItem, 2000)
itemObject = waitForObjectItem(itemObject, subItem) itemObject = waitForObjectItem(itemObject, subItem)
waitFor("itemObject.enabled", 2000)
activateItem(itemObject) activateItem(itemObject)