QML: Pass the kind of geometry change around

This prevents re-calculation of what actually changed, and removes the
now unused parameter newGeometry. Other than this change calculation,
the only place where oldGeometry was used is
QQuickListViewPrivate::itemGeometryChanged. To get rid of oldGeometry
too, QQuickListViewPrivate now stores the current (i.e. last known)
geometry, and updates it in itemGeometryChanged.

Change-Id: I8a5286d08a04132c9a4c81de7ce221f5676946e6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index 9089e3b422..62133d6475 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -2700,7 +2700,11 @@ struct TestListener : public QQuickItemChangeListener
 {
     TestListener(bool remove = false) : remove(remove) { reset(); }
 
-    void itemGeometryChanged(QQuickItem *, const QRectF &newGeometry, const QRectF &) override { ++itemGeometryChanges; value = newGeometry; }
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange, const QRectF &) override
+    {
+        ++itemGeometryChanges;
+        value = QRectF(item->x(), item->y(), item->width(), item->height());
+    }
     void itemSiblingOrderChanged(QQuickItem *) override { ++itemSiblingOrderChanges; }
     void itemVisibilityChanged(QQuickItem *) override { ++itemVisibilityChanges; }
     void itemOpacityChanged(QQuickItem *) override { ++itemOpacityChanges; }