From: Qt4iOS <ian@mediator-software.com>
Date: Sat, 24 Mar 2012 14:15:29 +0000 (+0000)
Subject: Added iOS compatibility.
X-Git-Tag: 071012110112~1705
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcd893fbf7fbbc28df13ff26888bf983e86c0dbd;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 6903d32..031bdf3 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