summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2012-03-05 11:32:09 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-07 00:42:35 +0100
commit0324bb17f7cb0e855ca1d7adb2d0e171b19dfd06 (patch)
treef487d8a66b79f0aed5ff7bf1a3351789068c19ee
parentfdd137812ad7870c2d3430ff64969bcc552eb498 (diff)
Prevent stack corruption when using OpenGL Core Profile on Windows
This is the backport of commit 1c5b2de9b75a5e74fd7d511fea71edc382d539b6 to qtbase. Change-Id: I8680c20c8b804fb4e77062f52b8f4188b49263a8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/opengl/qgl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index e2308f6345..7080e1dbcc 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -5400,7 +5400,7 @@ QGLWidget::QGLWidget(QGLContext *context, QWidget *parent,
#endif // QT3_SUPPORT
-typedef GLubyte * (*qt_glGetStringi)(GLenum, GLuint);
+typedef const GLubyte * (APIENTRY *qt_glGetStringi)(GLenum, GLuint);
#ifndef GL_NUM_EXTENSIONS
#define GL_NUM_EXTENSIONS 0x821D