2 files changed, 11 insertions, 2 deletions
diff --git a/src/layouts/qquickgridlayoutengine_p.h b/src/layouts/qquickgridlayoutengine_p.h
index 29317ffbb..8842d36a7 100644
--- a/src/layouts/qquickgridlayoutengine_p.h
+++ b/src/layouts/qquickgridlayoutengine_p.h
@@ -112,8 +112,16 @@ public:
     void setGeometry(const QRectF &rect)
     {
         const QRect r(rect.toRect());
+        const QSize newSize(r.size());
         m_item->setPosition(r.topLeft());
-        m_item->setSize(r.size());
+        QSizeF oldSize(m_item->width(), m_item->height());
+        if (newSize == oldSize) {
+            if (QQuickLayout *lay = qobject_cast<QQuickLayout *>(m_item))
+                if (lay->arrangementIsDirty())
+                    lay->rearrange(newSize);
+        } else {
+            m_item->setSize(newSize);
+        }
     }
 
     QQuickItem *layoutItem() const { return m_item; }
diff --git a/src/layouts/qquicklayout_p.h b/src/layouts/qquicklayout_p.h
index 0239739a6..76c197173 100644
--- a/src/layouts/qquicklayout_p.h
+++ b/src/layouts/qquicklayout_p.h
@@ -77,9 +77,10 @@ public:
     void componentComplete();
     virtual QSizeF sizeHint(Qt::SizeHint whichSizeHint) const = 0;
     virtual void invalidate(QQuickItem * childItem = 0);
+    virtual void rearrange(const QSizeF &);
+    bool arrangementIsDirty() const { return m_dirty; }
 protected:
     bool event(QEvent *e);
-    virtual void rearrange(const QSizeF &);
 
     enum Orientation {
         Vertical = 0,