Commit f6d14f04 authored by Volker Krause's avatar Volker Krause
Browse files

Adapt to QQuickItem::geometryChanged() rename in Qt6

parent fe56f36d
Pipeline #148634 passed with stage
in 38 minutes and 19 seconds
......@@ -304,12 +304,20 @@ void ExpoLayout::removeCell(ExpoCell *cell)
polish();
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void ExpoLayout::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
#else
void ExpoLayout::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
#endif
{
if (newGeometry.size() != oldGeometry.size()) {
polish();
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QQuickItem::geometryChanged(newGeometry, oldGeometry);
#else
QQuickItem::geometryChange(newGeometry, oldGeometry);
#endif
}
static int distance(const QPoint &a, const QPoint &b)
......
......@@ -47,7 +47,11 @@ public:
void setReady();
protected:
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
#else
void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
#endif
void updatePolish() override;
Q_SIGNALS:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment