QmlDesigner: rotBlock is using it own aux type

rotBlock was using the mechanism to overwrite values but actually it is
only for communication to the puppet. So now there is
NodeInstanceAuxiliary as a generic way. NodeInstance was renamed
NodeInstancePropertyOverwrite to make it clear that it is for
overwriting properties.

Task-number: QDS-7338
Change-Id: Id5ab1f5c4761a184964a347f00d1449ae2d7d77f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

2 files changed, 3 insertions, 2 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 780ea1289b..21abeb5975 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -1009,7 +1009,7 @@ void NodeInstanceServer::setInstancePropertyVariant(const PropertyValueContainer
 
 void NodeInstanceServer::setInstanceAuxiliaryData(const PropertyValueContainer &auxiliaryContainer)
 {
-    if (auxiliaryContainer.auxiliaryDataType() == AuxiliaryDataType::NodeInstance) {
+    if (auxiliaryContainer.auxiliaryDataType() == AuxiliaryDataType::NodeInstancePropertyOverwrite) {
         if (!auxiliaryContainer.value().isNull())
             setInstancePropertyVariant(auxiliaryContainer);
         else
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index e89ed6e637..1161cb9439 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -349,7 +349,8 @@ void Qt5InformationNodeInstanceServer::updateRotationBlocks(
         QSet<QQuick3DNode *> unblockedNodes;
         const PropertyName rotBlocked = "rotBlocked";
         for (const auto &container : valueChanges) {
-            if (container.name() == rotBlocked) {
+            if (container.name() == rotBlocked
+                && container.auxiliaryDataType() == AuxiliaryDataType::NodeInstanceAuxiliary) {
                 ServerNodeInstance instance = instanceForId(container.instanceId());
                 if (instance.isValid()) {
                     auto node = qobject_cast<QQuick3DNode *>(instance.internalObject());