diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
| commit | c32c776bf4bd0bc601cb78f9814036cb40b33b52 (patch) | |
| tree | a390a1b5909c0396271be5f29b818ba114328e70 /src/quicktemplates2/qquickswipedelegate.cpp | |
| parent | 4997773a6ed0ea9908cd67ab0335d2ae177a6320 (diff) | |
| parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquicklabel.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
Diffstat (limited to 'src/quicktemplates2/qquickswipedelegate.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickswipedelegate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index d96e124a..92a5328d 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -433,7 +433,7 @@ void QQuickSwipePrivate::beginTransition(qreal newPosition) void QQuickSwipePrivate::finishTransition() { Q_Q(QQuickSwipe); - q->setComplete(qFuzzyCompare(qAbs(position), 1.0)); + q->setComplete(qFuzzyCompare(qAbs(position), qreal(1.0))); if (complete) emit q->opened(); else @@ -693,7 +693,7 @@ void QQuickSwipe::setTransition(QQuickTransition *transition) void QQuickSwipe::open(QQuickSwipeDelegate::Side side) { Q_D(QQuickSwipe); - if (qFuzzyCompare(qAbs(d->position), 1.0)) + if (qFuzzyCompare(qAbs(d->position), qreal(1.0))) return; if ((side != QQuickSwipeDelegate::Left && side != QQuickSwipeDelegate::Right) |