--- a/src/gui/image/qpixmap_s60_p.h	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/image/qpixmap_s60_p.h	Tue Feb 02 00:43:10 2010 +0200
@@ -87,6 +87,8 @@
     QS60PixmapData(PixelType type);
     ~QS60PixmapData();
 
+    QPixmapData *createCompatiblePixmapData() const;
+
     void resize(int width, int height);
     void fromImage(const QImage &image, Qt::ImageConversionFlags flags);
     void copy(const QPixmapData *data, const QRect &rect);
@@ -107,17 +109,17 @@
 
 private:
     void release();
-    void fromSymbianBitmap(CFbsBitmap* bitmap);
-    bool initSymbianBitmapContext();
+    void fromSymbianBitmap(CFbsBitmap* bitmap, bool lockFormat=false);
+    QImage toImage(const QRect &r) const;
 
     QSymbianBitmapDataAccess *symbianBitmapDataAccess;
 
     CFbsBitmap *cfbsBitmap;
-    CFbsBitmapDevice *bitmapDevice;
-    CFbsBitGc *bitmapGc;
     QPaintEngine *pengine;
     uchar* bytes;
 
+    bool formatLocked;
+
     friend class QPixmap;
     friend class QS60WindowSurface;
     friend class QS60PaintEngine;