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>
#endif
#if defined(Q_OS_MAC)
+# if !defined(QT_NO_CORESERVICES)
# include <OpenGL/gl.h>
+# else
+# if defined(QT_OPENGL_ES_2)
+# include <OpenGLES/ES2/gl.h>
+# endif
+# endif
#elif defined(QT_OPENGL_ES_2)
-# if defined(Q_OS_MAC)
-# include <OpenGLES/ES2/gl.h>
+# include <GLES2/gl2.h>
# else
-# include <GLES2/gl2.h>
+# 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