diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-04-12 17:08:18 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-04-13 02:11:12 +0000 |
| commit | fbcdf6d7532d62e4e11deda1b6e6aa8f4b9aebaa (patch) | |
| tree | 92fee768d0f21b97986c92efaf3d32a23469ff7f | |
| parent | e7443b88fcc110ab187de09443118f087c513776 (diff) | |
Be more explicit about the supported platforms for OpenGL ES 2
The OpenGLES framework is only supported on iOS and tvOS, and does not
exist on macOS and watchOS.
Change-Id: I643d3bdac522b67a8d945648dfcc8f1780ab0d7f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| -rw-r--r-- | src/gui/opengl/qopengl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index a76da20910..b5df68a3aa 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -49,7 +49,7 @@ # include <QtCore/qt_windows.h> #endif -// Note: Mac OSX is a "controlled platform" for OpenGL ABI so we +// Note: Apple is a "controlled platform" for OpenGL ABI so we // use the system provided headers there. Controlled means that the // headers always match the actual driver implementation so there // is no possibility of drivers exposing additional functionality @@ -64,7 +64,7 @@ // which the system headers do not. #if defined(QT_OPENGL_ES_2) -# if defined(Q_OS_MAC) // iOS +# if defined(Q_OS_IOS) || defined(Q_OS_TVOS) # if defined(QT_OPENGL_ES_3) # include <OpenGLES/ES3/gl.h> # include <OpenGLES/ES3/glext.h> @@ -81,7 +81,7 @@ */ typedef void* GLeglImageOES; -# else // "uncontrolled" ES2 platforms +# elif !defined(Q_OS_DARWIN) // "uncontrolled" ES2 platforms // In "es2" builds (QT_OPENGL_ES_2) additional defines indicate GLES 3.0 or // higher is available *at build time*. In this case include the corresponding |