Eike Ziller 82ee8baad8 Merge remote-tracking branch 'origin/7.0' ...

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

Change-Id: I254066f8be63cb5b15650ef2a470206db56de026

2022-05-25 11:42:13 +02:00

..

qmlpuppet

Merge remote-tracking branch 'origin/7.0'

2022-05-25 11:42:13 +02:00