summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglpixelbuffer_x11.cpp
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <[email protected]>2011-07-21 18:47:26 +0200
committerQt by Nokia <[email protected]>2011-07-25 12:58:23 +0200
commitb949b17c3cb7b6752bc8daf2834415163792a76c (patch)
treef4d7d0eb7c3a1a71cb12e2d5a5c6c667449c6358 /src/opengl/qglpixelbuffer_x11.cpp
parent8d762c9caea4f8b9ff589b6c23564f4e37242745 (diff)
Changed QLibrary::resolve() to return a function pointer.
According to the C++ standard, there is no guarantee that you can cast between function pointers and void pointers without data loss (section 5.2.10-6). Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd Reviewed-on: http://codereview.qt.nokia.com/1995 Reviewed-by: Qt Sanity Bot <[email protected]> Reviewed-by: João Abecasis <[email protected]>
Diffstat (limited to 'src/opengl/qglpixelbuffer_x11.cpp')
-rw-r--r--src/opengl/qglpixelbuffer_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglpixelbuffer_x11.cpp b/src/opengl/qglpixelbuffer_x11.cpp
index 9e8beba3113..fcd7b521bb0 100644
--- a/src/opengl/qglpixelbuffer_x11.cpp
+++ b/src/opengl/qglpixelbuffer_x11.cpp
@@ -93,7 +93,7 @@ static _glXMakeContextCurrent qt_glXMakeContextCurrent = 0;
#define glXGetFBConfigAttrib qt_glXGetFBConfigAttrib
#define glXMakeContextCurrent qt_glXMakeContextCurrent
-extern void* qglx_getProcAddress(const char* procName); // in qgl_x11.cpp
+extern void (*qglx_getProcAddress(const char* procName))(); // in qgl_x11.cpp
static bool qt_resolve_pbuffer_extensions()
{