From 2f66b1d49a71fbabd81de79c4d51e4804ea0fd8d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 11 Jun 2020 19:10:19 +0200 Subject: [PATCH] QmlDesigner: Rename 3d-active-scene to active3dScene For annotations this has to be a valid QML property. Task-number: QDS-2269 Change-Id: Ib6483a9dd673ddf24b8688909c599a518dfb361c Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 2 +- .../qmldesigner/components/integration/designdocument.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 9e882be2fde..fda18bdf45f 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -112,7 +112,7 @@ void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState) if (sceneState.contains(sceneKey)) { qint32 newActiveScene = sceneState[sceneKey].value(); edit3DWidget()->canvas()->updateActiveScene(newActiveScene); - rootModelNode().setAuxiliaryData("3d-active-scene", newActiveScene); + rootModelNode().setAuxiliaryData("active3dScene", newActiveScene); } if (sceneState.contains(selectKey)) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index e5d7e8978dc..6dc23eabf55 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -469,7 +469,7 @@ void DesignDocument::paste() [](const ModelNode &node) { return !node.isSubclassOf("QtQuick3D.Node"); }) == selectedNodes.end(); if (all3DNodes) { - int activeSceneId = rootModelNode().auxiliaryData("3d-active-scene").toInt(); + int activeSceneId = rootModelNode().auxiliaryData("active3dScene").toInt(); if (activeSceneId != -1) { NodeListProperty sceneNodeProperty = QmlVisualNode::findSceneNodeProperty(rootModelNode().view(), activeSceneId); @@ -515,7 +515,7 @@ void DesignDocument::paste() } else { // if selection is empty and this is a 3D Node, paste it under the active scene if (pastedNode.isSubclassOf("QtQuick3D.Node")) { - int activeSceneId = rootModelNode().auxiliaryData("3d-active-scene").toInt(); + int activeSceneId = rootModelNode().auxiliaryData("active3dScene").toInt(); if (activeSceneId != -1) { NodeListProperty sceneNodeProperty = QmlVisualNode::findSceneNodeProperty(rootModelNode().view(), activeSceneId);