From 9602401aa1cc32e24e8c3c67e731ac372ab2d092 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu Date: Wed, 18 Jan 2023 09:46:14 +0100 Subject: [PATCH] qt: use QQuickItem::geometryChange() instead of QQuickItem::geometryChanged() --- modules/gui/qt/maininterface/videosurface.cpp | 8 ++++++++ modules/gui/qt/maininterface/videosurface.hpp | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/gui/qt/maininterface/videosurface.cpp b/modules/gui/qt/maininterface/videosurface.cpp index 3e6ebb0162..c2ff5b1eb0 100644 --- a/modules/gui/qt/maininterface/videosurface.cpp +++ b/modules/gui/qt/maininterface/videosurface.cpp @@ -312,9 +312,17 @@ void VideoSurface::keyPressEvent(QKeyEvent* event) event->ignore(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void VideoSurface::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) +#else +void VideoSurface::geometryChange(const QRectF& newGeometry, const QRectF& oldGeometry) +#endif { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QQuickItem::geometryChanged(newGeometry, oldGeometry); +#else + QQuickItem::geometryChange(newGeometry, oldGeometry); +#endif onSurfaceSizeChanged(); } diff --git a/modules/gui/qt/maininterface/videosurface.hpp b/modules/gui/qt/maininterface/videosurface.hpp index 6e75893ca8..bbd37040a4 100644 --- a/modules/gui/qt/maininterface/videosurface.hpp +++ b/modules/gui/qt/maininterface/videosurface.hpp @@ -122,8 +122,13 @@ protected: void wheelEvent(QWheelEvent *event) override; #endif +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + void geometryChange(const QRectF &newGeometry, + const QRectF &oldGeometry) override; +#else void geometryChanged(const QRectF &newGeometry, - const QRectF &oldGeometry) override; + const QRectF &oldGeometry) override; +#endif Qt::CursorShape getCursorShape() const; void setCursorShape(Qt::CursorShape);