diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-27 15:20:30 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-27 15:26:35 (GMT) |
| commit | e5ef272382b124cf5d051ed7f25324fc804d97f6 (patch) | |
| tree | ca3ddce82dd05e3811ddd155d176a16a825f83af | |
| parent | 4d4d2714aa9e4ee9bec005531b24442d0a1a8665 (diff) | |
| download | Qt-e5ef272382b124cf5d051ed7f25324fc804d97f6.zip Qt-e5ef272382b124cf5d051ed7f25324fc804d97f6.tar.gz Qt-e5ef272382b124cf5d051ed7f25324fc804d97f6.tar.bz2 | |
Fix build on Solaris
Solaris seems to define glXReleaseTexImageEXT rather than let it be
resolved as a function pointer.
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index a95b7a0..a76059c 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1536,11 +1536,14 @@ void QGLExtensions::init() } } - +#if !defined(glXBindTexImageEXT) typedef void (*qt_glXBindTexImageEXT)(Display*, GLXDrawable, int, const int*); -typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int); static qt_glXBindTexImageEXT glXBindTexImageEXT = 0; +#endif +#if !defined(glXReleaseTexImageEXT) +typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int); static qt_glXReleaseTexImageEXT glXReleaseTexImageEXT = 0; +#endif static bool qt_resolved_texture_from_pixmap = false; QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert) |