aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2020-06-24 19:01:48 +0200
committerRobert Loehning <robert.loehning@qt.io>2020-07-02 11:15:13 +0000
commitcc63b3b47ac53573b9ad475a07d13f97541c3fb7 (patch)
tree4a66466b4391409671fee98f7a7164ef60876b90 /tests
parent3650dd8b425bb30cf0800c5fe8a6d51b45263172 (diff)
Squish: Update menu items
Change-Id: Ibbca07fb02092ce829246e99b2365b513b1fa4e0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/system/shared/debugger.py4
-rw-r--r--tests/system/suite_debugger/tst_debug_empty_main/test.py2
-rw-r--r--tests/system/suite_debugger/tst_qml_js_console/test.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py
index 930e74980f..5c9f01d5f2 100644
--- a/tests/system/shared/debugger.py
+++ b/tests/system/shared/debugger.py
@@ -51,14 +51,14 @@ def handleDebuggerWarnings(config, isMsvcBuild=False):
clickButton("{text='OK' type='QPushButton' unnamed='1' visible='1' window=%s}" % msgBox)
def takeDebuggerLog():
- invokeMenuItem("Window", "Views", "Global Debugger Log")
+ invokeMenuItem("View", "Views", "Global Debugger Log")
debuggerLogWindow = waitForObject("{container=':DebugModeWidget.Debugger Log_QDockWidget' "
"type='Debugger::Internal::DebuggerPane' unnamed='1' visible='1'}")
debuggerLog = str(debuggerLogWindow.plainText)
mouseClick(debuggerLogWindow)
invokeContextMenuItem(debuggerLogWindow, "Clear Contents")
waitFor("str(debuggerLogWindow.plainText)==''", 5000)
- invokeMenuItem("Window", "Views", "Global Debugger Log")
+ invokeMenuItem("View", "Views", "Global Debugger Log")
return debuggerLog
# function to set breakpoints for the current project
diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py
index f71cd45d44..2d72b81ee4 100644
--- a/tests/system/suite_debugger/tst_debug_empty_main/test.py
+++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py
@@ -52,7 +52,7 @@ def main():
workingDir = tempDir()
projectName = createEmptyQtProject(workingDir, "EmptyQtProj", targets)
waitForProjectParsing()
- addFileToProject(os.path.join(workingDir, projectName), " C++", "C++ Source File", "main.cpp")
+ addFileToProject(os.path.join(workingDir, projectName), " C/C++", "C/C++ Source File", "main.cpp")
editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
typeLines(editor, ["int main() {"])
invokeMenuItem("File", "Save All")
diff --git a/tests/system/suite_debugger/tst_qml_js_console/test.py b/tests/system/suite_debugger/tst_qml_js_console/test.py
index 040ceed705..206e3f8a25 100644
--- a/tests/system/suite_debugger/tst_qml_js_console/test.py
+++ b/tests/system/suite_debugger/tst_qml_js_console/test.py
@@ -152,7 +152,7 @@ def main():
invokeMenuItem("View", "Output Panes", "QML Debugger Console")
# Window might be too small to show Locals, so close what we don't need
for view in ("Stack", "Breakpoints", "Expressions"):
- invokeMenuItem("Window", "Views", view)
+ invokeMenuItem("View", "Views", view)
# color and float values have additional ZERO WIDTH SPACE (\u200b), different usage of
# whitespaces inside expressions is part of the test
checks = [("color", u"#\u200b008000"), ("width", "50"),