summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_qpa.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-01-16 10:01:01 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-16 11:47:32 +0100
commit9702400e2d45c074922e488e01ab8ade82431b47 (patch)
tree6224e50ced20792f7867dfafb0cae03b9c2eb018 /src/opengl/qgl_qpa.cpp
parent5b1aa4c75de4301d1417fd98bb1abf0767779736 (diff)
Fixed QGLContext::getProcAddress() to return a function pointer.
Task-number: QTBUG-5729 Change-Id: I57e71f89a2c5ca7f74f73c66adcbf4a6cc073813 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/opengl/qgl_qpa.cpp')
-rw-r--r--src/opengl/qgl_qpa.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index ae46fc99c6..009b43d297 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -231,10 +231,10 @@ void QGLContext::swapBuffers() const
d->guiGlContext->swapBuffers(widget->windowHandle());
}
-void *QGLContext::getProcAddress(const QString &procName) const
+QFunctionPointer QGLContext::getProcAddress(const QString &procName) const
{
Q_D(const QGLContext);
- return (void *)d->guiGlContext->getProcAddress(procName.toAscii());
+ return d->guiGlContext->getProcAddress(procName.toAscii());
}
void QGLWidget::setContext(QGLContext *context,