Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e

1 files changed, 9 insertions, 8 deletions

diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index 0a504b4eb..551dc685b 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -78,18 +78,19 @@ QString dumpNode(const Qt3DCore::QEntity *n) {
     return res;
 }
 
-QStringList dumpSG(const Qt3DCore::QEntity *n, int level = 0)
+QStringList dumpSG(const Qt3DCore::QNode *n, int level = 0)
 {
     QStringList reply;
-    QString res = dumpNode(n);
-    reply += res.rightJustified(res.length() + level * 2, ' ');
+    const auto *entity = qobject_cast<const Qt3DCore::QEntity *>(n);
+    if (entity != nullptr) {
+        QString res = dumpNode(entity);
+        reply += res.rightJustified(res.length() + level * 2, ' ');
+        level++;
+    }
 
     const auto children = n->childNodes();
-    for (auto *child: children) {
-        auto *childFGNode = qobject_cast<Qt3DCore::QEntity *>(child);
-        if (childFGNode != nullptr)
-            reply += dumpSG(childFGNode, level + 1);
-    }
+    for (auto *child: children)
+        reply += dumpSG(child, level);
 
     return reply;
 }