diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-16 17:04:26 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-16 20:31:14 +0000 |
| commit | af6b32f73200f36a78e142bd5c7add7691b718e7 (patch) | |
| tree | bdb8e8d78ddc0ae20302a71fc01b79e8010c0866 /src/multimediawidgets/qpaintervideosurface_p.h | |
| parent | cd1eef45e976f6d2f02abff1648e1e0f7e07a71f (diff) | |
| download | qtmultimedia-af6b32f73200f36a78e142bd5c7add7691b718e7.tar.gz | |
Remove leftover OpenGl ES 1 related macros
Change-Id: I9b1e31e3d1bcfbffc448551be5654f8818baf91a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimediawidgets/qpaintervideosurface_p.h')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |