diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:05:43 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:06:59 (GMT) |
| commit | 24bfb5cfc80966b15a58be6ef8dc5514d3318af1 (patch) | |
| tree | 153879a8a41148a45c0f66ee74acd4b972bbca50 /src/gui/image/qpixmapdata_p.h | |
| parent | 774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff) | |
| parent | f5812ae1b669daa921eeabc903ec0eafcfe0c030 (diff) | |
| download | Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.zip Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.gz Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.bz2 | |
Merge qt/qt.git master into qa-team-master
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 5c05c28..6bbce09 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, |