diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 21:23:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 21:23:03 (GMT) |
| commit | 213b5d2651aaf55e76b3aab3788ab86a08a75b82 (patch) | |
| tree | b6103525329ee34c80e1a68063726bd8f12766f1 /src/gui/image/qpixmap_s60_p.h | |
| parent | 3817f59657147c6341dea54d220e5bfa704f24de (diff) | |
| parent | 97305f4ca91b380f42ff5d3fd49c268df0c5ff8c (diff) | |
| download | Qt-213b5d2651aaf55e76b3aab3788ab86a08a75b82.zip Qt-213b5d2651aaf55e76b3aab3788ab86a08a75b82.tar.gz Qt-213b5d2651aaf55e76b3aab3788ab86a08a75b82.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:
4.7.2 changes
Change paging attributes for Symbian binaries
Fix build failure
Fix regression in creating mkspecs/default
Changes for 4.7.2
Recreate Symbian raster backing store when WA_TranslucentBackground set
Diffstat (limited to 'src/gui/image/qpixmap_s60_p.h')
| -rw-r--r-- | src/gui/image/qpixmap_s60_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h index e4060dc..c440bbc 100644 --- a/src/gui/image/qpixmap_s60_p.h +++ b/src/gui/image/qpixmap_s60_p.h @@ -107,6 +107,8 @@ public: void* toNativeType(NativeType type); void fromNativeType(void* pixmap, NativeType type); + void convertToDisplayMode(int mode); + private: void release(); void fromSymbianBitmap(CFbsBitmap* bitmap, bool lockFormat=false); |