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

Change-Id: I1f653fa9586e7d1e9c23acffba4512cfe9f951b8

1 files changed, 11 insertions, 4 deletions

diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp
index 7cf4df2aa3..0df19c247f 100644
--- a/src/quick/scenegraph/qsgrhisupport.cpp
+++ b/src/quick/scenegraph/qsgrhisupport.cpp
@@ -391,12 +391,13 @@ static const void *qsgrhi_mtl_rifResource(QSGRendererInterface::Resource res, co
 const void *QSGRhiSupport::rifResource(QSGRendererInterface::Resource res,
                                        const QSGDefaultRenderContext *rc)
 {
+// ### This condition is a temporary workaround to allow compilation
+// with -no-opengl, but Vulkan or Metal enabled, to succeed. Full
+// support for RHI-capable -no-opengl builds will be available in
+// Qt 6 once the direct OpenGL code path gets removed.
 #if QT_CONFIG(opengl)
+
     QRhi *rhi = rc->rhi();
-#else
-    Q_UNUSED(rc)
-    QRhi *rhi = nullptr;
-#endif
     if (res == QSGRendererInterface::RhiResource || !rhi)
         return rhi;
 
@@ -433,6 +434,12 @@ const void *QSGRhiSupport::rifResource(QSGRendererInterface::Resource res,
     default:
         return nullptr;
     }
+
+#else
+    Q_UNUSED(res);
+    Q_UNUSED(rc);
+    return nullptr;
+#endif
 }
 
 int QSGRhiSupport::chooseSampleCountForWindowWithRhi(QWindow *window, QRhi *rhi)