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

QmlDesigner: Rename 3d-active-scene to active3dScene

Browse Source 
For annotations this has to be a valid QML property.

Task-number: QDS-2269
Change-Id: Ib6483a9dd673ddf24b8688909c599a518dfb361c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2020-06-11 19:10:19 +02:00
parent 72bfea7b01
commit 2f66b1d49a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -112,7 +112,7 @@ void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState)
if (sceneState.contains(sceneKey)) { if (sceneState.contains(sceneKey)) {
qint32 newActiveScene = sceneState[sceneKey].value<qint32>(); qint32 newActiveScene = sceneState[sceneKey].value<qint32>();
edit3DWidget()->canvas()->updateActiveScene(newActiveScene); edit3DWidget()->canvas()->updateActiveScene(newActiveScene);
rootModelNode().setAuxiliaryData("3d-active-scene", newActiveScene); rootModelNode().setAuxiliaryData("active3dScene", newActiveScene);
} }
if (sceneState.contains(selectKey)) if (sceneState.contains(selectKey))

4
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -469,7 +469,7 @@ void DesignDocument::paste()
[](const ModelNode &node) { return !node.isSubclassOf("QtQuick3D.Node"); }) [](const ModelNode &node) { return !node.isSubclassOf("QtQuick3D.Node"); })
== selectedNodes.end(); == selectedNodes.end();
if (all3DNodes) { if (all3DNodes) {
int activeSceneId = rootModelNode().auxiliaryData("3d-active-scene").toInt(); int activeSceneId = rootModelNode().auxiliaryData("active3dScene").toInt();
if (activeSceneId != -1) { if (activeSceneId != -1) {
NodeListProperty sceneNodeProperty NodeListProperty sceneNodeProperty
= QmlVisualNode::findSceneNodeProperty(rootModelNode().view(), activeSceneId); = QmlVisualNode::findSceneNodeProperty(rootModelNode().view(), activeSceneId);
@@ -515,7 +515,7 @@ void DesignDocument::paste()
} else { } else {
// if selection is empty and this is a 3D Node, paste it under the active scene // if selection is empty and this is a 3D Node, paste it under the active scene
if (pastedNode.isSubclassOf("QtQuick3D.Node")) { if (pastedNode.isSubclassOf("QtQuick3D.Node")) {
int activeSceneId = rootModelNode().auxiliaryData("3d-active-scene").toInt(); int activeSceneId = rootModelNode().auxiliaryData("active3dScene").toInt();
if (activeSceneId != -1) { if (activeSceneId != -1) {
NodeListProperty sceneNodeProperty NodeListProperty sceneNodeProperty
= QmlVisualNode::findSceneNodeProperty(rootModelNode().view(), activeSceneId); = QmlVisualNode::findSceneNodeProperty(rootModelNode().view(), activeSceneId);