diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-18 14:19:05 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-18 13:24:13 +0000 |
commit | 4794fce4be864b0a2054e4726e0ba4f595332c24 (patch) | |
tree | 6b48c6d8e284cb29703d21ba68c6847606c8d276 /src/templates/qquickrangeslider.cpp | |
parent | 94e90c78f2cfcc513795113d51ef4773c532a6e1 (diff) |
Fix build on ARM with -qreal float
Change-Id: Id80ecea7bd79265d731e5c5e37c0acf0e344c8ab
Task-number: QTBUG-50048
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickrangeslider.cpp')
-rw-r--r-- | src/templates/qquickrangeslider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquickrangeslider.cpp b/src/templates/qquickrangeslider.cpp index 2d0806e2..70d5a03d 100644 --- a/src/templates/qquickrangeslider.cpp +++ b/src/templates/qquickrangeslider.cpp @@ -119,8 +119,8 @@ void QQuickRangeSliderNodePrivate::setPosition(qreal position, bool ignoreOtherP { Q_Q(QQuickRangeSliderNode); - const qreal min = isFirst() || ignoreOtherPosition ? 0.0 : qMax(0.0, slider->first()->position()); - const qreal max = !isFirst() || ignoreOtherPosition ? 1.0 : qMin(1.0, slider->second()->position()); + const qreal min = isFirst() || ignoreOtherPosition ? 0.0 : qMax<qreal>(0.0, slider->first()->position()); + const qreal max = !isFirst() || ignoreOtherPosition ? 1.0 : qMin<qreal>(1.0, slider->second()->position()); position = qBound(min, position, max); if (!qFuzzyCompare(this->position, position)) { this->position = position; |