From 4d4330116471a495796e9d2723b3b5c508fc26b1 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 24 Mar 2020 10:45:57 +0100 Subject: Adapt to geometryChanged => geometryChange renaming Task-number: QTBUG-82994 Change-Id: Ie06c326e045f4ed1e73a203f24eab054d64661f4 Reviewed-by: Shawn Rutledge --- src/webengine/api/qquickwebengineview.cpp | 4 ++-- src/webengine/api/qquickwebengineview_p.h | 2 +- src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 4 ++-- src/webengine/render_widget_host_view_qt_delegate_quick.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index afb0fbd25..f5cf2f5c2 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1687,9 +1687,9 @@ void QQuickWebEngineView::fullScreenCancelled() d->adapter->exitFullScreen(); } -void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QQuickWebEngineView::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { - QQuickItem::geometryChanged(newGeometry, oldGeometry); + QQuickItem::geometryChange(newGeometry, oldGeometry); Q_D(QQuickWebEngineView); if (d->widget) d->widget->setSize(newGeometry.size()); diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index b0203cfa8..9dbb8cffc 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -590,7 +590,7 @@ Q_SIGNALS: #endif protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void itemChange(ItemChange, const ItemChangeData &) override; #if QT_CONFIG(draganddrop) void dragEnterEvent(QDragEnterEvent *e) override; diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index cb41c8706..96b6a0a5b 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -328,9 +328,9 @@ void RenderWidgetHostViewQtDelegateQuick::inputMethodEvent(QInputMethodEvent *ev m_client->forwardEvent(event); } -void RenderWidgetHostViewQtDelegateQuick::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void RenderWidgetHostViewQtDelegateQuick::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { - QQuickItem::geometryChanged(newGeometry, oldGeometry); + QQuickItem::geometryChange(newGeometry, oldGeometry); m_client->visualPropertiesChanged(); } diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h index f70de50d7..439616bf3 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h @@ -100,7 +100,7 @@ protected: void hoverLeaveEvent(QHoverEvent *event) override; QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; void inputMethodEvent(QInputMethodEvent *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; QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; -- cgit v1.2.3