1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation on Harmattan

Browse Source 
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 <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Simon Hausmann 2012-09-13 12:52:49 +02:00 committed by Qt by Nokia
parent 34cd8fd566
commit d580eb2390
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/opengl/qopengl.h
View File

@ -54,6 +54,15 @@ QT_BEGIN_HEADER
# else # else
# include <GLES2/gl2.h> # include <GLES2/gl2.h>
# endif # 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" # include "qopengles2ext.h"
# ifndef GL_DOUBLE # ifndef GL_DOUBLE
# define GL_DOUBLE GL_FLOAT # define GL_DOUBLE GL_FLOAT