diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-02-05 12:17:17 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-02-18 12:51:13 +0100 |
| commit | 30034a140ca8aefa1986c9964ae1f30dcfef886e (patch) | |
| tree | 797fbce757e150d48d00adbc0c1c0b85f7ec5bf1 /src/multimediawidgets/qpaintervideosurface_p.h | |
| parent | b2606eed8fa46c3f81bb9b03ca10409a00ed134f (diff) | |
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>
Diffstat (limited to 'src/multimediawidgets/qpaintervideosurface_p.h')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface_p.h | 13 |
1 files changed, 4 insertions, 9 deletions
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 |