feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/CMakeLists.txt

Change-Id: I500420df35519e6903abc570d1283185f01bf900
This commit is contained in:
Eike Ziller
2022-10-10 11:47:45 +02:00
parent fb643db088 4bbbee1e63
commit 7efb0a0625
846 changed files with 6064 additions and 13885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
View File

@@ -92,7 +92,7 @@ WidgetInfo MaterialBrowserView::widgetInfo()
propNames.append(changedProp.name());
}
}
for (const PropertyName &propName : qAsConst(propNames)) {
for (const PropertyName &propName : std::as_const(propNames)) {
if (propName != "objectName")
mat.removeProperty(propName);
}