Fix QBlittablePixmapData::fromImage

There is still a stride problem when running the browser demo

1 files changed, 1 insertions, 32 deletions

diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h
index 5e01a12557..ca834dc976 100644
--- a/src/gui/image/qpixmap_blitter_p.h
+++ b/src/gui/image/qpixmap_blitter_p.h
@@ -4,37 +4,6 @@
 #include <private/qpixmapdata_p.h>
 #include <private/qpaintengine_blitter_p.h>
 
-class QImageBlitter : public QBlittable
-{
-public:
-    QImageBlitter(const QImage &img)
-        : QBlittable(img.rect(),0), image(img)
-    {
-    }
-
-    void fillRect(const QRectF &, const QColor &)
-    {
-        //should never be called
-    }
-    void drawPixmap(const QRectF &, const QPixmap &, const QRectF &)
-    {
-        //should never be called
-    }
-
-protected:
-    QImage *doLock()
-    {
-        return &image;
-    }
-
-    void doUnlock()
-    {
-    }
-
-private:
-    QImage image;
-};
-
 class Q_GUI_EXPORT  QBlittablePixmapData : public QPixmapData
 {
 //     Q_DECLARE_PRIVATE(QBlittablePixmapData);
@@ -42,7 +11,7 @@ public:
     QBlittablePixmapData(QPixmapData::PixelType type);
     ~QBlittablePixmapData();
 
-    QBlittable *blittable();
+    QBlittable *blittable() const;
     void setBlittable(QBlittable *blittable);
 
     void resize(int width, int height);