Changed QPixmap VG backend to use CFbsBitmap on Symbian.

Similarly to QS60PixmapData, that is used on raster, QVGPixmapData
is also backed by a CFbsBitmap from now on (at least when it makes
sense to do so). This allows copy-less bitmap handle duplication in
from- and toSymbianCFbsBitmap() in case of certain image formats,
reduces local heap usage and improves performance with the s60 style
due to a reduced number of pixel data copies.

Task-number: QT-2505

Reviewed-by: Jason Barron
Reviewed-by: Jani Hautakangas

1 files changed, 12 insertions, 2 deletions

diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index f89706c..1ca832e 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -28,7 +28,9 @@ HEADERS += \
         image/qpixmapdata_p.h \
         image/qpixmapdatafactory_p.h \
         image/qpixmapfilter_p.h \
-        image/qimagepixmapcleanuphooks_p.h
+        image/qimagepixmapcleanuphooks_p.h \
+        image/qvolatileimage_p.h \
+        image/qvolatileimagedata_p.h
 
 SOURCES += \
         image/qbitmap.cpp \
@@ -51,7 +53,8 @@ SOURCES += \
         image/qmovie.cpp \
         image/qpixmap_raster.cpp \
         image/qnativeimage.cpp \
-        image/qimagepixmapcleanuphooks.cpp
+        image/qimagepixmapcleanuphooks.cpp \
+        image/qvolatileimage.cpp
 
 win32 {
     SOURCES += image/qpixmap_win.cpp
@@ -72,6 +75,13 @@ else:symbian {
     SOURCES += image/qpixmap_s60.cpp
 }
 
+symbian {
+    SOURCES += image/qvolatileimagedata_symbian.cpp
+}
+else {
+    SOURCES += image/qvolatileimagedata.cpp
+}
+
 # Built-in image format support
 HEADERS += \
         image/qbmphandler_p.h \