feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt5NodeInstanceServer: Avoid using sender()

Browse Source 
Amends b4db8a2d84

Change-Id: I9dc446d376bce9d91eb9d7a753003e0d92e10889
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Jarek Kobus
2023-12-13 23:33:35 +01:00
parent 0f2a69408b
commit 2f4fa0b62d
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
View File

@@ -268,22 +268,15 @@ void Qt5NodeInstanceServer::setPipelineCacheConfig([[maybe_unused]] QQuickWindow
#ifdef USE_SHADER_CACHE #ifdef USE_SHADER_CACHE
QtQuick3DEditorHelpers::ShaderCache::setAutomaticDiskCache(false); QtQuick3DEditorHelpers::ShaderCache::setAutomaticDiskCache(false);
auto wa = QQuick3DSceneManager::getOrSetWindowAttachment(*w); auto wa = QQuick3DSceneManager::getOrSetWindowAttachment(*w);
connect(wa, &QQuick3DWindowAttachment::renderContextInterfaceChanged, connect(wa, &QQuick3DWindowAttachment::renderContextInterfaceChanged, this, [this, wa] {
this, &Qt5NodeInstanceServer::handleRciSet); auto context = wa->rci().get();
if (context && context->shaderCache())
context->shaderCache()->persistentShaderBakingCache().load(m_shaderCacheFile);
});
#endif #endif
#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) bool Qt5NodeInstanceServer::initRhi([[maybe_unused]] RenderViewData &viewData)
{ {
if (!viewData.renderControl) { if (!viewData.renderControl) {

2
src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
View File

@@ -77,8 +77,6 @@ protected:
virtual QImage grabRenderControl(RenderViewData &viewData); virtual QImage grabRenderControl(RenderViewData &viewData);
private: private:
void handleRciSet();
RenderViewData m_viewData; RenderViewData m_viewData;
QByteArray m_pipelineCacheData; QByteArray m_pipelineCacheData;
QString m_pipelineCacheLocation; QString m_pipelineCacheLocation;