1 files changed, 4 insertions, 13 deletions
diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp
index aa3759a9ec..f7fe70c496 100644
--- a/src/gui/image/qvolatileimage.cpp
+++ b/src/gui/image/qvolatileimage.cpp
@@ -42,7 +42,7 @@
 #include "qvolatileimage_p.h"
 #include "qvolatileimagedata_p.h"
 #include <QtGui/private/qpaintengine_raster_p.h>
-#include <QtGui/private/qpixmapdata_p.h>
+#include <QtGui/qplatformpixmap_qpa.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -200,15 +200,6 @@ void *QVolatileImage::duplicateNativeImage() const
     return d->duplicateNativeImage();
 }
 
-void QVolatileImage::setAlphaChannel(const QPixmap &alphaChannel)
-{
-    ensureFormat(QImage::Format_ARGB32_Premultiplied);
-    beginDataAccess();
-    imageRef().setAlphaChannel(alphaChannel.toImage());
-    endDataAccess();
-    d->ensureImage();
-}
-
 void QVolatileImage::fill(uint pixelValue)
 {
     beginDataAccess();
@@ -245,7 +236,7 @@ void QVolatileImage::copyFrom(QVolatileImage *source, const QRect &rect)
 }
 
 /*!
-    To be called from the PixmapData's paintEngine().
+    To be called from the PlatformPixmap's paintEngine().
   */
 QPaintEngine *QVolatileImage::paintEngine()
 {
@@ -284,7 +275,7 @@ bool QVolatileImagePaintEngine::end()
 void QVolatileImagePaintEngine::drawPixmap(const QPointF &p, const QPixmap &pm)
 {
 #ifdef Q_OS_SYMBIAN
-    void *nativeData = pm.pixmapData()->toNativeType(QPixmapData::VolatileImage);
+    void *nativeData = pm.handle()->toNativeType(QPlatformPixmap::VolatileImage);
     if (nativeData) {
         QVolatileImage *img = static_cast<QVolatileImage *>(nativeData);
         img->beginDataAccess();
@@ -301,7 +292,7 @@ void QVolatileImagePaintEngine::drawPixmap(const QPointF &p, const QPixmap &pm)
 void QVolatileImagePaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr)
 {
 #ifdef Q_OS_SYMBIAN
-    void *nativeData = pm.pixmapData()->toNativeType(QPixmapData::VolatileImage);
+    void *nativeData = pm.handle()->toNativeType(QPlatformPixmap::VolatileImage);
     if (nativeData) {
         QVolatileImage *img = static_cast<QVolatileImage *>(nativeData);
         img->beginDataAccess();