diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 12:33:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 12:33:30 (GMT) |
| commit | 12689cc05936d675c8a7065cf39b8334b83f95bb (patch) | |
| tree | c77f27c34fa09adafa879a5b183b056a7adbb3be /src/s60installs | |
| parent | deefcaaa5bfaf22ee31ae9da2965ab627b0c43b5 (diff) | |
| parent | 8621d989b80bd384826569e6f6fec25fe3327c94 (diff) | |
| download | Qt-12689cc05936d675c8a7065cf39b8334b83f95bb.zip Qt-12689cc05936d675c8a7065cf39b8334b83f95bb.tar.gz Qt-12689cc05936d675c8a7065cf39b8334b83f95bb.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:
Change the pooled QGLPixmapData to be backed by QVolatileImage.
Started changes-4.7.4 file
Changed s60 style not to rely on QPixmapData::toNativeType().
Add missing bitmap locking to QVGPixmapData::fromNativeType.
Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtOpenGLu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtOpenGLu.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtOpenGLu.def b/src/s60installs/bwins/QtOpenGLu.def index 87d1b56..f52932c 100644 --- a/src/s60installs/bwins/QtOpenGLu.def +++ b/src/s60installs/bwins/QtOpenGLu.def @@ -718,4 +718,5 @@ EXPORTS ?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) + ?idealFormat@QGLPixmapData@@QAE?AW4Format@QImage@@AAV3@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 720 NONAME ; enum QImage::Format QGLPixmapData::idealFormat(class QImage &, class QFlags<enum Qt::ImageConversionFlag>) diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def index 4c5dca9..f7a7f71 100644 --- a/src/s60installs/eabi/QtOpenGLu.def +++ b/src/s60installs/eabi/QtOpenGLu.def @@ -720,4 +720,5 @@ EXPORTS _ZN13QGLPixmapData21detachTextureFromPoolEv @ 719 NONAME _ZN13QGLPixmapData9hibernateEv @ 720 NONAME _ZN17QGLGraphicsSystem22releaseCachedResourcesEv @ 721 NONAME + _ZN13QGLPixmapData11idealFormatER6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 722 NONAME |