diff options
| author | Yulong Bai <yulong.bai@qt.io> | 2019-02-28 15:01:41 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-03-01 05:10:11 +0000 |
| commit | f8c82616854984f05c737a1d3ef532108c6e0549 (patch) | |
| tree | 4fdbf55f0e05b1cd9e2b3c871bb195075f2747ed /src/quick/items | |
| parent | 634b59f187c8697f03a606cbacb5f0a69650ea7c (diff) | |
QQuickFlickable: fix setContentX/setContentY comparing qreal
QQuickFlickable::setContentX/setContentY used !=/== to compare qreal, which would
trigger binding loop warnings while using bi-directional property bindings.
Fixes: QTBUG-74128
Change-Id: I224a924e11c93cf047478ba0e09e10e57eedabde
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index cf882e8c9e..d6dddc3f1c 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -786,7 +786,7 @@ void QQuickFlickable::setContentX(qreal pos) d->hData.vTime = d->timeline.time(); if (isMoving() || isFlicking()) movementEnding(true, false); - if (-pos != d->hData.move.value()) + if (!qFuzzyCompare(-pos, d->hData.move.value())) d->hData.move.setValue(-pos); } @@ -804,7 +804,7 @@ void QQuickFlickable::setContentY(qreal pos) d->vData.vTime = d->timeline.time(); if (isMoving() || isFlicking()) movementEnding(false, true); - if (-pos != d->vData.move.value()) + if (!qFuzzyCompare(-pos, d->vData.move.value())) d->vData.move.setValue(-pos); } |