diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 11:25:30 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 11:25:30 (GMT) |
| commit | 6532273e52b772f0dd18194782bd3ed4c94ccb26 (patch) | |
| tree | a6a2b0926c7693e2699039d1bb0e2cc811120ed6 /src/opengl | |
| parent | 97447d569999372d43f22dbb1e0fc5193b73615c (diff) | |
| parent | 1950c400294ac0006b20e8b411e896fc98e3b2bf (diff) | |
| download | Qt-6532273e52b772f0dd18194782bd3ed4c94ccb26.zip Qt-6532273e52b772f0dd18194782bd3ed4c94ccb26.tar.gz Qt-6532273e52b772f0dd18194782bd3ed4c94ccb26.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/kernel/qwidget_p.h
src/gui/painting/qgraphicssystem_p.h
src/plugins/plugins.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtMultimediau.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtScriptu.def
src/s60installs/bwins/QtSqlu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/bwins/QtXmlPatternsu.def
src/s60installs/bwins/phononu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtTestu.def
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgraphicssystem_gl.cpp | 10 | ||||
| -rw-r--r-- | src/opengl/qgraphicssystem_gl_p.h | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/opengl/qgraphicssystem_gl.cpp b/src/opengl/qgraphicssystem_gl.cpp index 0aa3c2e..5a01d8c 100644 --- a/src/opengl/qgraphicssystem_gl.cpp +++ b/src/opengl/qgraphicssystem_gl.cpp @@ -104,11 +104,17 @@ QWindowSurface *QGLGraphicsSystem::createWindowSurface(QWidget *widget) const return new QGLWindowSurface(widget); } -#ifdef QGL_USE_TEXTURE_POOL -void QGLGraphicsSystem::releaseCachedResources() +#ifdef Q_OS_SYMBIAN +void QGLGraphicsSystem::releaseCachedGpuResources() { QGLTexturePool::instance()->hibernate(); } + +QGraphicsSystemEx* QGLGraphicsSystem::platformExtension() +{ + return this; +} #endif + QT_END_NAMESPACE diff --git a/src/opengl/qgraphicssystem_gl_p.h b/src/opengl/qgraphicssystem_gl_p.h index 5829dcc..5372443 100644 --- a/src/opengl/qgraphicssystem_gl_p.h +++ b/src/opengl/qgraphicssystem_gl_p.h @@ -55,11 +55,19 @@ #include "private/qgraphicssystem_p.h" +#ifdef Q_OS_SYMBIAN +#include "private/qgraphicssystemex_symbian_p.h" +#endif + #include <QMap> QT_BEGIN_NAMESPACE class Q_OPENGL_EXPORT QGLGraphicsSystem : public QGraphicsSystem +#ifdef Q_OS_SYMBIAN + , public QSymbianGraphicsSystemEx +#endif + { public: QGLGraphicsSystem(bool useX11GL); @@ -67,8 +75,9 @@ public: QPixmapData *createPixmapData(QPixmapData::PixelType type) const; QWindowSurface *createWindowSurface(QWidget *widget) const; -#ifdef QGL_USE_TEXTURE_POOL - void releaseCachedResources(); +#ifdef Q_OS_SYMBIAN + void releaseCachedGpuResources(); + QGraphicsSystemEx* platformExtension(); #endif private: bool m_useX11GL; |