summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_s60_p.h
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-02-15 16:10:20 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-02-15 16:10:20 (GMT)
commit96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf (patch)
tree69a2ed4ce05b1839d6e050668273c70245076d68 /src/gui/image/qpixmap_s60_p.h
parenta38a14b9fb411231443e80cf14d397492f3412dc (diff)
parent0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff)
downloadQt-96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf.zip
Qt-96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf.tar.gz
Qt-96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf.tar.bz2
Merge branch 'master-upstream'
Diffstat (limited to 'src/gui/image/qpixmap_s60_p.h')
-rw-r--r--src/gui/image/qpixmap_s60_p.h2
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);