Merge remote-tracking branch 'origin/7.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/languageclient/languageclientoutline.cpp

Change-Id: I106fbde6467818368a8358d612d793313cad27e6
This commit is contained in:
Eike Ziller
2022-05-02 15:06:08 +02:00
51 changed files with 1868 additions and 312 deletions

View File

@@ -155,6 +155,9 @@
allows to specify exactly where a new file should be placed in the build
system.
If you cannot see some files, they might not be declared as part of the
project. For more information, see \l{Specifying Project Contents}.
If the project is under version control, information from the version
control system might be displayed in brackets after the project name.
This is currently implemented for Git (the branch name or a tag is