Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix to data detaching in OpenVG pixmap data
  Remove toolcheck from generic clean targets for symbian-sbsv2

1 files changed, 10 insertions, 2 deletions

diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index e4b1d02..732b484 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -200,6 +200,9 @@ bool QVGPixmapData::fromData(const uchar *buffer, uint len, const char *format,
     return !isNull();
 }
 
+/*!
+    out-of-place conversion (inPlace == false) will always detach()
+ */
 void QVGPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace)
 {
     if (image.size() == QSize(w, h))
@@ -216,11 +219,16 @@ void QVGPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags
     else
         format = image.hasAlphaChannel() ? sourceFormat() : QImage::Format_RGB32;
 
-    if (inPlace && image.data_ptr()->convertInPlace(format, flags))
+    if (inPlace && image.data_ptr()->convertInPlace(format, flags)) {
         source = image;
-    else
+    } else {
         source = image.convertToFormat(format);
 
+        // convertToFormat won't detach the image if format stays the same.
+        if (image.format() == format)
+            source.detach();
+    }
+
     recreate = true;
 }