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>

9 files changed, 10 insertions, 12 deletions

diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp
index e1c70f1aea..09af46f469 100644
--- a/util/glgen/codegenerator.cpp
+++ b/util/glgen/codegenerator.cpp
@@ -187,7 +187,7 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons
     std::sort(versions.begin(), versions.end(), std::greater<Version>());
 
     // Outout the #include statements
-    stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << Qt::endl;
+    stream << QStringLiteral("#if !QT_CONFIG(opengles2)") << Qt::endl;
     Q_FOREACH (const Version &classVersion, versions) {
         if (!versionHasProfiles(classVersion)) {
             stream << QString(QStringLiteral("#include \"qopenglfunctions_%1_%2.h\""))
@@ -217,7 +217,7 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons
     stream << QStringLiteral("QT_BEGIN_NAMESPACE") << Qt::endl << Qt::endl;
     stream << QStringLiteral("QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::create(const QOpenGLVersionProfile &versionProfile)") << Qt::endl;
     stream << QStringLiteral("{") << Qt::endl;
-    stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << Qt::endl;
+    stream << QStringLiteral("#if !QT_CONFIG(opengles2)") << Qt::endl;
     stream << QStringLiteral("    const int major = versionProfile.version().first;") << Qt::endl;
     stream << QStringLiteral("    const int minor = versionProfile.version().second;") << Qt::endl << Qt::endl;
 
diff --git a/util/glgen/qopenglextensions.cpp.header b/util/glgen/qopenglextensions.cpp.header
index 1d23f3cc65..5df04ca7ff 100644
--- a/util/glgen/qopenglextensions.cpp.header
+++ b/util/glgen/qopenglextensions.cpp.header
@@ -81,5 +81,4 @@ bool QAbstractOpenGLExtension::isInitialized() const
     return d->initialized;
 }
 
-#if !defined(QT_OPENGL_ES_2)
-
+#if !QT_CONFIG(opengles2)
diff --git a/util/glgen/qopenglextensions.h.header b/util/glgen/qopenglextensions.h.header
index 45cb2c9b90..eec9f955bb 100644
--- a/util/glgen/qopenglextensions.h.header
+++ b/util/glgen/qopenglextensions.h.header
@@ -101,5 +101,4 @@ protected:
     QAbstractOpenGLExtensionPrivate *d_ptr;
 };
 
-#if !defined(QT_OPENGL_ES_2)
-
+#if !QT_CONFIG(opengles2)
diff --git a/util/glgen/qopenglversionfunctions.cpp.footer b/util/glgen/qopenglversionfunctions.cpp.footer
index f003b56097..56119834af 100644
--- a/util/glgen/qopenglversionfunctions.cpp.footer
+++ b/util/glgen/qopenglversionfunctions.cpp.footer
@@ -3,6 +3,6 @@
 
 // No backends for OpenGL ES 2
 
-#endif // !QT_OPENGL_ES_2
+#endif // !QT_CONFIG(opengles2)
 
 QT_END_NAMESPACE
diff --git a/util/glgen/qopenglversionfunctions.cpp.header b/util/glgen/qopenglversionfunctions.cpp.header
index 587408ca6a..ebbce06020 100644
--- a/util/glgen/qopenglversionfunctions.cpp.header
+++ b/util/glgen/qopenglversionfunctions.cpp.header
@@ -203,5 +203,5 @@ QOpenGLContext *QAbstractOpenGLFunctions::owningContext() const
     return d->owningContext;
 }
 
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
 
diff --git a/util/glgen/qopenglversionfunctions.h.footer b/util/glgen/qopenglversionfunctions.h.footer
index dc29c75177..82897fbe83 100644
--- a/util/glgen/qopenglversionfunctions.h.footer
+++ b/util/glgen/qopenglversionfunctions.h.footer
@@ -4,7 +4,7 @@
 // No need for backend classes with function pointers with ES2.
 // All function addresses are independent of context and display.
 
-#endif // !QT_OPENGL_ES_2
+#endif // !QT_CONFIG(opengles2)
 
 QT_END_NAMESPACE
 
diff --git a/util/glgen/qopenglversionfunctions.h.header b/util/glgen/qopenglversionfunctions.h.header
index 951d09c1d1..717afba314 100644
--- a/util/glgen/qopenglversionfunctions.h.header
+++ b/util/glgen/qopenglversionfunctions.h.header
@@ -147,5 +147,5 @@ protected:
     friend class QOpenGLContext;
 };
 
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
 
diff --git a/util/glgen/qopenglversionfunctions__VERSION__.h.footer b/util/glgen/qopenglversionfunctions__VERSION__.h.footer
index b81155c102..565738bf25 100644
--- a/util/glgen/qopenglversionfunctions__VERSION__.h.footer
+++ b/util/glgen/qopenglversionfunctions__VERSION__.h.footer
@@ -1,6 +1,6 @@
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
+#endif // QT_NO_OPENGL && !QT_CONFIG(opengles2)
 
 #endif
diff --git a/util/glgen/qopenglversionfunctions__VERSION__.h.header b/util/glgen/qopenglversionfunctions__VERSION__.h.header
index 7e2f596195..2000c4fbf2 100644
--- a/util/glgen/qopenglversionfunctions__VERSION__.h.header
+++ b/util/glgen/qopenglversionfunctions__VERSION__.h.header
@@ -40,7 +40,7 @@
 
 #include <QtCore/qglobal.h>
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+#if !defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2)
 
 #include <QtGui/QOpenGLVersionFunctions>
 #include <QtGui/qopenglcontext.h>