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/qopenglversionfunctions.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/qopenglversionfunctions.cpp')
| -rw-r--r-- | src/opengl/qopenglversionfunctions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qopenglversionfunctions.cpp b/src/opengl/qopenglversionfunctions.cpp index 016683a3f2..61794fdec9 100644 --- a/src/opengl/qopenglversionfunctions.cpp +++ b/src/opengl/qopenglversionfunctions.cpp @@ -103,7 +103,7 @@ QOpenGLVersionFunctionsStorage::QOpenGLVersionFunctionsStorage() QOpenGLVersionFunctionsStorage::~QOpenGLVersionFunctionsStorage() { -#ifndef QT_OPENGL_ES +#if !QT_CONFIG(opengles2) if (backends) { int i = 0; @@ -122,7 +122,7 @@ QOpenGLVersionFunctionsStorage::~QOpenGLVersionFunctionsStorage() QOpenGLVersionFunctionsBackend *QOpenGLVersionFunctionsStorage::backend(QOpenGLContext *context, QOpenGLVersionFunctionsBackend::Version v) { -#ifdef QT_OPENGL_ES +#if QT_CONFIG(opengles2) Q_UNUSED(context); Q_UNUSED(v); return 0; @@ -339,7 +339,7 @@ QOpenGLContext *QAbstractOpenGLFunctions::owningContext() const return d->owningContext; } -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_0_CoreBackend, QT_OPENGL_1_0_FUNCTIONS) QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_1_CoreBackend, QT_OPENGL_1_1_FUNCTIONS) @@ -376,6 +376,6 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_5_DeprecatedBackend, QT_OPENGL_4_5_DEPREC // No backends for OpenGL ES 2 -#endif // !QT_OPENGL_ES_2 +#endif // !QT_CONFIG(opengles2) QT_END_NAMESPACE |