Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (39 commits)
  Use built-in iconv on Solaris if available
  Export various symbols needed to make a custom GL graphicssystem.
  Moc: fix compilation when templated types with multiple arguments are used.
  Fixes the documentation of QGraphicsEffect::update().
  support BGRA textures on SGX
  Avoid calling time.elapsed() twice in abstract animation
  Adds slowdownFactor to UnifiedTimer in abstract animation
  Add the conversion in-place for QPixmap::fromImageReader() on raster.
  Add QPixmap::fromImageReader() to decode arbitrary images in place.
  Add missing license header.
  Added textureUpload benchmark to the GL benchmarks
  Fixed a crash in menubar with invisible actions
  Fixed ARM .def files.
  Doc: QSettings::sync() imports changes made by other processes.
  Made -graphicssystem trace work with Qt::TextBypassShaping flag.
  Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
  Add a manual test for regular widget interaction with the table.
  New variant of ::createPixmapData with origin for QGraphicsSystem.
  EGL plane levels are the same as all other GL backends.
  Need to access extensionFuncs in subclasses too.
  ...

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h
index 7575838..821fb69 100644
--- a/src/gui/image/qpixmap_x11_p.h
+++ b/src/gui/image/qpixmap_x11_p.h
@@ -62,6 +62,8 @@ QT_BEGIN_NAMESPACE
 
 class QX11PaintEngine;
 
+struct QXImageWrapper;
+
 class Q_GUI_EXPORT QX11PixmapData : public QPixmapData
 {
 public:
@@ -87,6 +89,7 @@ public:
     QPixmap transformed(const QTransform &transform,
                         Qt::TransformationMode mode) const;
     QImage toImage() const;
+    QImage toImage(const QRect &rect) const;
     QPaintEngine* paintEngine() const;
 
     Qt::HANDLE handle() const { return hd; }
@@ -116,10 +119,15 @@ private:
 
     void release();
 
+    QImage toImage(const QXImageWrapper &xi, const QRect &rect) const;
+
     QBitmap mask_to_bitmap(int screen) const;
     static Qt::HANDLE bitmap_to_mask(const QBitmap &, int screen);
     void bitmapFromImage(const QImage &image);
 
+    bool canTakeQImageFromXImage(const QXImageWrapper &xi) const;
+    QImage takeQImageFromXImage(const QXImageWrapper &xi) const;
+
     Qt::HANDLE hd;
 
     enum Flag {