diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-05-09 21:03:25 +0930 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-10 08:59:45 +0200 |
| commit | ec8102166449b9b323948c0a8f5fabfa38705139 (patch) | |
| tree | bb560dce581b6a3b88adcd8f8020095e9302a58d | |
| parent | df70d5ad80b465e284a467bb4d327a617ee17552 (diff) | |
Enable support for OpenGL 4 on OS X 10.9
Change-Id: Ifc3aeea8bf4bada821d09cc329748cad16923d6a
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| -rw-r--r-- | src/gui/opengl/qopengl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 190c05ba26..ef5ab9aa65 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -112,17 +112,19 @@ typedef GLfloat GLdouble; # endif // Q_OS_MAC #endif // QT_OPENGL_ES_2 -// Desktops, apart from Mac OS X prior to 10.7 can support OpenGL 3 -// and desktops apart from Mac can support OpenGL 4 +// Desktops, apart from Mac OS X prior to 10.7 can support OpenGL 3. +// Desktops, apart from Mac OS X prior to 10.9 can support OpenGL 4. #if !defined(QT_OPENGL_ES_2) # if !defined(Q_OS_MAC) || (defined(Q_OS_MAC) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) # define QT_OPENGL_3 # define QT_OPENGL_3_2 # endif -#if !defined(Q_OS_MAC) +# if !defined(Q_OS_MAC) || (defined(Q_OS_MAC) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) # define QT_OPENGL_4 +# endif +# if !defined(Q_OS_MAC) # define QT_OPENGL_4_3 -#endif +# endif #endif QT_BEGIN_NAMESPACE |