diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-12 11:56:49 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-13 18:58:08 +0000 |
| commit | aa823b2961f90a3fa459a220b3eab51c227b110a (patch) | |
| tree | 590970b417f724a00186f4048dba3839eab0894a /src/quicktemplates2/qquickscrollindicator.cpp | |
| parent | 67142d0c9a0e9ff46981703b727cae601ee5455f (diff) | |
Fix build after QQuickItemChangeListener changes
qtdeclarative commit e2c296c changed the itemGeometryChanged()
signature.
Change-Id: Ibe163e1d6fe8535a4ec01de047d72a0d4863979d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickscrollindicator.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickscrollindicator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp index 55e86d87..85d9312e 100644 --- a/src/quicktemplates2/qquickscrollindicator.cpp +++ b/src/quicktemplates2/qquickscrollindicator.cpp @@ -242,7 +242,7 @@ public: void layoutHorizontal(bool move = true); void layoutVertical(bool move = true); - void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override; + void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; void itemDestroyed(QQuickItem *item) override; QQuickFlickable *flickable; @@ -276,16 +276,16 @@ void QQuickScrollIndicatorAttachedPrivate::layoutVertical(bool move) vertical->setX(flickable->width() - vertical->width()); } -void QQuickScrollIndicatorAttachedPrivate::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) +void QQuickScrollIndicatorAttachedPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) { Q_UNUSED(item); - Q_UNUSED(newGeometry); + Q_UNUSED(change); if (horizontal && horizontal->height() > 0) { - bool move = qFuzzyIsNull(horizontal->y()) || qFuzzyCompare(horizontal->y(), oldGeometry.height() - horizontal->height()); + bool move = qFuzzyIsNull(horizontal->y()) || qFuzzyCompare(horizontal->y(), item->height() - diff.height()); layoutHorizontal(move); } if (vertical && vertical->width() > 0) { - bool move = qFuzzyIsNull(vertical->x()) || qFuzzyCompare(vertical->x(), oldGeometry.width() - vertical->width()); + bool move = qFuzzyIsNull(vertical->x()) || qFuzzyCompare(vertical->x(), item->width() - diff.width()); layoutVertical(move); } } @@ -304,7 +304,7 @@ QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *fl Q_D(QQuickScrollIndicatorAttached); if (flickable) { QQuickItemPrivate *p = QQuickItemPrivate::get(flickable); - p->updateOrAddGeometryChangeListener(d, QQuickItemPrivate::SizeChange); + p->updateOrAddGeometryChangeListener(d, QQuickGeometryChange::Size); } } |