summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmapdata_p.h
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2011-03-23 13:40:34 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2011-03-23 13:40:34 (GMT)
commit98d65b5967d5f8a1648d73185986fabab97e692b (patch)
tree4440dbf9bbea48c27a90333981307fef734eb946 /src/gui/image/qpixmapdata_p.h
parent1e5a471645ea8c91b0a2dc0fe019f15fdc5f9127 (diff)
parent8700366079f6346ab0ba8baa624993832127188e (diff)
downloadQt-98d65b5967d5f8a1648d73185986fabab97e692b.zip
Qt-98d65b5967d5f8a1648d73185986fabab97e692b.tar.gz
Qt-98d65b5967d5f8a1648d73185986fabab97e692b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
-rw-r--r--src/gui/image/qpixmapdata_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h
index 7699344..0d0d417 100644
--- a/src/gui/image/qpixmapdata_p.h
+++ b/src/gui/image/qpixmapdata_p.h
@@ -71,7 +71,9 @@ public:
#if defined(Q_OS_SYMBIAN)
enum NativeType {
FbsBitmap,
- SgImage
+ SgImage,
+ VolatileImage,
+ NativeImageHandleProvider
};
#endif
enum ClassId { RasterClass, X11Class, MacClass, DirectFBClass,