summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qopenglcontext.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-04-14 13:48:28 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-04-17 11:50:24 +0200
commitad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 (patch)
tree0df5be078e937caf0cec39b312449128300735dc /src/gui/kernel/qopenglcontext.cpp
parent009d583eef20e7732225cdeae32925ac676d3a47 (diff)
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/kernel/qopenglcontext.cpp')
-rw-r--r--src/gui/kernel/qopenglcontext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index a004d9e10d..9a03333537 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -206,7 +206,7 @@ int QOpenGLContextPrivate::maxTextureSize()
QOpenGLFunctions *funcs = q->functions();
funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
-#ifndef QT_OPENGL_ES
+#if !QT_CONFIG(opengles2)
if (!q->isOpenGLES()) {
GLenum proxy = GL_PROXY_TEXTURE_2D;
@@ -232,7 +232,7 @@ int QOpenGLContextPrivate::maxTextureSize()
max_texture_size = size;
}
-#endif // QT_OPENGL_ES
+#endif // QT_CONFIG(opengles2)
return max_texture_size;
}
@@ -957,7 +957,7 @@ QOpenGLContext::OpenGLModuleType QOpenGLContext::openGLModuleType()
#if defined(QT_OPENGL_DYNAMIC)
Q_ASSERT(qGuiApp);
return QGuiApplicationPrivate::instance()->platformIntegration()->openGLModuleType();
-#elif defined(QT_OPENGL_ES_2)
+#elif QT_CONFIG(opengles2)
return LibGLES;
#else
return LibGL;