From af6b32f73200f36a78e142bd5c7add7691b718e7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 16 Nov 2016 17:04:26 +0100 Subject: Remove leftover OpenGl ES 1 related macros Change-Id: I9b1e31e3d1bcfbffc448551be5654f8818baf91a Reviewed-by: Laszlo Agocs Reviewed-by: Yoann Lopes --- src/multimediawidgets/qpaintervideosurface_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/multimediawidgets/qpaintervideosurface_p.h') diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h index a254947d2..2e89393e9 100644 --- a/src/multimediawidgets/qpaintervideosurface_p.h +++ b/src/multimediawidgets/qpaintervideosurface_p.h @@ -125,7 +125,7 @@ public: void paint(QPainter *painter, const QRectF &target, const QRectF &source = QRectF(0, 0, 1, 1)); -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) const QGLContext *glContext() const; void setGLContext(QGLContext *context); @@ -154,7 +154,7 @@ private: void createPainter(); QVideoSurfacePainter *m_painter; -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) QGLContext *m_glContext; ShaderTypes m_shaderTypes; ShaderType m_shaderType; @@ -171,7 +171,7 @@ private: bool m_ready; }; -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) +#if QT_CONFIG(opengl) Q_DECLARE_OPERATORS_FOR_FLAGS(QPainterVideoSurface::ShaderTypes) #endif -- cgit v1.2.1