diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-14 13:48:28 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-17 11:50:24 +0200 |
| commit | ad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 (patch) | |
| tree | 0df5be078e937caf0cec39b312449128300735dc /util/glgen/codegenerator.cpp | |
| parent | 009d583eef20e7732225cdeae32925ac676d3a47 (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 'util/glgen/codegenerator.cpp')
| -rw-r--r-- | util/glgen/codegenerator.cpp | 4 |
1 files changed, 2 insertions, 2 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; |