diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-03-30 13:17:00 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-03-30 11:24:49 +0000 |
| commit | cbb7099902419776ad5266d4e54e1f50e7d690f7 (patch) | |
| tree | 37038f4f7ba800ae8c74b152bc7c837a201c197f | |
| parent | 7a7ee71f229b81d8021f2c8332acdd3e37baf305 (diff) | |
QmlDesigner: Fix scene root finding logicqds/v1.5.0-beta1
If there's a single node child on View3D, detect that as scene root
when another non-node direct child of View3D is selected.
Change-Id: Ib538b0ae368e7b460700a99e4c450a15586c2f62
Fixes: QDS-1865
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index d3a7420464..67a031ee50 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -745,7 +745,7 @@ QObject *Qt5InformationNodeInstanceServer::find3DSceneRoot(const ServerNodeInsta view = qobject_cast<QQuick3DViewport *>(parentInstance.internalObject()); int nodeCount = countChildNodes(view); if (nodeCount == 1) - return checkInstance.internalObject(); + return childNode; else return view->scene(); } else if (parentInstance.isSubclassOf("QQuick3DNode")) { |