[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gluon] graphics: Remove erroneous addition of Qt OpenGL defines.
From:       Arjen Hiemstra <ahiemstra () heimr ! nl>
Date:       2011-07-31 23:40:12
Message-ID: 20110731234012.CCD60A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 817a5f80623e19cd763786237aa1a49997aeef05 by Arjen Hiemstra.
Committed on 01/08/2011 at 01:37.
Pushed by ahiemstra into branch 'master'.

Remove erroneous addition of Qt OpenGL defines.

We do our own GL checking in CMake, so these actually cause problems
instead of fixing them.

M  +0    -6    graphics/glheaders.h

http://commits.kde.org/gluon/817a5f80623e19cd763786237aa1a49997aeef05

diff --git a/graphics/glheaders.h b/graphics/glheaders.h
index c445523..9035584 100644
--- a/graphics/glheaders.h
+++ b/graphics/glheaders.h
@@ -32,12 +32,6 @@
 typedef char GLchar;
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
-#elif defined(QT_OPENGL_ES_1)
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#elif defined(QT_OPENGL_ES_2)
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #else
 #include <GL/gl.h>
 #include <GL/glext.h>

[prev in list] [next in list] [prev in thread] [next in thread]