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: (299 commits)
  PathView items were not correctly updated when rootIndex changed.
  Allow text to selected in a TextEdit or TextInput inside a Flickable.
  Update modules-related tests and docs
  CLeanup registers after AddString
  4.7.2 changes
  Change paging attributes for Symbian binaries
  Fix build failure
  Fix regression in creating mkspecs/default
  Stop focus propagation of touch events when flag is set.
  Fixed tst_qpixmap::toImageDeepCopy autotest for GL graphicssystem.
  Changes for 4.7.2
  Recreate Symbian raster backing store when WA_TranslucentBackground set
  Fix auto test failure.
  PathView regression: dragging the path didn't update currentIndex
  Fix docs for variant and list basic types
  Add test for importing plugins that contain QML files
  Call onAdd() for first items added to ListView and GridView
  Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master.
  Don't clear pre-edit text when a graphics items loses focus.
  Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORS
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 72035bd..04de1bd 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -631,6 +631,12 @@ QImage QGLPixmapData::toImage() const
     if (m_renderFbo) {
         copyBackFromRenderFbo(true);
     } else if (!m_source.isNull()) {
+        QImageData *data = const_cast<QImage &>(m_source).data_ptr();
+        if (data->paintEngine && data->paintEngine->isActive()
+            && data->paintEngine->paintDevice() == &m_source)
+        {
+            return m_source.copy();
+        }
         return m_source;
     } else if (m_dirty || m_hasFillColor) {
         return fillImage(m_fillColor);