From ad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 14 Apr 2020 13:48:28 +0200 Subject: Get rid of QT_OPENGL_ES* The QT_OPENGL_ES* macros are leftovers from an earlier, ad hoc configuration system, which has since been replaced by QT_CONFIG. To clean things up in Qt 6, we use the new way instead. Task-number: QTBUG-83467 Change-Id: I578dc7695bff9d5ee303b22e44f60fee22fe0c28 Reviewed-by: Lars Knoll --- src/gui/opengl/qopenglfunctions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/opengl/qopenglfunctions.cpp') diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 11ca802ee6..a95f064ac5 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -2129,7 +2129,7 @@ Func resolve(QOpenGLContext *context, const char *name, Func) #define RESOLVE(name) \ resolve(context, "gl"#name, name) -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) // some fallback functions static void QOPENGLF_APIENTRY qopenglfSpecialClearDepthf(GLclampf depth) @@ -2167,14 +2167,14 @@ static void QOPENGLF_APIENTRY qopenglfSpecialReleaseShaderCompiler() { } -#endif // !QT_OPENGL_ES_2 +#endif // !QT_CONFIG(opengles2) QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *c) { init(c); -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) // setup fallbacks in case some methods couldn't get resolved bool es = QOpenGLContext::currentContext()->isOpenGLES(); if (!f.ClearDepthf || !es) -- cgit v1.2.3