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/qopenglfunctions_4_2_core.h | |
| 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/qopenglfunctions_4_2_core.h')
| -rw-r--r-- | src/opengl/qopenglfunctions_4_2_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qopenglfunctions_4_2_core.h b/src/opengl/qopenglfunctions_4_2_core.h index 5eff9f449c..88e19fe1bc 100644 --- a/src/opengl/qopenglfunctions_4_2_core.h +++ b/src/opengl/qopenglfunctions_4_2_core.h @@ -52,7 +52,7 @@ #include <QtOpenGL/qtopenglglobal.h> -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) +#if !defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) #include <QtOpenGL/QOpenGLVersionProfile> #include <QtOpenGL/QOpenGLVersionFunctions> @@ -3038,6 +3038,6 @@ QT_END_NAMESPACE #pragma pop_macro("MemoryBarrier") #endif -#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 +#endif // QT_NO_OPENGL && !QT_CONFIG(opengles2) #endif |