From 30034a140ca8aefa1986c9964ae1f30dcfef886e Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Wed, 5 Feb 2020 12:17:17 +0100
Subject: Remove usage of QGL* APIs

QOpenGL API should be used instead.

Task-number: QTBUG-74409
Fixes: QTBUG-81902
Change-Id: I80d09cba79248451cf211eabd87651301ae18b63
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 src/multimediawidgets/qpaintervideosurface_p.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/multimediawidgets/qpaintervideosurface_p.h')

diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h
index 990d20cbe..582d6944c 100644
--- a/src/multimediawidgets/qpaintervideosurface_p.h
+++ b/src/multimediawidgets/qpaintervideosurface_p.h
@@ -59,11 +59,6 @@
 #include <qabstractvideosurface.h>
 #include <qvideoframe.h>
 
-QT_BEGIN_NAMESPACE
-
-class QGLContext;
-QT_END_NAMESPACE
-
 QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
@@ -90,7 +85,7 @@ public:
     virtual void viewportDestroyed() {}
 };
 
-
+class QOpenGLContext;
 class Q_AUTOTEST_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
 {
     Q_OBJECT
@@ -126,8 +121,8 @@ public:
     void paint(QPainter *painter, const QRectF &target, const QRectF &source = QRectF(0, 0, 1, 1));
 
 #if QT_CONFIG(opengl)
-    const QGLContext *glContext() const;
-    void setGLContext(QGLContext *context);
+    const QOpenGLContext *glContext() const;
+    void updateGLContext();
 
     enum ShaderType
     {
@@ -155,7 +150,7 @@ private:
 
     QVideoSurfacePainter *m_painter;
 #if QT_CONFIG(opengl)
-    QGLContext *m_glContext;
+    QOpenGLContext *m_glContext;
     ShaderTypes m_shaderTypes;
     ShaderType m_shaderType;
 #endif
-- 
cgit v1.2.3