diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-01-23 10:39:50 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-01-23 11:16:57 +0100 |
| commit | 185a22f0d03ea3deccd94d32a420282f93d6fc0a (patch) | |
| tree | 8ff9c81d80b3d0cab3fc5e3ae07cc1d99460a42b | |
| parent | bbb0becf8149eae45a61b4fc5a07c3dc76b5afa2 (diff) | |
| download | qt-creator-185a22f0d03ea3deccd94d32a420282f93d6fc0a.tar.gz | |
Squish: Avoid crash in tst_designer_autocomplete on Mac
Again this is related to Squish 5 having problems handling menus
on Qt5.2 built applications.
Change-Id: Ia017b48db5b6ab816a50504abc05c086fdf65799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| -rw-r--r-- | tests/system/suite_tools/tst_designer_autocomplete/test.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py index 9ccbfc2906..f57a433899 100644 --- a/tests/system/suite_tools/tst_designer_autocomplete/test.py +++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py @@ -42,7 +42,14 @@ def main(): if buttonName: openContextMenu(waitForObject("{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack'" "text='PushButton' type='QPushButton' visible='1'}"), 5, 5, 1) - activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1'}", "Change objectName...")) + # hack for Squish5/Qt5.2 problems of handling menus on Mac - remove asap + if platform.system() == 'Darwin': + for obj in object.topLevelObjects(): + if className(obj) == 'QMenu' and obj.visible: + activateItem(obj, "Change objectName...") + break + else: + activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1'}", "Change objectName...")) typeLines(waitForObject(":FormEditorStack_qdesigner_internal::PropertyLineEdit"), buttonName) else: # Verify that everything works without ever changing the name |