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

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Browse Source 
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
This commit is contained in:
Tim Jenssen
2020-06-26 15:13:07 +02:00
parent 97ac63b401 5a06305ffe
commit b8cd87dea0
123 changed files with 7677 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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"); })
== 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);