Merge remote branch 'qt/4.7' into lighthouse-4.7

Conflicts:
	src/gui/egl/egl.pri
	src/gui/painting/qwindowsurface_p.h

1 files changed, 6 insertions, 2 deletions

diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h
index b9db92c..512cb97 100644
--- a/src/gui/painting/qwindowsurface_p.h
+++ b/src/gui/painting/qwindowsurface_p.h
@@ -74,8 +74,12 @@ public:
     QWidget *window() const;
 
     virtual QPaintDevice *paintDevice() = 0;
-    virtual void flush(QWidget *widget, const QRegion &region,
-                       const QPoint &offset) = 0;
+
+    // 'widget' can be a child widget, in which case 'region' is in child widget coordinates and
+    // offset is the (child) widget's offset in relation to the window surface. On QWS, 'offset'
+    // can be larger than just the offset from the top-level widget as there may also be window
+    // decorations which are painted into the window surface.
+    virtual void flush(QWidget *widget, const QRegion &region, const QPoint &offset) = 0;
 #if !defined(Q_WS_LITE)
     virtual void setGeometry(const QRect &rect);
     QRect geometry() const;