AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added iOS compatibility.

Browse Source 
Modified OpenGL header inclusion block to support iOS GL include paths.
Removed ability to build for MacOS with GLES2, as no support on MacOS
for OpenGLES.

Change-Id: I2bcf302278545147632b23a86380fa3980ec10a4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Qt4iOS 2012-03-24 14:15:29 +00:00 committed by Qt by Nokia
parent 75fb4efeae
commit dcd893fbf7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/opengl/qgl.h
View File

@ -59,25 +59,26 @@ QT_BEGIN_HEADER
#endif
#if defined(Q_OS_MAC)
# if !defined(QT_NO_CORESERVICES)
# include <OpenGL/gl.h>
#elif defined(QT_OPENGL_ES_2)
# if defined(Q_OS_MAC)
# include <OpenGLES/ES2/gl.h>
# else
# include <GLES2/gl2.h>
# if defined(QT_OPENGL_ES_2)
# include <OpenGLES/ES2/gl.h>
# endif
# endif
#elif defined(QT_OPENGL_ES_2)
# include <GLES2/gl2.h>
# else
# include <GL/gl.h>
# endif
#if defined(QT_OPENGL_ES_2)
# ifndef GL_DOUBLE
# define GL_DOUBLE GL_FLOAT
# endif
# ifndef GLdouble
typedef GLfloat GLdouble;
# endif
#else
# if defined(Q_OS_MAC)
# include <OpenGL/gl.h>
# else
# include <GL/gl.h>
# endif
#endif
QT_BEGIN_NAMESPACE