summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgraphicssystem_gl.cpp
diff options
context:
space:
mode:
authorSami Lempinen <sami.lempinen@nokia.com>2011-03-17 11:29:50 (GMT)
committerSami Lempinen <sami.lempinen@nokia.com>2011-03-17 11:29:50 (GMT)
commitcefacacee367684e3637665984401c8e1073859c (patch)
tree97cdbc9b1ca275b90c1a761d5617ff12b244b2e4 /src/opengl/qgraphicssystem_gl.cpp
parent130f8dce2f730811c3f1f0b4f45a3333c9a79600 (diff)
parentcbf6c5b810316efba3ccfb27f05576b8dbfe3890 (diff)
downloadQt-cefacacee367684e3637665984401c8e1073859c.zip
Qt-cefacacee367684e3637665984401c8e1073859c.tar.gz
Qt-cefacacee367684e3637665984401c8e1073859c.tar.bz2
Merge remote branch 'qt-master/master'
Diffstat (limited to 'src/opengl/qgraphicssystem_gl.cpp')
-rw-r--r--src/opengl/qgraphicssystem_gl.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/opengl/qgraphicssystem_gl.cpp b/src/opengl/qgraphicssystem_gl.cpp
index 3574756..0aa3c2e 100644
--- a/src/opengl/qgraphicssystem_gl.cpp
+++ b/src/opengl/qgraphicssystem_gl.cpp
@@ -57,6 +57,10 @@
#include <QtGui/private/qapplication_p.h>
#endif
+#ifdef QGL_USE_TEXTURE_POOL
+#include "private/qgltexturepool_p.h"
+#endif
+
QT_BEGIN_NAMESPACE
extern QGLWidget *qt_gl_getShareWidget();
@@ -100,6 +104,11 @@ QWindowSurface *QGLGraphicsSystem::createWindowSurface(QWidget *widget) const
return new QGLWindowSurface(widget);
}
-
+#ifdef QGL_USE_TEXTURE_POOL
+void QGLGraphicsSystem::releaseCachedResources()
+{
+ QGLTexturePool::instance()->hibernate();
+}
+#endif
QT_END_NAMESPACE