summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2013-01-14 14:10:40 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-27 10:54:17 +0100
commitdca90252a785236df9f435b2b5e4cc297345ae7f (patch)
tree3df0e3604211bffa0931c05de708922269218305 /src
parent1fbfbf6b6e50a6c2e3ce4eae72709ea53f56c4ab (diff)
Prevent GL/gl.h from including system glext.h
This allows us to then use the up-to-date qopenglext.h header on Linux too. Some distro's are not yet shipping OpenGL 4.x compatible headers. This fixes compilation of Qt on CentOS 5.8 and RHEL Change-Id: Ia8022e0aaf215dac7ea2a23dc82c3ac117d9fd53 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/opengl/qopengl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index 5928b0be2f..ae02356f81 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -95,6 +95,7 @@ typedef GLfloat GLdouble;
# if defined(Q_OS_WIN)
# include <QtCore/qt_windows.h>
# endif
+# define GL_GLEXT_LEGACY // Prevents GL/gl.h form #including system glext.h
# include <GL/gl.h>
# include <QtGui/qopenglext.h>
# endif // Q_OS_MAC