summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt4iOS <ian@mediator-software.com>2012-03-24 14:15:29 +0000
committerQt by Nokia <qt-info@nokia.com>2012-04-13 08:33:54 +0200
commitdcd893fbf7fbbc28df13ff26888bf983e86c0dbd (patch)
tree96d0f68ead63151d97ecc5161ba335b4133ab0e3 /src
parent75fb4efeae77896733f1991f83106697fa611c8a (diff)
Added iOS compatibility.
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>
Diffstat (limited to 'src')
-rw-r--r--src/opengl/qgl.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 6903d3278c..031bdf3317 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -59,25 +59,26 @@ QT_BEGIN_HEADER
#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