Merge remote-tracking branch 'origin/6.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I32991a77e52831dd2e24cf4a51ec252998c2d743
This commit is contained in:
Eike Ziller
2021-12-09 12:02:47 +01:00
328 changed files with 2093 additions and 709 deletions

View File

@@ -339,7 +339,7 @@
\section1 Compiling and Running Your Program
Now that you have all the necessary files, select the
\inlineimage run_small.png
\inlineimage icons/run_small.png
button to compile and run your program.
*/