QQuickItem: rename geometryChanged to geometryChange

This brings it in line with the existing convention in this and other
modules, where virtual handlers are named "nounChange"; e.g.
itemChange. Signals are named "nounChanged".

This also allows adding a geometryChanged signal, which would enable
users to listen to one signal for all changes to x/y/width/height.

[ChangeLog][QQuickItem] Renamed geometryChanged to geometryChange
in order to follow existing naming conventions and have consistency
with existing API, such as itemChange.

Task-number: QTBUG-82994
Change-Id: I0547358c796a0047982ccfbf2c38bab952e7a634
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

32 files changed, 70 insertions, 81 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index a15533418c..84f65d5241 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -594,11 +594,11 @@ void QQuickCanvasItem::sceneGraphInitialized()
         QMetaObject::invokeMethod(this, "requestPaint", Qt::QueuedConnection);
 }
 
-void QQuickCanvasItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickCanvasItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickCanvasItem);
 
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 
     // Due to indirect recursion, newGeometry may be outdated
     // after this call, so we use width and height instead.
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index 48663c2dad..1972a9a507 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -191,7 +191,7 @@ protected:
     void itemChange(QQuickItem::ItemChange, const QQuickItem::ItemChangeData &) override;
     void updatePolish() override;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void releaseResources() override;
     bool event(QEvent *event) override;
 private:
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index c91a5ef92b..00cd0a2d61 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1799,11 +1799,10 @@ void QQuickFlickablePrivate::viewportAxisMoved(AxisData &data, qreal minExtent,
     data.vTime = timeline.time();
 }
 
-void QQuickFlickable::geometryChanged(const QRectF &newGeometry,
-                             const QRectF &oldGeometry)
+void QQuickFlickable::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickFlickable);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 
     bool changed = false;
     if (newGeometry.width() != oldGeometry.width()) {
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index fe74425d57..d0fea9d5c5 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -303,8 +303,7 @@ protected:
     qreal vHeight() const;
     void componentComplete() override;
     virtual void viewportMoved(Qt::Orientations orient);
-    void geometryChanged(const QRectF &newGeometry,
-                         const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void mouseUngrabEvent() override;
     bool filterMouseEvent(QQuickItem *receiver, QMouseEvent *event);
 
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index e13ae3442e..41a56788fa 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -185,9 +185,9 @@ bool QQuickFramebufferObject::mirrorVertically() const
 /*!
  * \internal
  */
-void QQuickFramebufferObject::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickFramebufferObject::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 
     Q_D(QQuickFramebufferObject);
     if (newGeometry.size() != oldGeometry.size() && d->followsItemSize)
diff --git a/src/quick/items/qquickframebufferobject.h b/src/quick/items/qquickframebufferobject.h
index cbb6646dca..4bb335c6ed 100644
--- a/src/quick/items/qquickframebufferobject.h
+++ b/src/quick/items/qquickframebufferobject.h
@@ -89,7 +89,7 @@ public:
     void releaseResources() override;
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 protected:
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 7ca5b0c34c..32cc5edf40 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -2153,7 +2153,7 @@ void QQuickGridView::keyPressEvent(QKeyEvent *event)
     QQuickItemView::keyPressEvent(event);
 }
 
-void QQuickGridView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickGridView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickGridView);
     d->resetColumns();
@@ -2167,7 +2167,7 @@ void QQuickGridView::geometryChanged(const QRectF &newGeometry, const QRectF &ol
         QQuickFlickable::setContentY(d->contentYForPosition(d->position()));
     }
 
-    QQuickItemView::geometryChanged(newGeometry, oldGeometry);
+    QQuickItemView::geometryChange(newGeometry, oldGeometry);
 }
 
 void QQuickGridView::initItem(int index, QObject *obj)
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index 7187eb7816..8aa7f0be12 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -122,7 +122,7 @@ Q_SIGNALS:
 protected:
     void viewportMoved(Qt::Orientations) override;
     void keyPressEvent(QKeyEvent *) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void initItem(int index, QObject *item) override;
 };
 
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 1882ec8997..c58454362c 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -628,9 +628,9 @@ void QQuickImage::updatePaintedGeometry()
     emit paintedGeometryChanged();
 }
 
-void QQuickImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickImage::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickImageBase::geometryChanged(newGeometry, oldGeometry);
+    QQuickImageBase::geometryChange(newGeometry, oldGeometry);
     if (newGeometry.size() != oldGeometry.size())
         updatePaintedGeometry();
 }
diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 1119f20e45..b8678be5b7 100644
--- a/src/quick/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -127,7 +127,7 @@ protected:
     void updatePaintedGeometry();
     void releaseResources() override;
 
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
 private:
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index cb1d3e224e..3280ae861f 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -3711,15 +3711,16 @@ void QQuickItem::setClip(bool c)
     emit clipChanged(c);
 }
 
-
 /*!
+  \since 6.0
+
   This function is called to handle this item's changes in
   geometry from \a oldGeometry to \a newGeometry. If the two
   geometries are the same, it doesn't do anything.
 
   Derived classes must call the base class method within their implementation.
  */
-void QQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickItem);
 
@@ -6618,8 +6619,8 @@ void QQuickItem::setX(qreal v)
 
     d->dirty(QQuickItemPrivate::Position);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(oldx, d->y, d->width, d->height));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(oldx, d->y, d->width, d->height));
 }
 
 void QQuickItem::setY(qreal v)
@@ -6635,8 +6636,8 @@ void QQuickItem::setY(qreal v)
 
     d->dirty(QQuickItemPrivate::Position);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, oldy, d->width, d->height));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, oldy, d->width, d->height));
 }
 
 /*!
@@ -6656,8 +6657,8 @@ void QQuickItem::setPosition(const QPointF &pos)
 
     d->dirty(QQuickItemPrivate::Position);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(oldx, oldy, d->width, d->height));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(oldx, oldy, d->width, d->height));
 }
 
 /*!
@@ -6686,8 +6687,8 @@ void QQuickItem::setWidth(qreal w)
 
     d->dirty(QQuickItemPrivate::Size);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, d->y, oldWidth, d->height));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, d->y, oldWidth, d->height));
 }
 
 void QQuickItem::resetWidth()
@@ -6810,8 +6811,8 @@ void QQuickItem::setImplicitWidth(qreal w)
 
     d->dirty(QQuickItemPrivate::Size);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, d->y, oldWidth, d->height));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, d->y, oldWidth, d->height));
 
     if (changed)
         d->implicitWidthChanged();
@@ -6852,8 +6853,8 @@ void QQuickItem::setHeight(qreal h)
 
     d->dirty(QQuickItemPrivate::Size);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, d->y, d->width, oldHeight));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, d->y, d->width, oldHeight));
 }
 
 void QQuickItem::resetHeight()
@@ -6906,8 +6907,8 @@ void QQuickItem::setImplicitHeight(qreal h)
 
     d->dirty(QQuickItemPrivate::Size);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, d->y, d->width, oldHeight));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, d->y, d->width, oldHeight));
 
     if (changed)
         d->implicitHeightChanged();
@@ -6951,8 +6952,8 @@ void QQuickItem::setImplicitSize(qreal w, qreal h)
 
     d->dirty(QQuickItemPrivate::Size);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, d->y, oldWidth, oldHeight));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, d->y, oldWidth, oldHeight));
 
     if (!wDone && wChanged)
         d->implicitWidthChanged();
@@ -7007,8 +7008,8 @@ void QQuickItem::setSize(const QSizeF &size)
 
     d->dirty(QQuickItemPrivate::Size);
 
-    geometryChanged(QRectF(d->x, d->y, d->width, d->height),
-                    QRectF(d->x, d->y, oldWidth, oldHeight));
+    geometryChange(QRectF(d->x, d->y, d->width, d->height),
+                   QRectF(d->x, d->y, oldWidth, oldHeight));
 }
 
 /*!
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 801dfe5edd..813a6244dd 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -409,6 +409,7 @@ protected:
 
     bool isComponentComplete() const;
     virtual void itemChange(ItemChange, const ItemChangeData &);
+    virtual void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry);
 
 #if QT_CONFIG(im)
     void updateInputMethod(Qt::InputMethodQueries queries = Qt::ImQueryInput);
@@ -450,9 +451,6 @@ protected:
     virtual bool childMouseEventFilter(QQuickItem *, QEvent *);
     virtual void windowDeactivateEvent();
 
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
     virtual void releaseResources();
     virtual void updatePolish();
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 7fb392233e..d75247afdd 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -1366,13 +1366,13 @@ void QQuickItemView::trackedPositionChanged()
     }
 }
 
-void QQuickItemView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickItemView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickItemView);
     d->markExtentsDirty();
     if (isComponentComplete() && (d->isValid() || !d->visibleItems.isEmpty()))
         d->forceLayoutPolish();
-    QQuickFlickable::geometryChanged(newGeometry, oldGeometry);
+    QQuickFlickable::geometryChange(newGeometry, oldGeometry);
 }
 
 qreal QQuickItemView::minYExtent() const
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index d8d5678ad0..f05618579a 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -291,7 +291,7 @@ Q_SIGNALS:
 protected:
     void updatePolish() override;
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     qreal minYExtent() const override;
     qreal maxYExtent() const override;
     qreal minXExtent() const override;
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index cf63b6229b..54e714351e 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -3380,7 +3380,7 @@ void QQuickListView::keyPressEvent(QKeyEvent *event)
     QQuickItemView::keyPressEvent(event);
 }
 
-void QQuickListView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickListView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickListView);
 
@@ -3399,7 +3399,7 @@ void QQuickListView::geometryChanged(const QRectF &newGeometry, const QRectF &ol
         qreal dy = newGeometry.height() - oldGeometry.height();
         setContentY(contentY() - dy);
     }
-    QQuickItemView::geometryChanged(newGeometry, oldGeometry);
+    QQuickItemView::geometryChange(newGeometry, oldGeometry);
 }
 
 void QQuickListView::initItem(int index, QObject *object)
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index 5e3dbac3a7..be91dafaca 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -201,7 +201,7 @@ Q_SIGNALS:
 protected:
     void viewportMoved(Qt::Orientations orient) override;
     void keyPressEvent(QKeyEvent *) override;
-    void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry,const QRectF &oldGeometry) override;
     void initItem(int index, QObject *item) override;
     qreal maxYExtent() const override;
     qreal maxXExtent() const override;
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index bf868fd449..43b70b23c2 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -948,13 +948,13 @@ QObject *QQuickLoader::item() const
     return d->object;
 }
 
-void QQuickLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickLoader::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickLoader);
     if (newGeometry != oldGeometry) {
         d->_q_updateSize();
     }
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 }
 
 QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV4Function *args)
diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h
index 8f061d3139..dbe920c4f8 100644
--- a/src/quick/items/qquickloader_p.h
+++ b/src/quick/items/qquickloader_p.h
@@ -107,7 +107,7 @@ Q_SIGNALS:
     void asynchronousChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void componentComplete() override;
     void itemChange(ItemChange change, const ItemChangeData &value) override;
 
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 59615464c8..4ac80def33 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -1044,11 +1044,10 @@ void QQuickMouseArea::windowDeactivateEvent()
     QQuickItem::windowDeactivateEvent();
 }
 
-void QQuickMouseArea::geometryChanged(const QRectF &newGeometry,
-                                            const QRectF &oldGeometry)
+void QQuickMouseArea::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickMouseArea);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 
     if (d->lastScenePos.isNull)
         d->lastScenePos = mapToScene(d->lastPos);
diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h
index 02ad56fd79..c368f43b30 100644
--- a/src/quick/items/qquickmousearea_p.h
+++ b/src/quick/items/qquickmousearea_p.h
@@ -182,8 +182,7 @@ protected:
     void timerEvent(QTimerEvent *event) override;
     void windowDeactivateEvent() override;
 
-    void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void itemChange(ItemChange change, const ItemChangeData& value) override;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 0692a1da42..5f767bf1f5 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -658,10 +658,9 @@ bool QQuickPinchArea::childMouseEventFilter(QQuickItem *i, QEvent *e)
     return QQuickItem::childMouseEventFilter(i, e);
 }
 
-void QQuickPinchArea::geometryChanged(const QRectF &newGeometry,
-                                            const QRectF &oldGeometry)
+void QQuickPinchArea::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 }
 
 void QQuickPinchArea::itemChange(ItemChange change, const ItemChangeData &value)
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 27f895612a..b488f436df 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -295,8 +295,7 @@ protected:
     bool childMouseEventFilter(QQuickItem *i, QEvent *e) override;
     void touchEvent(QTouchEvent *event) override;
 
-    void geometryChanged(const QRectF &newGeometry,
-                         const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void itemChange(ItemChange change, const ItemChangeData& value) override;
     bool event(QEvent *) override;
 
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index e71e6dc698..dee997b22d 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -615,17 +615,17 @@ bool QQuickShaderEffect::event(QEvent *e)
     return QQuickItem::event(e);
 }
 
-void QQuickShaderEffect::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickShaderEffect::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
 #if QT_CONFIG(opengl)
     if (m_glImpl) {
         m_glImpl->handleGeometryChanged(newGeometry, oldGeometry);
-        QQuickItem::geometryChanged(newGeometry, oldGeometry);
+        QQuickItem::geometryChange(newGeometry, oldGeometry);
         return;
     }
 #endif
     m_impl->handleGeometryChanged(newGeometry, oldGeometry);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 }
 
 QSGNode *QQuickShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 16eb252add..b3d5473ae4 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -136,7 +136,7 @@ Q_SIGNALS:
 
 protected:
     bool event(QEvent *e) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override;
     void componentComplete() override;
     void itemChange(ItemChange change, const ItemChangeData &value) override;
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 4dd03cb506..d830f5a66d 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -3322,10 +3322,10 @@ QQuickTableViewAttached *QQuickTableView::qmlAttachedProperties(QObject *obj)
     return new QQuickTableViewAttached(obj);
 }
 
-void QQuickTableView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTableView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTableView);
-    QQuickFlickable::geometryChanged(newGeometry, oldGeometry);
+    QQuickFlickable::geometryChange(newGeometry, oldGeometry);
 
     if (d->tableModel) {
         // When the view changes size, we force the pool to
diff --git a/src/quick/items/qquicktableview_p.h b/src/quick/items/qquicktableview_p.h
index 2682f4306d..64d202dc85 100644
--- a/src/quick/items/qquicktableview_p.h
+++ b/src/quick/items/qquicktableview_p.h
@@ -161,7 +161,7 @@ Q_SIGNALS:
     Q_REVISION(6, 0) void bottomRowChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void viewportMoved(Qt::Orientations orientation) override;
     void componentComplete() override;
 
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 74cae71616..af8a0c476e 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2363,11 +2363,11 @@ QRectF QQuickText::clipRect() const
 }
 
 /*! \internal */
-void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickText::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickText);
     if (d->text.isEmpty()) {
-        QQuickItem::geometryChanged(newGeometry, oldGeometry);
+        QQuickItem::geometryChange(newGeometry, oldGeometry);
         return;
     }
 
@@ -2436,7 +2436,7 @@ void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeo
     }
 
 geomChangeDone:
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 }
 
 void QQuickText::triggerPreprocess()
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 6c04f63ca9..30e64f7185 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -306,8 +306,7 @@ protected:
     void mousePressEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
     void itemChange(ItemChange change, const ItemChangeData &value) override;
-    void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     void updatePolish() override;
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 6726c68d0c..5494b73784 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -1443,8 +1443,7 @@ void QQuickTextEdit::setInputMethodHints(Qt::InputMethodHints hints)
 #endif // im
 }
 
-void QQuickTextEdit::geometryChanged(const QRectF &newGeometry,
-                                  const QRectF &oldGeometry)
+void QQuickTextEdit::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTextEdit);
     if (!d->inLayout && ((newGeometry.width() != oldGeometry.width() && widthValid())
@@ -1453,7 +1452,7 @@ void QQuickTextEdit::geometryChanged(const QRectF &newGeometry,
         updateWholeDocument();
         moveCursorDelegate();
     }
-    QQuickImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickImplicitSizeItem::geometryChange(newGeometry, oldGeometry);
 
 }
 
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index 37610ed7e6..41245f904e 100644
--- a/src/quick/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -391,8 +391,7 @@ private:
 protected:
     QQuickTextEdit(QQuickTextEditPrivate &dd, QQuickItem *parent = nullptr);
 
-    void geometryChanged(const QRectF &newGeometry,
-                         const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     bool event(QEvent *) override;
     void keyPressEvent(QKeyEvent *) override;
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 6b941f3114..b1c1ad58e5 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1724,8 +1724,8 @@ bool QQuickTextInput::event(QEvent* ev)
     return QQuickImplicitSizeItem::event(ev);
 }
 
-void QQuickTextInput::geometryChanged(const QRectF &newGeometry,
-                                  const QRectF &oldGeometry)
+void QQuickTextInput::geometryChange(const QRectF &newGeometry,
+                                     const QRectF &oldGeometry)
 {
     Q_D(QQuickTextInput);
     if (!d->inLayout) {
@@ -1735,7 +1735,7 @@ void QQuickTextInput::geometryChanged(const QRectF &newGeometry,
             d->updateBaselineOffset();
         updateCursorRectangle();
     }
-    QQuickImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickImplicitSizeItem::geometryChange(newGeometry, oldGeometry);
 }
 
 void QQuickTextInputPrivate::ensureVisible(int position, int preeditCursor, int preeditLength)
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index 234ebc2a0a..ee06eb88e7 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -367,8 +367,7 @@ private:
 protected:
     QQuickTextInput(QQuickTextInputPrivate &dd, QQuickItem *parent = nullptr);
 
-    void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;