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 /src/opengl/qopenglversionfunctionsfactory.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 'src/opengl/qopenglversionfunctionsfactory.cpp')
| -rw-r--r-- | src/opengl/qopenglversionfunctionsfactory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qopenglversionfunctionsfactory.cpp b/src/opengl/qopenglversionfunctionsfactory.cpp index de7fe6c07f..d377c64961 100644 --- a/src/opengl/qopenglversionfunctionsfactory.cpp +++ b/src/opengl/qopenglversionfunctionsfactory.cpp @@ -49,7 +49,7 @@ #include "qopenglversionfunctionsfactory.h" #include "qopenglversionfunctions_p.h" -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) #include "qopenglfunctions_4_5_core.h" #include "qopenglfunctions_4_5_compatibility.h" #include "qopenglfunctions_4_4_core.h" @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE static QAbstractOpenGLFunctions *createFunctions(const QOpenGLVersionProfile &versionProfile) { -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) const int major = versionProfile.version().first; const int minor = versionProfile.version().second; @@ -231,12 +231,12 @@ QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::get(const QOpenGLVersi return nullptr; } -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) if (context->isOpenGLES()) { qWarning("versionFunctions: Not supported on OpenGL ES"); return nullptr; } -#endif // QT_OPENGL_ES_2 +#endif // !QT_CONFIG(opengles2) const QSurfaceFormat f = context->format(); |