summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Hautakangas <jani.hautakangas@nokia.com>2011-03-15 17:31:38 (GMT)
committerJani Hautakangas <jani.hautakangas@nokia.com>2011-03-15 17:31:38 (GMT)
commit2bd6dec008693b48430b8f29c564fa8a24158370 (patch)
treefba8cc92b239705438cf5016e8a5e54808e62607
parent2355774b061d9e7213634ddec3c50280c4b10b70 (diff)
downloadQt-2bd6dec008693b48430b8f29c564fa8a24158370.zip
Qt-2bd6dec008693b48430b8f29c564fa8a24158370.tar.gz
Qt-2bd6dec008693b48430b8f29c564fa8a24158370.tar.bz2
Hot fix for compilation without QGL_USE_TEXTURE_POOL
Reviewed-by: TRUSTME
-rw-r--r--src/opengl/qwindowsurface_gl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 340f75a..11a9eb0 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -257,6 +257,7 @@ void qt_destroy_gl_share_widget()
_qt_gl_share_widget()->destroy();
}
+#ifdef QGL_USE_TEXTURE_POOL
void qt_gl_register_pixmap(QGLPixmapData *pd)
{
QGLGlobalShareWidget *shared = _qt_gl_share_widget();
@@ -291,6 +292,7 @@ void qt_gl_hibernate_pixmaps()
pd = pd->next;
}
}
+#endif
struct QGLWindowSurfacePrivate
{