Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
	src/plugins/texteditor/fontsettingspage.cpp

Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0
This commit is contained in:
Eike Ziller
2022-08-31 11:03:13 +02:00
100 changed files with 603 additions and 454 deletions

View File

@@ -582,8 +582,8 @@
\li Open the QML file that defines the selected component
\li F2
\row
\li Move between \uicontrol {Text Editor} and
\uicontrol {Form Editor}
\li Move between \uicontrol the {Code} and
\uicontrol {2D} views
\li F4
\row
\li Toggle left sidebar