Merge remote-tracking branch 'origin/7.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/studiowelcome/recentpresets.h
	src/plugins/studiowelcome/userpresets.h

Change-Id: Ie573b945eb28347a36ee1b3582fbd6ab0c0f866c
This commit is contained in:
Eike Ziller
2022-03-28 15:10:11 +02:00
62 changed files with 974 additions and 880 deletions

View File

@@ -227,6 +227,8 @@ ModelNode TransitionEditorView::addNewTransition()
const QString targetId = target.id();
for (const VariantProperty &property : change.modelNode().variantProperties()) {
TypeName typeName = target.metaInfo().propertyTypeName(property.name());
if (typeName.startsWith("<cpp>."))
typeName.remove(0, 6);
if (validProperties.contains(typeName))
locList.append(QString::fromUtf8(property.name()));