diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-03 16:34:32 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-03 16:34:32 +0100 |
| commit | 8ddf96a15f707001755d5b934f3f900b825b5887 (patch) | |
| tree | 5dee68c5bd2e691218bd45c7b74da7c7c16b22cd /src/gui/image/qpixmapdata_p.h | |
| parent | 5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (diff) | |
| parent | d7a00eaec6d94fd2383d6f815f792d26b7161f0c (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/openvg/qvg_symbian.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 5c05c28cab..db5ff4ab24 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -71,7 +71,8 @@ public: #if defined(Q_OS_SYMBIAN) enum NativeType { FbsBitmap, - SgImage + SgImage, + VolatileImage }; #endif enum ClassId { RasterClass, X11Class, MacClass, DirectFBClass, |