diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-06-01 16:32:00 +0200 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-06-02 11:15:42 +0200 |
commit | 0d0f6ab80349963f3aaa387992b0edfadddb62a4 (patch) | |
tree | 5f1183cf633e4f9cd334add65caab80f3dd2184b | |
parent | f621603692ccc76c077ba3911048d823f80e4bd5 (diff) |
Fix QQuickWidget when RHI is disabled
Without this, scenegraph would still use RHI code path even if
QSG_NO_RHI=1 is set.
Task-number: QTBUG-79268
Change-Id: I189d1da1345c94cf53ba9cc2b15a506c06fff9b1
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 221bdfaee6..2fccc7208d 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -965,7 +965,10 @@ void QQuickWidgetPrivate::createContext() if (context->makeCurrent(offscreenSurface)) { if (!offscreenWindow->isSceneGraphInitialized()) { offscreenWindow->setGraphicsDevice(QQuickGraphicsDevice::fromOpenGLContext(context)); - renderControl->initialize(); + if (QSGRhiSupport::instance()->isRhiEnabled()) + renderControl->initialize(); + else + renderControl->initialize(context); } } else #endif |