summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-01 10:03:50 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-01 10:03:50 (GMT)
commita5a9672d8e437461c53347d49b788a2e098501be (patch)
tree81ce2e5cc184416c3785efca60d788cf07bdafd9 /src/opengl
parenta7a6db7edc8cd67fd257167ecb3ea3029f2be38a (diff)
downloadQt-a5a9672d8e437461c53347d49b788a2e098501be.zip
Qt-a5a9672d8e437461c53347d49b788a2e098501be.tar.gz
Qt-a5a9672d8e437461c53347d49b788a2e098501be.tar.bz2
Compile on Windows
The default GL header on Windows is GL 1.1, so the 1.5 extensions are not defined. To work around this, we define the macros when needed. The macros are required for QStaticText's OpenGL backend.
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qglextensions_p.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h
index b0cb429..e0fc99c 100644
--- a/src/opengl/qglextensions_p.h
+++ b/src/opengl/qglextensions_p.h
@@ -415,6 +415,14 @@ struct QGLExtensionFuncs
// OpenGL constants
+#ifndef GL_ARRAY_BUFFER
+#define GL_ARRAY_BUFFER 0x8892
+#endif
+
+#ifndef GL_STATIC_DRAW
+#define GL_STATIC_DRAW 0x88E4
+#endif
+
/* NV_texture_rectangle */
#ifndef GL_NV_texture_rectangle
#define GL_TEXTURE_RECTANGLE_NV 0x84F5