From cbb7099902419776ad5266d4e54e1f50e7d690f7 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Mon, 30 Mar 2020 13:17:00 +0300
Subject: QmlDesigner: Fix scene root finding logic

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>
---
 .../qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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")) {
-- 
cgit v1.2.3