1 files changed, 12 insertions, 5 deletions
diff --git a/src/platformsupport/graphics/qrasterbackingstore.cpp b/src/platformsupport/graphics/qrasterbackingstore.cpp
index 3b1a87b8cd..325c98b93d 100644
--- a/src/platformsupport/graphics/qrasterbackingstore.cpp
+++ b/src/platformsupport/graphics/qrasterbackingstore.cpp
@@ -62,13 +62,20 @@ void QRasterBackingStore::resize(const QSize &size, const QRegion &staticContent
     if (m_image.size() == effectiveBufferSize)
         return;
 
-    QImage::Format format = window()->format().hasAlpha() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
-    m_image = QImage(effectiveBufferSize, format);
+    m_image = QImage(effectiveBufferSize, format());
     m_image.setDevicePixelRatio(windowDevicePixelRatio);
-    if (format == QImage::Format_ARGB32_Premultiplied)
+    if (m_image.format() == QImage::Format_ARGB32_Premultiplied)
         m_image.fill(Qt::transparent);
 }
 
+QImage::Format QRasterBackingStore::format() const
+{
+    if (window()->format().hasAlpha())
+        return QImage::Format_ARGB32_Premultiplied;
+    else
+        return QImage::Format_RGB32;
+}
+
 QPaintDevice *QRasterBackingStore::paintDevice()
 {
     return &m_image;
@@ -89,7 +96,7 @@ bool QRasterBackingStore::scroll(const QRegion &region, int dx, int dy)
     const qreal devicePixelRatio = m_image.devicePixelRatio();
     const QPoint delta(dx * devicePixelRatio, dy * devicePixelRatio);
 
-    foreach (const QRect &rect, region.rects())
+    for (const QRect &rect : region)
         qt_scrollRectInImage(m_image, QRect(rect.topLeft() * devicePixelRatio, rect.size() * devicePixelRatio), delta);
 
     return true;
@@ -103,7 +110,7 @@ void QRasterBackingStore::beginPaint(const QRegion &region)
     QPainter painter(&m_image);
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     const QColor blank = Qt::transparent;
-    foreach (const QRect &rect, region.rects())
+    for (const QRect &rect : region)
         painter.fillRect(rect, blank);
 }