From 711689fef98d6768120a5a5df08b6db9f98a0a2b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 27 Aug 2012 11:47:01 +0200
Subject: 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>
---
 src/opengl/qglshaderprogram.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/opengl/qglshaderprogram.h')

diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index 9b0cda6170..ec317f7956 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -100,14 +100,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGLShader::ShaderType)
 
 class QGLShaderProgramPrivate;
 
-#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_OPENGL_EXPORT QGLShaderProgram : public QObject
 {
     Q_OBJECT
-- 
cgit v1.2.3