Watch item geometry changes without using signal/slot connections.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index b96b8b8..ecaab80 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
@@ -67,8 +67,7 @@ void QmlGraphicsBasePositionerPrivate::watchChanges(QmlGraphicsItem *other)
 
     QmlGraphicsItemPrivate *otherPrivate = static_cast<QmlGraphicsItemPrivate*>(QGraphicsItemPrivate::get(other));
 
-    otherPrivate->connectToHeightChanged(q, prePosIdx);
-    otherPrivate->connectToWidthChanged(q, prePosIdx);
+    otherPrivate->addGeometryListener(this);
 
     otherPrivate->registerSiblingOrderNotification(this);
     watched << other;
@@ -81,8 +80,8 @@ void QmlGraphicsBasePositionerPrivate::unwatchChanges(QmlGraphicsItem* other)
     bool stillAlive = false; //Use the returns from disconnect to see if it was deleted or just reparented
     stillAlive |= QMetaObject::disconnect(other, visibleIdx, q, prePosIdx);
     stillAlive |= QMetaObject::disconnect(other, opacityIdx, q, prePosIdx);
-    stillAlive |= otherPrivate->disconnectFromHeightChanged(q, prePosIdx);
-    stillAlive |= otherPrivate->disconnectFromWidthChanged(q, prePosIdx);
+
+    otherPrivate->removeGeometryListener(this);
 
     if(stillAlive)
         otherPrivate->unregisterSiblingOrderNotification(this);