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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (237 commits)
  Fix animation tests after merge
  Remove duplicated test.
  Add missing test file.
  Changing width of RTL positioner doesn't relayout
  Fix TextInput auto test failure on mac.
  PinchArea and Flickable don't work well enough together
  Do not set focus unnecessarily at window activation in Symbian
  QS60Style: Regression in drawing dialog background
  QS60Style: Support menu separator (pt.2)
  Fix auto test failure.
  Support for new softkey in Symbian^3
  Once Image sourceSize is set there is no way to clear it.
  Rotation transform with NaN angle can cause crash
  QSoftkeyManager auto test update
  Fixed not switching to MeeGo graphicssystem.
  Canceling image download while reading causes crash
  Fix width of TextInput micro focus rectangle.
  Return correct boundaries reasons from QTextBoundaryFinder.
  GridView jumps to beginning of list when resized
  Fixed rounding of coordinates pre-transformation in CG paintengine.
  ...

2 files changed, 5 insertions, 4 deletions

diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 3f67c79..80f5b2f 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -458,7 +458,7 @@ void QVGPixmapData::hibernate()
     if (skipHibernate)
         return;
 
-    forceToImage();
+    forceToImage(false); // no readback allowed here
     destroyImageAndContext();
 }
 
@@ -502,12 +502,13 @@ int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
 
 // Ensures that the pixmap is backed by some valid data and forces the data to
 // be re-uploaded to the VGImage when toVGImage() is called next time.
-void QVGPixmapData::forceToImage()
+void QVGPixmapData::forceToImage(bool allowReadback)
 {
     if (!isValid())
         return;
 
-    ensureReadback(false);
+    if (allowReadback)
+        ensureReadback(false);
 
     if (source.isNull())
         source = QVolatileImage(w, h, sourceFormat());
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h
index 15ff889..c284596 100644
--- a/src/openvg/qpixmapdata_vg_p.h
+++ b/src/openvg/qpixmapdata_vg_p.h
@@ -188,7 +188,7 @@ protected:
     QString nativeImageType;
 #endif
 
-    void forceToImage();
+    void forceToImage(bool allowReadback = true);
     QImage::Format sourceFormat() const;
     QImage::Format idealFormat(QImage *image, Qt::ImageConversionFlags flags) const;
     void updateSerial();