Merge branch '5.3' into dev

Conflicts:
	src/quick/items/context2d/qquickcontext2d.cpp
	src/quick/items/context2d/qquickcontext2dtexture.cpp

Change-Id: I1a9b911b3a92333a5dddbaf43275f71bad2006f0

1 files changed, 9 insertions, 1 deletions

diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index 7c48453857..169eef8b95 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -113,6 +113,11 @@ public:
     virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame) = 0;
     bool event(QEvent *e);
 
+    void initializeOpenGL(QOpenGLContext *gl, QOffscreenSurface *s) {
+        m_gl = gl;
+        m_surface = s;
+    }
+
 Q_SIGNALS:
     void textureChanged();
 
@@ -137,7 +142,10 @@ protected:
     QRect createTiles(const QRect& window);
 
     QList<QQuickContext2DTile*> m_tiles;
-    QQuickContext2D* m_context;
+    QQuickContext2D *m_context;
+
+    QOpenGLContext *m_gl;
+    QSurface *m_surface;
 
     QQuickContext2D::State m_state;