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/openglextensions | |
| 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/openglextensions')
| -rw-r--r-- | src/openglextensions/qopenglextensions.cpp | 2 | ||||
| -rw-r--r-- | src/openglextensions/qopenglextensions.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/openglextensions/qopenglextensions.cpp b/src/openglextensions/qopenglextensions.cpp index 1660181e97..fadde172f5 100644 --- a/src/openglextensions/qopenglextensions.cpp +++ b/src/openglextensions/qopenglextensions.cpp @@ -87,7 +87,7 @@ bool QAbstractOpenGLExtension::isInitialized() const return d->initialized; } -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) QOpenGLExtension_3DFX_tbuffer::QOpenGLExtension_3DFX_tbuffer() : QAbstractOpenGLExtension(*(new QOpenGLExtension_3DFX_tbufferPrivate)) diff --git a/src/openglextensions/qopenglextensions.h b/src/openglextensions/qopenglextensions.h index eb473f3699..6ae96f5563 100644 --- a/src/openglextensions/qopenglextensions.h +++ b/src/openglextensions/qopenglextensions.h @@ -107,7 +107,7 @@ protected: QAbstractOpenGLExtensionPrivate *d_ptr; }; -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) class QOpenGLExtension_3DFX_tbufferPrivate : public QAbstractOpenGLExtensionPrivate { |