Adding support for symbian graphics resources.

This enables us to convert from and to new Symbian type of
graphics resource, namely SgImage. This only supported with
the OpenVG graphics system.
On other graphics systems this will return null QPixmap.

Conflicts:
	src/corelib/global/qglobal.h
	src/gui/image/qpixmap.h
	src/gui/image/qpixmap_s60.cpp

Reviewed-by: Jason Barron

1 files changed, 13 insertions, 1 deletions

diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index 9bb701b..122f596 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -56,7 +56,10 @@
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <private/qvg_p.h>
 #if !defined(QT_NO_EGL)
-#include <QtGui/private/qegl_p.h>
+#endif
+
+#if defined(Q_OS_SYMBIAN)
+class RSGImage;
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -91,9 +94,18 @@ public:
 
     QSize size() const { return QSize(w, h); }
 
+#if defined(Q_OS_SYMBIAN)
+    RSgImage* toRSgImage();
+    void fromRSgImage(RSgImage* sgImage);
+#endif
+
 protected:
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
 
+#if defined(Q_OS_SYMBIAN)
+    void cleanup();
+#endif
+
 private:
     VGImage vgImage;
     VGImage vgImageOpacity;