From 2f4fa0b62d46375fc17175111fd37daa632854e9 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 13 Dec 2023 23:33:35 +0100
Subject: [PATCH] Qt5NodeInstanceServer: Avoid using sender()

Amends b4db8a2d84c5b71c81b7feb3bc1d1328ea2247c6

Change-Id: I9dc446d376bce9d91eb9d7a753003e0d92e10889
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../instances/qt5nodeinstanceserver.cpp         | 17 +++++------------
 .../instances/qt5nodeinstanceserver.h           |  2 --
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index 4c163bf69ff..db4199b64a1 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -268,22 +268,15 @@ void Qt5NodeInstanceServer::setPipelineCacheConfig([[maybe_unused]] QQuickWindow
 #ifdef USE_SHADER_CACHE
     QtQuick3DEditorHelpers::ShaderCache::setAutomaticDiskCache(false);
     auto wa = QQuick3DSceneManager::getOrSetWindowAttachment(*w);
-    connect(wa, &QQuick3DWindowAttachment::renderContextInterfaceChanged,
-            this, &Qt5NodeInstanceServer::handleRciSet);
+    connect(wa, &QQuick3DWindowAttachment::renderContextInterfaceChanged, this, [this, wa] {
+        auto context = wa->rci().get();
+        if (context && context->shaderCache())
+            context->shaderCache()->persistentShaderBakingCache().load(m_shaderCacheFile);
+    });
 #endif
 #endif
 }
 
-void Qt5NodeInstanceServer::handleRciSet()
-{
-#ifdef USE_SHADER_CACHE
-    auto wa = qobject_cast<QQuick3DWindowAttachment *>(sender());
-    auto context = wa ? wa->rci().get() : nullptr;
-    if (context && context->shaderCache())
-        context->shaderCache()->persistentShaderBakingCache().load(m_shaderCacheFile);
-#endif
-}
-
 bool Qt5NodeInstanceServer::initRhi([[maybe_unused]] RenderViewData &viewData)
 {
     if (!viewData.renderControl) {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
index 9294a064e08..d684046fc5b 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
@@ -77,8 +77,6 @@ protected:
     virtual QImage grabRenderControl(RenderViewData &viewData);
 
 private:
-    void handleRciSet();
-
     RenderViewData m_viewData;
     QByteArray m_pipelineCacheData;
     QString m_pipelineCacheLocation;