QmlDesigner: Show selection box for component scene roots in edit 3D

Components typically have Node as their root item, so having a
component as a scene root detects as having a plain Node as scene
root, which normally doesn't get a selection box.

Change-Id: I66ae1dc3ade4b6f822d768cf71e8feceb0ffa06d
Fixes: QDS-1636
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

1 files changed, 19 insertions, 1 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 91e0ec18d9..b76a54bb63 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -1043,7 +1043,25 @@ void Qt5InformationNodeInstanceServer::changeSelection(const ChangeSelectionComm
             QObject *object = nullptr;
             if (firstSceneRoot && sceneRoot == firstSceneRoot && instance.isSubclassOf("QQuick3DNode"))
                 object = instance.internalObject();
-            if (object && (firstSceneRoot != object || instance.isSubclassOf("QQuick3DModel")))
+
+            auto instanceIsModelOrComponent = [&]() -> bool {
+                bool retval = instance.isSubclassOf("QQuick3DModel");
+#ifdef QUICK3D_MODULE
+                if (!retval) {
+                    // Node is a component if it has node children that have no instances
+                    auto node = qobject_cast<QQuick3DNode *>(object);
+                    if (node) {
+                        const auto childItems = node->childItems();
+                        for (const auto &childItem : childItems) {
+                            if (qobject_cast<QQuick3DNode *>(childItem) && !hasInstanceForObject(childItem))
+                                return true;
+                        }
+                    }
+                }
+#endif
+                return retval;
+            };
+            if (object && (firstSceneRoot != object || instanceIsModelOrComponent()))
                 selectedObjs << objectToVariant(object);
         }
     }