Fixed a crash bug on S60 SDK 3.1.

The crash was caused by the image data not being locked before being
accessed.

Also avoided an unnecessary detach copy by making the image variable
a reference.

RevBy:    Jani Hautakangas
Task:     QTBUG-4705
AutoTest: QWidget passed

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 664ad4864e..dc4e43b408 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -85,7 +85,9 @@ QS60WindowSurface::~QS60WindowSurface()
 void QS60WindowSurface::beginPaint(const QRegion &rgn)
 {
     if (!qt_widget_private(window())->isOpaque) {
-        QImage image = static_cast<QS60PixmapData *>(d_ptr->device.data_ptr().data())->image;
+        QS60PixmapData *pixmapData = static_cast<QS60PixmapData *>(d_ptr->device.data_ptr().data());
+        pixmapData->beginDataAccess();
+        QImage &image = pixmapData->image;
         QRgb *data = reinterpret_cast<QRgb *>(image.bits());
         const int row_stride = image.bytesPerLine() / 4;
 
@@ -103,6 +105,7 @@ void QS60WindowSurface::beginPaint(const QRegion &rgn)
                 row += row_stride;
             }
         }
+        pixmapData->endDataAccess();
     }
 }