From d580eb2390758291253b17e5478a68766eedcb12 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 13 Sep 2012 12:52:49 +0200 Subject: Fix compilation on Harmattan The GLES2 libraries on Harmattan do not provide a typedef for GLChar. Work around it here by adding it. The Kkronos headers specify GLChar as a typedef to char, so if an implementation already provides it, then this doesn't do any harm. Change-Id: I0848b72b81fcc602dc8d9eecefdacb5436163040 Reviewed-by: Sean Harmer Reviewed-by: Lars Knoll --- src/gui/opengl/qopengl.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/gui/opengl') diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 809b82184a..f5c2f5d24a 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -54,6 +54,15 @@ QT_BEGIN_HEADER # else # include # endif + +/* + Some GLES2 implementations (like the one on Harmattan) are missing the + typedef for GLchar. Work around it here by adding it. The Kkronos headers + specify GLChar as a typedef to char, so if an implementation already + provides it, then this doesn't do any harm. +*/ +typedef char GLchar; + # include "qopengles2ext.h" # ifndef GL_DOUBLE # define GL_DOUBLE GL_FLOAT -- cgit v1.2.3