Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: I507e252f9cb11b75dd9f7f409c39d93094e8c3ef

1 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h b/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
index 31a1e8643f..15d0b3f344 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
@@ -57,7 +57,13 @@ class QSGOpenVGRenderContext : public QSGRenderContext, public QSGRendererInterf
 public:
     QSGOpenVGRenderContext(QSGContext *context);
 
-    void initialize(void *context) override;
+    static const int INIT_PARAMS_MAGIC = 0x51E;
+    struct InitParams : public QSGRenderContext::InitParams {
+        int sType = INIT_PARAMS_MAGIC;
+        QOpenVGContext *context = nullptr;
+    };
+
+    void initialize(const QSGRenderContext::InitParams *params) override;
     void invalidate() override;
     void renderNextFrame(QSGRenderer *renderer, uint fboId) override;
     QSGTexture *createTexture(const QImage &image, uint flags) const override;
@@ -94,7 +100,7 @@ public:
     QSGLayer *createLayer(QSGRenderContext *renderContext) override;
     QSurfaceFormat defaultSurfaceFormat() const override;
     QSGInternalRectangleNode *createInternalRectangleNode() override;
-    QSGInternalImageNode *createInternalImageNode() override;
+    QSGInternalImageNode *createInternalImageNode(QSGRenderContext *renderContext) override;
 #if QT_CONFIG(quick_sprite)
     QSGSpriteNode *createSpriteNode() override;
 #endif