aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickwidgets/qquickwidget.cpp
diff options
context:
space:
mode:
authorKristoffer Skau <[email protected]>2022-11-21 12:40:08 +0100
committerKristoffer Skau <[email protected]>2022-12-05 13:35:48 +0100
commit22119cbb1b96690f68345f4949a6faf950b863c2 (patch)
tree98a3e3c1a62650b2fc6757f0a055997780bfe8a1 /src/quickwidgets/qquickwidget.cpp
parent4bff41981e26329ee8322bbae1274ecfec3365d9 (diff)
Update QQuickWidget::texture() override because of signature change
To support stereoscopic rendering in QOpenGLWidget using the RHI backend QWidgetPrivate::texture return type was changed to accommodate the extra texture required. This patch fixes the override for QQuickWidget to return the new type, where the second texture is just a nullptr (not used). Change-Id: Ie2d8906ed6c974b1813c7a900e54343db04226aa Reviewed-by: Laszlo Agocs <[email protected]> Reviewed-by: Alessandro Portale <[email protected]> Reviewed-by: JiDe Zhang <[email protected]>
Diffstat (limited to 'src/quickwidgets/qquickwidget.cpp')
-rw-r--r--src/quickwidgets/qquickwidget.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index b854aa3124..a59c3cd9fc 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -1279,15 +1279,15 @@ QPlatformBackingStoreRhiConfig QQuickWidgetPrivate::rhiConfig() const
return config;
}
-QRhiTexture *QQuickWidgetPrivate::texture() const
+QWidgetPrivate::TextureData QQuickWidgetPrivate::texture() const
{
Q_Q(const QQuickWidget);
if (!q->isWindow() && q->internalWinId()) {
qWarning() << "QQuickWidget cannot be used as a native child widget."
<< "Consider setting Qt::AA_DontCreateNativeWidgetSiblings";
- return 0;
+ return {};
}
- return outputTexture;
+ return { outputTexture, nullptr };
}
QPlatformTextureList::Flags QQuickWidgetPrivate::textureListFlags()