videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

qt: use QQuickItem::geometryChange() instead of QQuickItem::geometryChanged()

This commit is contained in:
Fatih Uzunoglu 2023-01-18 09:46:14 +01:00 committed by Jean-Baptiste Kempf
parent dc64361e71
commit 9602401aa1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gui/qt/maininterface/videosurface.cpp
View File

@ -312,9 +312,17 @@ void VideoSurface::keyPressEvent(QKeyEvent* event)
event->ignore(); event->ignore();
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void VideoSurface::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) 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); QQuickItem::geometryChanged(newGeometry, oldGeometry);
#else
QQuickItem::geometryChange(newGeometry, oldGeometry);
#endif
onSurfaceSizeChanged(); onSurfaceSizeChanged();
} }

7
modules/gui/qt/maininterface/videosurface.hpp
View File

@ -122,8 +122,13 @@ protected:
void wheelEvent(QWheelEvent *event) override; void wheelEvent(QWheelEvent *event) override;
#endif #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, void geometryChanged(const QRectF &newGeometry,
const QRectF &oldGeometry) override; const QRectF &oldGeometry) override;
#endif
Qt::CursorShape getCursorShape() const; Qt::CursorShape getCursorShape() const;
void setCursorShape(Qt::CursorShape); void setCursorShape(Qt::CursorShape);