From 4d3b34b4b07351742f80bc54000e4a6c235ac49e Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 21 Aug 2020 17:04:17 +0300 Subject: [PATCH] QmlDesigner: Blacklist some quick3d property names as ids Quick3D has some properties that are named same as default ids for some other types, causing conflicts. Blacklist offending properties as ids. Task-number: QDS-2636 Change-Id: I988c69f61608ad7d80726dd74747917360827b84 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/model/modelnode.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index eb2d2859974..b926e225882 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -216,7 +216,9 @@ static bool isIdToAvoid(const QString& id) "layer", "scale", "enabled", - "anchors" + "anchors", + "texture", + "shaderInfo" }; return ids.contains(id);