QRendererSettings::setActiveFrameGraph(): Set surface for new graph

If the old frame graph already has a QRenderSurfaceSelector, use the
surface assigned to this selector for the new frame graph, too.

Task-number: QTBUG-57401
Change-Id: I5a0142d4ca40f5ff0047b7b42ae79fdc48189cf0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index d5e2a79bb..41112101a 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -136,16 +136,20 @@ QRenderSurfaceSelectorPrivate::~QRenderSurfaceSelectorPrivate()
 
 QRenderSurfaceSelector *QRenderSurfaceSelectorPrivate::find(QObject *rootObject)
 {
-    auto rendererSettings = rootObject->findChild<Qt3DRender::QRenderSettings *>();
-    if (!rendererSettings) {
-        qWarning() << "No renderer settings component found";
-        return nullptr;
-    }
+    QFrameGraphNode *frameGraphRoot = qobject_cast<QFrameGraphNode *>(rootObject);
 
-    auto frameGraphRoot = rendererSettings->activeFrameGraph();
     if (!frameGraphRoot) {
-        qWarning() << "No active frame graph found";
-        return nullptr;
+        auto rendererSettings = rootObject->findChild<Qt3DRender::QRenderSettings *>();
+        if (!rendererSettings) {
+            qWarning() << "No renderer settings component found";
+            return nullptr;
+        }
+
+        frameGraphRoot = rendererSettings->activeFrameGraph();
+        if (!frameGraphRoot) {
+            qWarning() << "No active frame graph found";
+            return nullptr;
+        }
     }
 
     auto surfaceSelector = qobject_cast<Qt3DRender::QRenderSurfaceSelector *>(frameGraphRoot);