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

Squish: Update menu objects

Browse Source 
Change-Id: Id1c8ee441a8479aa2bd19410e88c4ea48d0ee3f9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-01-15 13:55:43 +01:00
parent 9d9ec3a91b
commit 6ad3f3975c
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/objects.map
+1 -1
View File
@@ -135,7 +135,7 @@
:Qt Creator.DebugModeWidget_QSplitter {name='DebugModeWidget' type='QSplitter' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator.Issues_QListView {type='QListView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Issues'}
:Qt Creator.Project.Menu.File_QMenu {name='Project.Menu.File' type='QMenu'}
:Qt Creator.Project.Menu.Folder_QMenu {name='Project.Menu.Folder' type='QMenu' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator.Project.Menu.Folder_QMenu {name='Project.Menu.Folder' type='QMenu' visible='1'}
:Qt Creator.QtCreator.MenuBar_QMenuBar {name='QtCreator.MenuBar' type='QMenuBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator.ReRun_QToolButton {toolTip='Re-run this run-configuration' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator.Replace All_QToolButton {name='replaceAllButton' text='Replace All' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
tests/system/shared/project_explorer.py
+1 -2
View File
@@ -304,6 +304,5 @@ def invokeContextMenuOnProject(projectName, menuItem):
if platform.system() == 'Darwin':
waitFor("macHackActivateContextMenuItem(menuItem)", 6000)
else:
activateItem(waitForObjectItem("{name='Project.Menu.Project' type='QMenu' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}", menuItem))
activateItem(waitForObjectItem("{name='Project.Menu.Project' type='QMenu' visible='1'}", menuItem))
return projItem
tests/system/suite_editors/tst_revert_changes/test.py
+1 -2
View File
@@ -116,8 +116,7 @@ def revertChanges(files):
simpleName = simpleFileName(f)
test.log("Trying to revert changes for '%s'" % simpleName)
if openDocument(f):
fileMenu = findObject("{name='QtCreator.Menu.File' title='File' type='QMenu' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
fileMenu = findObject("{name='QtCreator.Menu.File' title='File' type='QMenu'}")
for menuItem in object.children(fileMenu):
if str(menuItem.text) == 'Revert "%s" to Saved' % simpleName:
if (test.compare(canRevert, menuItem.enabled, "Verifying whether MenuItem "