Handle views with negative width/height

A view with a negative d->size() would get stuck in an infinite
loop.  Also make sure item layout/visibility is updated when
the view size changes.

Change-Id: I1f16a714ecebe1c4b71902c460e27fb0f1c4406f
Reviewed-by: Bea Lam <bea.lam@nokia.com>

1 files changed, 0 insertions, 16 deletions

diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index b29c61fdd7..5514d3ce5d 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -195,7 +195,6 @@ public:
     virtual void initializeCurrentItem();
 
     virtual void updateViewport();
-    virtual void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     virtual void fixupPosition();
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
     virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
@@ -790,21 +789,6 @@ void QQuickGridViewPrivate::initializeCurrentItem()
     }
 }
 
-void QQuickGridViewPrivate::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
-{
-    Q_Q(QQuickGridView);
-    QQuickItemViewPrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
-    if (!q->isComponentComplete())
-        return;
-    if (item == q) {
-        if (newGeometry.height() != oldGeometry.height() || newGeometry.width() != oldGeometry.width()) {
-            updateViewport();
-            forceLayout = true;
-            q->polish();
-        }
-    }
-}
-
 void QQuickGridViewPrivate::fixupPosition()
 {
     moveReason = Other;