summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-07-27 07:30:20 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-07-27 07:40:17 (GMT)
commit3bf3981c7026de9017887d08312391b54fe8afc6 (patch)
tree02ec7af371a951d266ffbf1ca99bdf0a1080f8aa
parentf68fed388dcdba6ab6dad3af4933bcd3aa123cf8 (diff)
downloadQt-3bf3981c7026de9017887d08312391b54fe8afc6.zip
Qt-3bf3981c7026de9017887d08312391b54fe8afc6.tar.gz
Qt-3bf3981c7026de9017887d08312391b54fe8afc6.tar.bz2
Really, really fix HPUX this time
The conditionals were the wrong way round. Reviewed-By: Samuel
-rw-r--r--src/opengl/qgl_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 64f5810..a95b7a0 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -1648,7 +1648,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi
void QGLTexture::deleteBoundPixmap()
{
-#if !defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX)
+#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX)
if (boundPixmap) {
glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT);
glXDestroyPixmap(QX11Info::display(), boundPixmap);