From af6b32f73200f36a78e142bd5c7add7691b718e7 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 16 Nov 2016 17:04:26 +0100
Subject: 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>
---
 tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index ae1f7a5bc..4b2136a5c 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -34,7 +34,7 @@
 #include <QtWidgets/qapplication.h>
 #include <qvideosurfaceformat.h>
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
+#if QT_CONFIG(opengl)
 #include <QtOpenGL/qgl.h>
 #include <QtOpenGL/qglframebufferobject.h>
 #include <QtGui/qopenglfunctions.h>
@@ -57,7 +57,7 @@ private slots:
     void present();
     void presentOpaqueFrame();
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
+#if QT_CONFIG(opengl)
 
     void shaderType();
 
@@ -78,7 +78,7 @@ private slots:
 
 Q_DECLARE_METATYPE(const uchar *)
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
+#if QT_CONFIG(opengl)
 Q_DECLARE_METATYPE(QPainterVideoSurface::ShaderType);
 
 class QtTestGLVideoBuffer : public QAbstractVideoBuffer
@@ -551,7 +551,7 @@ void tst_QPainterVideoSurface::presentOpaqueFrame()
     QCOMPARE(surface.error(), QAbstractVideoSurface::IncorrectFormatError);
 }
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
+#if QT_CONFIG(opengl)
 
 void tst_QPainterVideoSurface::shaderType()
 {
-- 
cgit v1.2.3