From c83ca003248a21e368ebfbf799ef9580e0f4e6ac Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 17 Apr 2020 09:15:44 +0200 Subject: RHI: Fix build with -no-opengl It is failing with a link error (missing QSGDefaultRenderContext). Task-number: QTBUG-83169 Change-Id: I0a3009a11269a7ffb142f2f51b6a1991d8ab3978 Reviewed-by: Laszlo Agocs --- src/quick/scenegraph/qsgrhisupport.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp index 84a9669365..2bf70ddec6 100644 --- a/src/quick/scenegraph/qsgrhisupport.cpp +++ b/src/quick/scenegraph/qsgrhisupport.cpp @@ -38,7 +38,10 @@ ****************************************************************************/ #include "qsgrhisupport_p.h" -#include "qsgdefaultrendercontext_p.h" +#include "qsgcontext_p.h" +#if QT_CONFIG(opengl) +# include "qsgdefaultrendercontext_p.h" +#endif #include #if QT_CONFIG(vulkan) @@ -383,9 +386,15 @@ static const void *qsgrhi_mtl_rifResource(QSGRendererInterface::Resource res, co } #endif -const void *QSGRhiSupport::rifResource(QSGRendererInterface::Resource res, const QSGDefaultRenderContext *rc) +const void *QSGRhiSupport::rifResource(QSGRendererInterface::Resource res, + const QSGDefaultRenderContext *rc) { +#if QT_CONFIG(opengl) QRhi *rhi = rc->rhi(); +#else + Q_UNUSED(rc) + QRhi *rhi = nullptr; +#endif if (res == QSGRendererInterface::RhiResource || !rhi) return rhi; -- cgit v1.2.3