1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable support for OpenGL 4 on OS X 10.9

Browse Source 
Change-Id: Ifc3aeea8bf4bada821d09cc329748cad16923d6a
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
Sean Harmer 2014-05-09 21:03:25 +09:30 committed by The Qt Project
parent df70d5ad80
commit ec81021664
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/opengl/qopengl.h
View File

@ -112,17 +112,19 @@ typedef GLfloat GLdouble;
# endif // Q_OS_MAC # endif // Q_OS_MAC
#endif // QT_OPENGL_ES_2 #endif // QT_OPENGL_ES_2
// Desktops, apart from Mac OS X prior to 10.7 can support OpenGL 3 // 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.9 can support OpenGL 4.
#if !defined(QT_OPENGL_ES_2) #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) # 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
# define QT_OPENGL_3_2 # define QT_OPENGL_3_2
# endif # 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 # define QT_OPENGL_4
# endif
# if !defined(Q_OS_MAC)
# define QT_OPENGL_4_3 # define QT_OPENGL_4_3
#endif # endif
#endif #endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE