From e3a7011a9d687609653a31f6a93024026902e67c Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Tue, 24 Mar 2020 10:34:56 +0100
Subject: Adapt to geometryChanged => geometryChange renaming

Task-number: QTBUG-82994
Change-Id: Iaf530d2a6f4dc92641d0c10e16e7b931f90646ac
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/imports/calendar/qquickdayofweekrow.cpp     | 4 ++--
 src/imports/calendar/qquickdayofweekrow_p.h     | 2 +-
 src/imports/calendar/qquickmonthgrid.cpp        | 4 ++--
 src/imports/calendar/qquickmonthgrid_p.h        | 2 +-
 src/imports/calendar/qquickweeknumbercolumn.cpp | 4 ++--
 src/imports/calendar/qquickweeknumbercolumn_p.h | 2 +-
 src/quickcontrols2/qquickiconimage.cpp          | 6 +++---
 src/quickcontrols2/qquickiconimage_p.h          | 2 +-
 src/quickcontrols2/qquickiconlabel.cpp          | 4 ++--
 src/quickcontrols2/qquickiconlabel_p.h          | 2 +-
 src/quickcontrols2/qquickitemgroup.cpp          | 4 ++--
 src/quickcontrols2/qquickitemgroup_p.h          | 2 +-
 src/quickcontrols2/qquicktumblerview.cpp        | 6 +++---
 src/quickcontrols2/qquicktumblerview_p.h        | 2 +-
 src/quicktemplates2/qquickcontrol.cpp           | 4 ++--
 src/quicktemplates2/qquickcontrol_p.h           | 2 +-
 src/quicktemplates2/qquickdialogbuttonbox.cpp   | 4 ++--
 src/quicktemplates2/qquickdialogbuttonbox_p.h   | 2 +-
 src/quicktemplates2/qquickdrawer.cpp            | 4 ++--
 src/quicktemplates2/qquickdrawer_p.h            | 2 +-
 src/quicktemplates2/qquicklabel.cpp             | 4 ++--
 src/quicktemplates2/qquicklabel_p.h             | 2 +-
 src/quicktemplates2/qquickmenubaritem.cpp       | 4 ++--
 src/quicktemplates2/qquickmenubaritem_p.h       | 2 +-
 src/quicktemplates2/qquickoverlay.cpp           | 4 ++--
 src/quicktemplates2/qquickoverlay_p.h           | 2 +-
 src/quicktemplates2/qquickpopup.cpp             | 2 +-
 src/quicktemplates2/qquickpopup_p.h             | 2 +-
 src/quicktemplates2/qquickpopupitem.cpp         | 6 +++---
 src/quicktemplates2/qquickpopupitem_p_p.h       | 2 +-
 src/quicktemplates2/qquickroundbutton.cpp       | 4 ++--
 src/quicktemplates2/qquickroundbutton_p.h       | 2 +-
 src/quicktemplates2/qquicksplitview.cpp         | 4 ++--
 src/quicktemplates2/qquicksplitview_p.h         | 2 +-
 src/quicktemplates2/qquickstackview.cpp         | 4 ++--
 src/quicktemplates2/qquickstackview_p.h         | 2 +-
 src/quicktemplates2/qquickswipedelegate.cpp     | 4 ++--
 src/quicktemplates2/qquickswipedelegate_p.h     | 2 +-
 src/quicktemplates2/qquickswipeview.cpp         | 4 ++--
 src/quicktemplates2/qquickswipeview_p.h         | 2 +-
 src/quicktemplates2/qquicktabbar.cpp            | 4 ++--
 src/quicktemplates2/qquicktabbar_p.h            | 2 +-
 src/quicktemplates2/qquicktextarea.cpp          | 4 ++--
 src/quicktemplates2/qquicktextarea_p.h          | 2 +-
 src/quicktemplates2/qquicktextfield.cpp         | 4 ++--
 src/quicktemplates2/qquicktextfield_p.h         | 2 +-
 src/quicktemplates2/qquicktumbler.cpp           | 4 ++--
 src/quicktemplates2/qquicktumbler_p.h           | 2 +-
 48 files changed, 74 insertions(+), 74 deletions(-)

(limited to 'src')

diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp
index d5432f8e..f7439389 100644
--- a/src/imports/calendar/qquickdayofweekrow.cpp
+++ b/src/imports/calendar/qquickdayofweekrow.cpp
@@ -167,10 +167,10 @@ void QQuickDayOfWeekRow::componentComplete()
     d->resizeItems();
 }
 
-void QQuickDayOfWeekRow::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickDayOfWeekRow::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickDayOfWeekRow);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
     if (isComponentComplete())
         d->resizeItems();
 }
diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h
index 06b899e0..4defcecb 100644
--- a/src/imports/calendar/qquickdayofweekrow_p.h
+++ b/src/imports/calendar/qquickdayofweekrow_p.h
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 protected:
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
     void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
 
diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp
index 966b0c60..d3380404 100644
--- a/src/imports/calendar/qquickmonthgrid.cpp
+++ b/src/imports/calendar/qquickmonthgrid.cpp
@@ -406,10 +406,10 @@ void QQuickMonthGrid::componentComplete()
     d->resizeItems();
 }
 
-void QQuickMonthGrid::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickMonthGrid::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickMonthGrid);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
     if (isComponentComplete())
         d->resizeItems();
 }
diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h
index b85e0921..d8067415 100644
--- a/src/imports/calendar/qquickmonthgrid_p.h
+++ b/src/imports/calendar/qquickmonthgrid_p.h
@@ -96,7 +96,7 @@ Q_SIGNALS:
 
 protected:
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
     void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
     void updatePolish() override;
diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp
index 6c661274..5fa7b4fb 100644
--- a/src/imports/calendar/qquickweeknumbercolumn.cpp
+++ b/src/imports/calendar/qquickweeknumbercolumn.cpp
@@ -235,10 +235,10 @@ void QQuickWeekNumberColumn::componentComplete()
     d->resizeItems();
 }
 
-void QQuickWeekNumberColumn::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickWeekNumberColumn::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickWeekNumberColumn);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
     if (isComponentComplete())
         d->resizeItems();
 }
diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h
index 30f267ca..a6cce141 100644
--- a/src/imports/calendar/qquickweeknumbercolumn_p.h
+++ b/src/imports/calendar/qquickweeknumbercolumn_p.h
@@ -86,7 +86,7 @@ Q_SIGNALS:
 
 protected:
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
     void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
 
diff --git a/src/quickcontrols2/qquickiconimage.cpp b/src/quickcontrols2/qquickiconimage.cpp
index d86afd7f..1fc3abfc 100644
--- a/src/quickcontrols2/qquickiconimage.cpp
+++ b/src/quickcontrols2/qquickiconimage.cpp
@@ -55,7 +55,7 @@ bool QQuickIconImagePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio
 void QQuickIconImagePrivate::updateIcon()
 {
     Q_Q(QQuickIconImage);
-    // Both geometryChanged() and QQuickImageBase::sourceSizeChanged()
+    // Both geometryChange() and QQuickImageBase::sourceSizeChanged()
     // (which we connect to updateIcon() in the constructor) can be called as a result
     // of updateIcon() changing the various sizes, so we must check that we're not recursing.
     if (updatingIcon)
@@ -176,10 +176,10 @@ void QQuickIconImage::componentComplete()
     QObjectPrivate::connect(this, &QQuickImageBase::sourceSizeChanged, d, &QQuickIconImagePrivate::updateIcon);
 }
 
-void QQuickIconImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickIconImage::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickIconImage);
-    QQuickImage::geometryChanged(newGeometry, oldGeometry);
+    QQuickImage::geometryChange(newGeometry, oldGeometry);
     if (isComponentComplete() && newGeometry.size() != oldGeometry.size())
         d->updateIcon();
 }
diff --git a/src/quickcontrols2/qquickiconimage_p.h b/src/quickcontrols2/qquickiconimage_p.h
index b1af767e..0aac08e6 100644
--- a/src/quickcontrols2/qquickiconimage_p.h
+++ b/src/quickcontrols2/qquickiconimage_p.h
@@ -78,7 +78,7 @@ Q_SIGNALS:
 
 protected:
     void componentComplete() 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;
     void pixmapChange() override;
 
diff --git a/src/quickcontrols2/qquickiconlabel.cpp b/src/quickcontrols2/qquickiconlabel.cpp
index 536b3c1b..d76da28f 100644
--- a/src/quickcontrols2/qquickiconlabel.cpp
+++ b/src/quickcontrols2/qquickiconlabel.cpp
@@ -632,10 +632,10 @@ void QQuickIconLabel::componentComplete()
     d->layout();
 }
 
-void QQuickIconLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickIconLabel::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickIconLabel);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
     d->layout();
 }
 
diff --git a/src/quickcontrols2/qquickiconlabel_p.h b/src/quickcontrols2/qquickiconlabel_p.h
index 75b77064..ecf2336e 100644
--- a/src/quickcontrols2/qquickiconlabel_p.h
+++ b/src/quickcontrols2/qquickiconlabel_p.h
@@ -126,7 +126,7 @@ public:
 
 protected:
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 private:
     Q_DISABLE_COPY(QQuickIconLabel)
diff --git a/src/quickcontrols2/qquickitemgroup.cpp b/src/quickcontrols2/qquickitemgroup.cpp
index 1396a871..c4307001 100644
--- a/src/quickcontrols2/qquickitemgroup.cpp
+++ b/src/quickcontrols2/qquickitemgroup.cpp
@@ -98,9 +98,9 @@ void QQuickItemGroup::itemChange(ItemChange change, const ItemChangeData &data)
     }
 }
 
-void QQuickItemGroup::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickItemGroup::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickImplicitSizeItem::geometryChange(newGeometry, oldGeometry);
 
     if (newGeometry.size() != oldGeometry.size()) {
         const auto children = childItems();
diff --git a/src/quickcontrols2/qquickitemgroup_p.h b/src/quickcontrols2/qquickitemgroup_p.h
index af062d57..ab6306b4 100644
--- a/src/quickcontrols2/qquickitemgroup_p.h
+++ b/src/quickcontrols2/qquickitemgroup_p.h
@@ -70,7 +70,7 @@ protected:
     void updateImplicitSize();
 
     void itemChange(ItemChange change, const ItemChangeData &data) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     void itemImplicitWidthChanged(QQuickItem *item) override;
     void itemImplicitHeightChanged(QQuickItem *item) override;
diff --git a/src/quickcontrols2/qquicktumblerview.cpp b/src/quickcontrols2/qquicktumblerview.cpp
index eaa58032..911e2ae8 100644
--- a/src/quickcontrols2/qquicktumblerview.cpp
+++ b/src/quickcontrols2/qquicktumblerview.cpp
@@ -210,7 +210,7 @@ void QQuickTumblerView::updateView()
 
     theView->setSize(QSizeF(width(), height()));
 
-    // Can be called in geometryChanged when it might not have a parent item yet.
+    // Can be called in geometryChange when it might not have a parent item yet.
     if (!m_tumbler)
         return;
 
@@ -274,9 +274,9 @@ void QQuickTumblerView::updateModel()
     }
 }
 
-void QQuickTumblerView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTumblerView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
     updateView();
 }
 
diff --git a/src/quickcontrols2/qquicktumblerview_p.h b/src/quickcontrols2/qquicktumblerview_p.h
index 138af1b4..4e67e69b 100644
--- a/src/quickcontrols2/qquicktumblerview_p.h
+++ b/src/quickcontrols2/qquicktumblerview_p.h
@@ -84,7 +84,7 @@ Q_SIGNALS:
     void pathChanged();
 
 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 &data) override;
 
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index a29eefd1..6b3580de 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -2050,10 +2050,10 @@ void QQuickControl::wheelEvent(QWheelEvent *event)
 }
 #endif
 
-void QQuickControl::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickControl::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickControl);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
     d->resizeBackground();
     d->resizeContent();
     if (!qFuzzyCompare(newGeometry.width(), oldGeometry.width()))
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h
index e0837a0d..6d88a8b2 100644
--- a/src/quicktemplates2/qquickcontrol_p.h
+++ b/src/quicktemplates2/qquickcontrol_p.h
@@ -255,7 +255,7 @@ protected:
     void wheelEvent(QWheelEvent *event) override;
 #endif
 
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     virtual void fontChange(const QFont &newFont, const QFont &oldFont);
 #if QT_CONFIG(quicktemplates2_hover)
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
index f3dd2da1..651f78dc 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -736,10 +736,10 @@ void QQuickDialogButtonBox::componentComplete()
     qApp->installEventFilter(new LanguageEventFilter(d));
 }
 
-void QQuickDialogButtonBox::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickDialogButtonBox::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickDialogButtonBox);
-    QQuickContainer::geometryChanged(newGeometry, oldGeometry);
+    QQuickContainer::geometryChange(newGeometry, oldGeometry);
     d->updateLayout();
 }
 
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h
index 51ae473f..f54ecdca 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h
@@ -122,7 +122,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;
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
     bool isContent(QQuickItem *item) const override;
     void itemAdded(int index, QQuickItem *item) override;
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index cf2f7558..b6d70dd7 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -799,10 +799,10 @@ void QQuickDrawer::touchEvent(QTouchEvent *event)
 }
 #endif
 
-void QQuickDrawer::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickDrawer::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickDrawer);
-    QQuickPopup::geometryChanged(newGeometry, oldGeometry);
+    QQuickPopup::geometryChange(newGeometry, oldGeometry);
     d->resizeOverlay();
 }
 
diff --git a/src/quicktemplates2/qquickdrawer_p.h b/src/quicktemplates2/qquickdrawer_p.h
index f0fc1b4c..8e246fcc 100644
--- a/src/quicktemplates2/qquickdrawer_p.h
+++ b/src/quicktemplates2/qquickdrawer_p.h
@@ -95,7 +95,7 @@ protected:
     void touchEvent(QTouchEvent *event) override;
 #endif
 
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 private:
     Q_DISABLE_COPY(QQuickDrawer)
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index afe18f18..f8c1c489 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -577,10 +577,10 @@ void QQuickLabel::itemChange(QQuickItem::ItemChange change, const QQuickItem::It
     }
 }
 
-void QQuickLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickLabel::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickLabel);
-    QQuickText::geometryChanged(newGeometry, oldGeometry);
+    QQuickText::geometryChange(newGeometry, oldGeometry);
     d->resizeBackground();
 }
 
diff --git a/src/quicktemplates2/qquicklabel_p.h b/src/quicktemplates2/qquicklabel_p.h
index e7d39071..c3e4fb45 100644
--- a/src/quicktemplates2/qquicklabel_p.h
+++ b/src/quicktemplates2/qquicklabel_p.h
@@ -116,7 +116,7 @@ protected:
     void componentComplete() 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;
     virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset);
 
 private:
diff --git a/src/quicktemplates2/qquickmenubaritem.cpp b/src/quicktemplates2/qquickmenubaritem.cpp
index 1210a050..de43adb6 100644
--- a/src/quicktemplates2/qquickmenubaritem.cpp
+++ b/src/quicktemplates2/qquickmenubaritem.cpp
@@ -162,10 +162,10 @@ void QQuickMenuBarItem::setHighlighted(bool highlighted)
     emit highlightedChanged();
 }
 
-void QQuickMenuBarItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickMenuBarItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickMenuBarItem);
-    QQuickAbstractButton::geometryChanged(newGeometry, oldGeometry);
+    QQuickAbstractButton::geometryChange(newGeometry, oldGeometry);
     if (d->menu)
         d->menu->setY(newGeometry.height());
 }
diff --git a/src/quicktemplates2/qquickmenubaritem_p.h b/src/quicktemplates2/qquickmenubaritem_p.h
index efbed1ac..b58ef1c4 100644
--- a/src/quicktemplates2/qquickmenubaritem_p.h
+++ b/src/quicktemplates2/qquickmenubaritem_p.h
@@ -81,7 +81,7 @@ Q_SIGNALS:
     void highlightedChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     QFont defaultFont() const override;
 
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index e9f8801d..6eb0d0e8 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -400,10 +400,10 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data)
         setVisible(!d->allDrawers.isEmpty() || !childItems().isEmpty());
 }
 
-void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickOverlay::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickOverlay);
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
     for (QQuickPopup *popup : qAsConst(d->allPopups))
         QQuickPopupPrivate::get(popup)->resizeOverlay();
 }
diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h
index 1d238163..20ec21a1 100644
--- a/src/quicktemplates2/qquickoverlay_p.h
+++ b/src/quicktemplates2/qquickoverlay_p.h
@@ -86,7 +86,7 @@ Q_SIGNALS:
 
 protected:
     void itemChange(ItemChange change, const ItemChangeData &data) override;
-    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;
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 664fc265..bafa3110 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -2553,7 +2553,7 @@ void QQuickPopup::fontChange(const QFont &newFont, const QFont &oldFont)
     emit fontChanged();
 }
 
-void QQuickPopup::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickPopup::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickPopup);
     d->reposition();
diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h
index 5a4792d6..d5e2f1e9 100644
--- a/src/quicktemplates2/qquickpopup_p.h
+++ b/src/quicktemplates2/qquickpopup_p.h
@@ -438,7 +438,7 @@ protected:
     virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem);
     virtual void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize);
     virtual void fontChange(const QFont &newFont, const QFont &oldFont);
-    virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+    virtual void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry);
     virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale);
     virtual void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data);
     virtual void marginsChange(const QMarginsF &newMargins, const QMarginsF &oldMargins);
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
index f300298a..9390f665 100644
--- a/src/quicktemplates2/qquickpopupitem.cpp
+++ b/src/quicktemplates2/qquickpopupitem.cpp
@@ -330,11 +330,11 @@ void QQuickPopupItem::fontChange(const QFont &newFont, const QFont &oldFont)
     d->popup->fontChange(newFont, oldFont);
 }
 
-void QQuickPopupItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickPopupItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickPopupItem);
-    QQuickPage::geometryChanged(newGeometry, oldGeometry);
-    d->popup->geometryChanged(newGeometry, oldGeometry);
+    QQuickPage::geometryChange(newGeometry, oldGeometry);
+    d->popup->geometryChange(newGeometry, oldGeometry);
 }
 
 void QQuickPopupItem::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
diff --git a/src/quicktemplates2/qquickpopupitem_p_p.h b/src/quicktemplates2/qquickpopupitem_p_p.h
index ab20d16c..e4ef6d9c 100644
--- a/src/quicktemplates2/qquickpopupitem_p_p.h
+++ b/src/quicktemplates2/qquickpopupitem_p_p.h
@@ -91,7 +91,7 @@ protected:
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
     void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override;
     void fontChange(const QFont &newFont, const QFont &oldFont) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
     void mirrorChange() override;
     void itemChange(ItemChange change, const ItemChangeData &data) override;
diff --git a/src/quicktemplates2/qquickroundbutton.cpp b/src/quicktemplates2/qquickroundbutton.cpp
index 10ebbcc1..06230673 100644
--- a/src/quicktemplates2/qquickroundbutton.cpp
+++ b/src/quicktemplates2/qquickroundbutton.cpp
@@ -124,10 +124,10 @@ void QQuickRoundButton::resetRadius()
     d->setRadius();
 }
 
-void QQuickRoundButton::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickRoundButton::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickRoundButton);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
     if (!d->explicitRadius)
         d->setRadius();
 }
diff --git a/src/quicktemplates2/qquickroundbutton_p.h b/src/quicktemplates2/qquickroundbutton_p.h
index de6f1440..dc5e432a 100644
--- a/src/quicktemplates2/qquickroundbutton_p.h
+++ b/src/quicktemplates2/qquickroundbutton_p.h
@@ -70,7 +70,7 @@ Q_SIGNALS:
     void radiusChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 private:
     Q_DISABLE_COPY(QQuickRoundButton)
diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp
index a3566c56..a1016792 100644
--- a/src/quicktemplates2/qquicksplitview.cpp
+++ b/src/quicktemplates2/qquicksplitview.cpp
@@ -1407,10 +1407,10 @@ bool QQuickSplitView::childMouseEventFilter(QQuickItem *item, QEvent *event)
     return false;
 }
 
-void QQuickSplitView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickSplitView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickSplitView);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
     d->resizeHandles();
     d->requestLayout();
 }
diff --git a/src/quicktemplates2/qquicksplitview_p.h b/src/quicktemplates2/qquicksplitview_p.h
index 2fa15588..06dc1a55 100644
--- a/src/quicktemplates2/qquicksplitview_p.h
+++ b/src/quicktemplates2/qquicksplitview_p.h
@@ -100,7 +100,7 @@ protected:
     void componentComplete() override;
     void hoverMoveEvent(QHoverEvent *event) override;
     bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     void itemAdded(int index, QQuickItem *item) override;
     void itemMoved(int index, QQuickItem *item) override;
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index 1d7bb91f..6455731d 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -1146,9 +1146,9 @@ void QQuickStackView::componentComplete()
     }
 }
 
-void QQuickStackView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickStackView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
 
     Q_D(QQuickStackView);
     for (QQuickStackElement *element : qAsConst(d->elements)) {
diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h
index ba6fe106..9bb9c8f4 100644
--- a/src/quicktemplates2/qquickstackview_p.h
+++ b/src/quicktemplates2/qquickstackview_p.h
@@ -157,7 +157,7 @@ Q_SIGNALS:
 
 protected:
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     bool childMouseEventFilter(QQuickItem *, QEvent *) override;
 
 #if QT_CONFIG(quicktemplates2_multitouch)
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index 9c76dff1..8c8d8c6e 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -1213,10 +1213,10 @@ void QQuickSwipeDelegate::componentComplete()
     QQuickSwipePrivate::get(&d->swipe)->reposition(DontAnimatePosition);
 }
 
-void QQuickSwipeDelegate::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickSwipeDelegate::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickSwipeDelegate);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
 
     if (isComponentComplete() && !qFuzzyCompare(newGeometry.width(), oldGeometry.width())) {
         QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&d->swipe);
diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h
index 055d48dd..76f9df5b 100644
--- a/src/quicktemplates2/qquickswipedelegate_p.h
+++ b/src/quicktemplates2/qquickswipedelegate_p.h
@@ -80,7 +80,7 @@ protected:
     void touchEvent(QTouchEvent *event) override;
 
     void componentComplete() override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     QFont defaultFont() const override;
 
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index f8b6ea77..b9cc68d2 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -300,10 +300,10 @@ QQuickSwipeViewAttached *QQuickSwipeView::qmlAttachedProperties(QObject *object)
     return new QQuickSwipeViewAttached(object);
 }
 
-void QQuickSwipeView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickSwipeView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickSwipeView);
-    QQuickContainer::geometryChanged(newGeometry, oldGeometry);
+    QQuickContainer::geometryChange(newGeometry, oldGeometry);
     d->resizeItems();
 }
 
diff --git a/src/quicktemplates2/qquickswipeview_p.h b/src/quicktemplates2/qquickswipeview_p.h
index 03f6cefa..72d7d543 100644
--- a/src/quicktemplates2/qquickswipeview_p.h
+++ b/src/quicktemplates2/qquickswipeview_p.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
     Q_REVISION(2) void orientationChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void itemAdded(int index, QQuickItem *item) override;
     void itemMoved(int index, QQuickItem *item) override;
     void itemRemoved(int index, QQuickItem *item) override;
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 75bbbda7..c90ff674 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -335,10 +335,10 @@ void QQuickTabBar::componentComplete()
     d->updateLayout();
 }
 
-void QQuickTabBar::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTabBar::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTabBar);
-    QQuickContainer::geometryChanged(newGeometry, oldGeometry);
+    QQuickContainer::geometryChange(newGeometry, oldGeometry);
     d->updateLayout();
 }
 
diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h
index 4c36f5e8..42d39767 100644
--- a/src/quicktemplates2/qquicktabbar_p.h
+++ b/src/quicktemplates2/qquicktabbar_p.h
@@ -84,7 +84,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;
     bool isContent(QQuickItem *item) const override;
     void itemAdded(int index, QQuickItem *item) override;
     void itemMoved(int index, QQuickItem *item) override;
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 45d6184a..af736f21 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -980,10 +980,10 @@ void QQuickTextArea::itemChange(QQuickItem::ItemChange change, const QQuickItem:
     }
 }
 
-void QQuickTextArea::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTextArea::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTextArea);
-    QQuickTextEdit::geometryChanged(newGeometry, oldGeometry);
+    QQuickTextEdit::geometryChange(newGeometry, oldGeometry);
     d->resizeBackground();
 }
 
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index adbaf1df..74247703 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -161,7 +161,7 @@ protected:
     void componentComplete() 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;
     virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset);
 
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override;
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 4ddc0778..0dcebb40 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -830,10 +830,10 @@ void QQuickTextField::itemChange(QQuickItem::ItemChange change, const QQuickItem
     }
 }
 
-void QQuickTextField::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTextField::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTextField);
-    QQuickTextInput::geometryChanged(newGeometry, oldGeometry);
+    QQuickTextInput::geometryChange(newGeometry, oldGeometry);
     d->resizeBackground();
 }
 
diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h
index 5308ee0a..f24330c7 100644
--- a/src/quicktemplates2/qquicktextfield_p.h
+++ b/src/quicktemplates2/qquicktextfield_p.h
@@ -156,7 +156,7 @@ protected:
     void componentComplete() 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;
     virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset);
 
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override;
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index 37755dbc..e8fbcbd5 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -518,11 +518,11 @@ void QQuickTumbler::positionViewAtIndex(int index, QQuickTumbler::PositionMode m
     QMetaObject::invokeMethod(d->view, "positionViewAtIndex", Q_ARG(int, index), Q_ARG(int, mode));
 }
 
-void QQuickTumbler::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTumbler::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickTumbler);
 
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickControl::geometryChange(newGeometry, oldGeometry);
 
     d->_q_updateItemHeights();
 
diff --git a/src/quicktemplates2/qquicktumbler_p.h b/src/quicktemplates2/qquicktumbler_p.h
index 79be75eb..046e8b8c 100644
--- a/src/quicktemplates2/qquicktumbler_p.h
+++ b/src/quicktemplates2/qquicktumbler_p.h
@@ -126,7 +126,7 @@ Q_SIGNALS:
     Q_REVISION(2) void movingChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void componentComplete() override;
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
     void keyPressEvent(QKeyEvent *event) override;
-- 
cgit v1.2.3