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]>

2 files changed, 4 insertions, 4 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()
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h
index 5061d3a307..7167f4fdea 100644
--- a/src/quickwidgets/qquickwidget_p.h
+++ b/src/quickwidgets/qquickwidget_p.h
@@ -63,7 +63,7 @@ public:
     void handleContextCreationFailure(const QSurfaceFormat &format);
 
     QPlatformBackingStoreRhiConfig rhiConfig() const override;
-    QRhiTexture *texture() const override;
+    TextureData texture() const override;
     QPlatformTextureList::Flags textureListFlags() override;
     QImage grabFramebuffer() override;