Merge master into api_changes

Conflicts:
	src/corelib/global/qisenum.h
	src/dbus/qdbusconnection_p.h
	src/widgets/kernel/qwidget.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d

1 files changed, 13 insertions, 16 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index 5e221ffd8b..f0ff7ba0d6 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -47,23 +47,10 @@
 
 QT_BEGIN_NAMESPACE
 
-QRect flipedRect(const QRect &sourceRect,int height)
-{
-    if (!sourceRect.isValid())
-        return QRect();
-    QRect flippedRect = sourceRect;
-    flippedRect.moveTop(height - sourceRect.y());
-    return flippedRect;
-}
-
 QCocoaBackingStore::QCocoaBackingStore(QWindow *window)
     : QPlatformBackingStore(window)
 {
     m_cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
-
-    const QRect geo = window->geometry();
-    NSRect rect = NSMakeRect(geo.x(),geo.y(),geo.width(),geo.height());
-
     m_image = new QImage(window->geometry().size(),QImage::Format_ARGB32_Premultiplied);
 }
 
@@ -84,7 +71,6 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion &region, const QPo
     QCocoaAutoReleasePool pool;
 
     QRect geo = region.boundingRect();
-
     NSRect rect = NSMakeRect(geo.x(), geo.y(), geo.width(), geo.height());
     [m_cocoaWindow->m_contentView displayRect:rect];
 }
@@ -92,9 +78,20 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion &region, const QPo
 void QCocoaBackingStore::resize(const QSize &size, const QRegion &)
 {
     delete m_image;
-    m_image = new QImage(size,QImage::Format_ARGB32_Premultiplied);
-    NSSize newSize = NSMakeSize(size.width(),size.height());
+    m_image = new QImage(size, QImage::Format_ARGB32_Premultiplied);
     [static_cast<QNSView *>(m_cocoaWindow->m_contentView) setImage:m_image];
 }
 
+bool QCocoaBackingStore::scroll(const QRegion &area, int dx, int dy)
+{
+    extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset);
+    QPoint qpoint(dx, dy);
+    const QVector<QRect> qrects = area.rects();
+    for (int i = 0; i < qrects.count(); ++i) {
+        const QRect &qrect = qrects.at(i);
+        qt_scrollRectInImage(*m_image, qrect, qpoint);
+    }
+    return true;
+}
+
 QT_END_NAMESPACE