summaryrefslogtreecommitdiffstats
path: root/src/s60installs/bwins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-15 23:11:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-15 23:11:51 (GMT)
commitc26b0c6cbf92fac2e8cb93f247558c45186d4eed (patch)
tree229ff29c65b2a8692f2da114ae281829946f7e3f /src/s60installs/bwins
parent411938c541a6c3993b47f1f86d844f12c1651351 (diff)
parent2bd6dec008693b48430b8f29c564fa8a24158370 (diff)
downloadQt-c26b0c6cbf92fac2e8cb93f247558c45186d4eed.zip
Qt-c26b0c6cbf92fac2e8cb93f247558c45186d4eed.tar.gz
Qt-c26b0c6cbf92fac2e8cb93f247558c45186d4eed.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Hot fix for compilation without QGL_USE_TEXTURE_POOL Initial implementation of GLES2.0 resource pooling
Diffstat (limited to 'src/s60installs/bwins')
-rw-r--r--src/s60installs/bwins/QtOpenGLu.def7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtOpenGLu.def b/src/s60installs/bwins/QtOpenGLu.def
index 3eb1512..87d1b56 100644
--- a/src/s60installs/bwins/QtOpenGLu.def
+++ b/src/s60installs/bwins/QtOpenGLu.def
@@ -711,4 +711,11 @@ EXPORTS
?createPixmapForImage@QGLPixmapData@@AAEXAAVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@_N@Z @ 710 NONAME ; void QGLPixmapData::createPixmapForImage(class QImage &, class QFlags<enum Qt::ImageConversionFlag>, bool)
?fromImageReader@QGLPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 711 NONAME ; void QGLPixmapData::fromImageReader(class QImageReader *, class QFlags<enum Qt::ImageConversionFlag>)
?setContext@QGLTextureGlyphCache@@QAEXPAVQGLContext@@@Z @ 712 NONAME ; void QGLTextureGlyphCache::setContext(class QGLContext *)
+ ?hibernate@QGLPixmapData@@QAEXXZ @ 713 NONAME ; void QGLPixmapData::hibernate(void)
+ ?detachTextureFromPool@QGLPixmapData@@QAEXXZ @ 714 NONAME ; void QGLPixmapData::detachTextureFromPool(void)
+ ?reclaimTexture@QGLPixmapData@@QAEXXZ @ 715 NONAME ; void QGLPixmapData::reclaimTexture(void)
+ ?destroyTexture@QGLPixmapData@@QAEXXZ @ 716 NONAME ; void QGLPixmapData::destroyTexture(void)
+ ?releaseCachedResources@QGLGraphicsSystem@@UAEXXZ @ 717 NONAME ; void QGLGraphicsSystem::releaseCachedResources(void)
+ ?serialNumber@QGLTextureGlyphCache@@QBEHXZ @ 718 NONAME ; int QGLTextureGlyphCache::serialNumber(void) const
+ ?forceToImage@QGLPixmapData@@QAEXXZ @ 719 NONAME ; void QGLPixmapData::forceToImage(void)