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/gui/opengl/qopengl.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/gui/opengl/qopengl.h')
-rw-r--r-- | src/gui/opengl/qopengl.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 3a2393ea58..995206f248 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -63,9 +63,9 @@ // access to additional functionality the drivers may expose but // which the system headers do not. -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) # if defined(Q_OS_IOS) || defined(Q_OS_TVOS) -# if defined(QT_OPENGL_ES_3) +# if QT_CONFIG(opengles3) # include <OpenGLES/ES3/gl.h> # include <OpenGLES/ES3/glext.h> # else @@ -83,7 +83,7 @@ typedef void* GLeglImageOES; # elif !defined(Q_OS_DARWIN) // "uncontrolled" ES2 platforms -// In "es2" builds (QT_OPENGL_ES_2) additional defines indicate GLES 3.0 or +// In "es2" builds (QT_CONFIG(opengles2)) additional defines indicate GLES 3.0 or // higher is available *at build time*. In this case include the corresponding // header. These are backwards compatible and it should be safe to include // headers on top of each other, meaning that applications can include gl2.h @@ -101,11 +101,11 @@ typedef void* GLeglImageOES; # define QGL_TEMP_GLEXT_PROTO # endif -# if defined(QT_OPENGL_ES_3_2) +# if QT_CONFIG(opengles32) # include <GLES3/gl32.h> -# elif defined(QT_OPENGL_ES_3_1) +# elif QT_CONFIG(opengles31) # include <GLES3/gl31.h> -# elif defined(QT_OPENGL_ES_3) +# elif QT_CONFIG(opengles3) # include <GLES3/gl3.h> # else # include <GLES2/gl2.h> @@ -145,10 +145,10 @@ typedef char GLchar; # endif # include <QtGui/qopenglext.h> # endif // Q_OS_MAC -#endif // QT_OPENGL_ES_2 +#endif // !QT_CONFIG(opengles2) // Desktops can support OpenGL 4. -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) #define QT_OPENGL_3 #define QT_OPENGL_3_2 #define QT_OPENGL_4 @@ -162,7 +162,7 @@ QT_BEGIN_NAMESPACE // When all else fails we provide sensible fallbacks - this is needed to // allow compilation on OS X 10.6 -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) // OS X 10.6 doesn't define these which are needed below // OS X 10.7 and later defien them in gl3.h |