1 files changed, 12 insertions, 4 deletions

diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index 51c6b198e5..a999fb0aa2 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -525,13 +525,13 @@ void QXcbBackingStore::beginPaint(const QRegion &region)
     if (!m_image)
         return;
 
-    m_paintRegion = region;
-    m_image->preparePaint(m_paintRegion);
+    m_paintRegions.push(region);
+    m_image->preparePaint(region);
 
     if (m_image->hasAlpha()) {
         QPainter p(paintDevice());
         p.setCompositionMode(QPainter::CompositionMode_Source);
-        const QVector<QRect> rects = m_paintRegion.rects();
+        const QVector<QRect> rects = region.rects();
         const QColor blank = Qt::transparent;
         for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
             p.fillRect(*it, blank);
@@ -541,13 +541,21 @@ void QXcbBackingStore::beginPaint(const QRegion &region)
 
 void QXcbBackingStore::endPaint()
 {
+    if (Q_UNLIKELY(m_paintRegions.isEmpty())) {
+        qWarning("%s: paint regions empty!", Q_FUNC_INFO);
+        return;
+    }
+
+    const QRegion region = m_paintRegions.pop();
+    m_image->preparePaint(region);
+
     QXcbWindow *platformWindow = static_cast<QXcbWindow *>(window()->handle());
     if (!platformWindow || !platformWindow->imageNeedsRgbSwap())
         return;
 
     // Slow path: the paint device was m_rgbImage. Now copy with swapping red
     // and blue into m_image.
-    const QVector<QRect> rects = m_paintRegion.rects();
+    const QVector<QRect> rects = region.rects();
     if (rects.isEmpty())
         return;
     QPainter p(m_image->image());