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>

diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
index 5ca2ead..f68b499 100644 (file)
--- 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

diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index 9b0cda6..ec317f7 100644 (file)
--- 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