From 5238ce8fdc5dd357dc96e351ba8baea73ce9fb55 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 24 Mar 2020 11:25:14 +0100 Subject: Adapt to geometryChanged => geometryChange renaming Task-number: QTBUG-82994 Change-Id: I19cd9ce965352c06adc5466a86cd3f32c00a4cd3 Reviewed-by: Shawn Rutledge --- src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | 4 ++-- src/qtmultimediaquicktools/qdeclarativevideooutput_p.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index ca3a4b2ea..caa022c5c 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -828,12 +828,12 @@ void QDeclarativeVideoOutput::releaseResources() m_backend->releaseResources(); } -void QDeclarativeVideoOutput::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativeVideoOutput::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_UNUSED(newGeometry); Q_UNUSED(oldGeometry); - QQuickItem::geometryChanged(newGeometry, oldGeometry); + QQuickItem::geometryChange(newGeometry, oldGeometry); // Explicitly listen to geometry changes here. This is needed since changing the position does // not trigger a call to updatePaintNode(). diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h index a29e11ccf..a7ed5c36d 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h @@ -156,7 +156,7 @@ Q_SIGNALS: protected: QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; void itemChange(ItemChange change, const ItemChangeData &changeData) override; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void releaseResources() override; private Q_SLOTS: -- cgit v1.2.3