diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-08-27 11:47:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-30 13:51:22 +0200 |
| commit | 711689fef98d6768120a5a5df08b6db9f98a0a2b (patch) | |
| tree | 95792c32430b56d04af29f1691e0f7b4e99cc675 /src/opengl/qglshaderprogram.h | |
| parent | 634c39c1a950d1883e80b39989fbe3ccb517d124 (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/opengl/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 8 |
1 files changed, 0 insertions, 8 deletions
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 |