summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-08-27 11:47:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-30 13:51:22 +0200
commit711689fef98d6768120a5a5df08b6db9f98a0a2b (patch)
tree95792c32430b56d04af29f1691e0f7b4e99cc675 /src/gui/opengl
parent634c39c1a950d1883e80b39989fbe3ccb517d124 (diff)
MSVC/OpenGL: Fix warnings about macro redefinition..
Introduced by fc41ee4c92ce703f3e4374bf493505a1d847a657 . Change-Id: I4c924b0b0a38401ab02c3cc4edb7d78dbd9ef356 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui/opengl')
-rw-r--r--src/gui/opengl/qopenglshaderprogram.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
index 5ca2ead45e..f68b499787 100644
--- a/src/gui/opengl/qopenglshaderprogram.h
+++ b/src/gui/opengl/qopenglshaderprogram.h
@@ -102,14 +102,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLShader::ShaderType)
class QOpenGLShaderProgramPrivate;
-#ifndef GL_EXT_geometry_shader4
-# define GL_LINES_ADJACENCY_EXT 0xA
-# define GL_LINE_STRIP_ADJACENCY_EXT 0xB
-# define GL_TRIANGLES_ADJACENCY_EXT 0xC
-# define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
-#endif
-
-
class Q_GUI_EXPORT QOpenGLShaderProgram : public QObject
{
Q_OBJECT