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

QmlDesigner: Fix lingering merge conflict

Browse Source 
Materials are applied to Quick3DModel not QtQuick3DParticles3DModel
(Which does not exist).

Change-Id: I350d9864c7eb3a7b6879e8d58646c7c2c7b8e0d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2023-01-04 16:50:16 +01:00
parent 63e885e7a1
commit 28b6c30bd8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
View File

@@ -90,11 +90,11 @@ ChooseFromPropertyListFilter::ChooseFromPropertyListFilter(const NodeMetaInfo &i
|| parentInfo.isQtQuick3DParticles3DAttractor3D())
propertyList.append("shape");
} else if (insertInfo.isQtQuick3DMaterial()) {
if (parentInfo.isQtQuick3DParticles3DModel())
if (parentInfo.isQtQuick3DModel())
propertyList.append("materials");
} else if (insertInfo.typeName().startsWith("ComponentBundles.MaterialBundle")) {
if (parentInfo.isQtQuick3DModel())
propertyList.append("materials");
// TODO merge conflict between Change-Id: If3c58f82797beabe76baf99ea2dddc59032729df and Change-Id: Iff2dea66e253b412105427134bd49cb16ed76193
// } else if (insertInfo.typeName().startsWith("ComponentBundles.MaterialBundle")) {
// if (parentInfo.isSubclassOf("QtQuick3D.Model"))
} else if (insertInfo.isEffectMaker()) {
if (parentInfo.isQtQuickItem())
propertyList.append("effect");