diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-08-21 17:04:17 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-08-24 07:17:39 +0000 |
| commit | 4d3b34b4b07351742f80bc54000e4a6c235ac49e (patch) | |
| tree | 5e27c50425cefb8c6f3c280324362ca2bcdcde46 /src/plugins/qmldesigner/designercore | |
| parent | 9fee8a6bc07428b2128cd974cae2ae145e86c068 (diff) | |
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 <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/modelnode.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index eb2d285997..b926e22588 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); |