diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
| commit | 6239af6f0f15871e02a516c97c5f1775743d352b (patch) | |
| tree | 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /src/gui/opengl | |
| parent | 3dc47622a469ded1c99397fdedc2053b73d57189 (diff) | |
| parent | 6654a05fcad565a302e205e7f7deaa0b2757082d (diff) | |
Merge branch 'release' into stable
Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index ba421bd1c1..9d29e07319 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 |