diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-01-24 09:51:26 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-01-28 14:24:11 +0100 |
| commit | 4c39fbb95087d0c28298187f531efc44aa4232f2 (patch) | |
| tree | b0b23005ea38cc07c331f1c649512d8e7ed6f19f | |
| parent | ac9e7aad7b63d0eda9614b27c864186308f5f0e1 (diff) | |
| download | qt-creator-4c39fbb95087d0c28298187f531efc44aa4232f2.tar.gz | |
Squish: Fix hack for tst_designer_autocomplete
Change-Id: I17cfa041f42efb71358e11afcaf987e177603175
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| -rw-r--r-- | tests/system/suite_tools/tst_designer_autocomplete/test.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py index f57a433899..25ebf5865d 100644 --- a/tests/system/suite_tools/tst_designer_autocomplete/test.py +++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py @@ -29,6 +29,16 @@ source("../../shared/qtcreator.py") +def macHackActivateContextMenuItem(item): + for obj in object.topLevelObjects(): + try: + if className(obj) == 'QMenu' and obj.visible: + activateItem(waitForObjectItem(obj, item)) + return True + except: + pass + return False + def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): @@ -44,10 +54,7 @@ def main(): "text='PushButton' type='QPushButton' visible='1'}"), 5, 5, 1) # 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 + waitFor("macHackActivateContextMenuItem('Change objectName...')", 6000) else: activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1'}", "Change objectName...")) typeLines(waitForObject(":FormEditorStack_qdesigner_internal::PropertyLineEdit"), buttonName) |