aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-11-23 12:36:42 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-11-26 14:03:35 +0000
commit8317e62c3e2381e6287c9a7e861d20f78aaea03f (patch)
tree4e07c885882183197987955f94dfe61973527588 /src
parent33966b5b9b026f24ac94c0905280deb4d004df81 (diff)
Fix compilation with qreal=float
Introduce casts where required. Fixes: QTBUG-71952 Change-Id: I63a99d6918bc00367439e967e3c45a733b41c482 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/fusion/qquickfusionbusyindicator.cpp2
-rw-r--r--src/quickcontrols2/qquickcolor.cpp3
-rw-r--r--src/quicktemplates2/qquickdial.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/src/imports/controls/fusion/qquickfusionbusyindicator.cpp b/src/imports/controls/fusion/qquickfusionbusyindicator.cpp
index 81618191..a9b75d27 100644
--- a/src/imports/controls/fusion/qquickfusionbusyindicator.cpp
+++ b/src/imports/controls/fusion/qquickfusionbusyindicator.cpp
@@ -82,7 +82,7 @@ void QQuickFusionBusyIndicator::paint(QPainter *painter)
const qreal sz = qMin(w, h);
const qreal dx = (w - sz) / 2;
const qreal dy = (h - sz) / 2;
- const int hpw = qRound(qMax(1.0, sz / 14)) & -1;
+ const int hpw = qRound(qMax(qreal(1), sz / 14)) & -1;
const int pw = 2 * hpw;
const QRectF bounds(dx + hpw, dy + hpw, sz - pw - 1, sz - pw - 1);
diff --git a/src/quickcontrols2/qquickcolor.cpp b/src/quickcontrols2/qquickcolor.cpp
index 66ef21b7..8ae568fc 100644
--- a/src/quickcontrols2/qquickcolor.cpp
+++ b/src/quickcontrols2/qquickcolor.cpp
@@ -45,7 +45,8 @@ QQuickColor::QQuickColor(QObject *parent) :
QColor QQuickColor::transparent(const QColor &color, qreal opacity) const
{
- return QColor(color.red(), color.green(), color.blue(), qBound(0.0, opacity, 1.0) * 255);
+ return QColor(color.red(), color.green(), color.blue(),
+ int(qreal(255) * qBound(qreal(0), opacity, qreal(1))));
}
QColor QQuickColor::blend(const QColor &a, const QColor &b, qreal factor) const
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 123f9b1b..431b25a8 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -191,13 +191,13 @@ qreal QQuickDialPrivate::linearPositionAt(const QPointF &point) const
dragDistance = point.y() - pressPoint.y();
}
const qreal normalisedDifference = dragDistance / dragArea;
- return qBound(0.0, positionBeforePress - normalisedDifference, 1.0);
+ return qBound(qreal(0), positionBeforePress - normalisedDifference, qreal(1));
}
void QQuickDialPrivate::setPosition(qreal pos)
{
Q_Q(QQuickDial);
- pos = qBound<qreal>(0.0, pos, 1.0);
+ pos = qBound<qreal>(qreal(0), pos, qreal(1));
if (qFuzzyCompare(position, pos))
return;
@@ -219,7 +219,7 @@ void QQuickDialPrivate::updatePosition()
bool QQuickDialPrivate::isLargeChange(const QPointF &eventPos, qreal proposedPosition) const
{
- return qAbs(proposedPosition - position) >= 0.5 && eventPos.y() >= height / 2;
+ return qAbs(proposedPosition - position) >= qreal(0.5) && eventPos.y() >= height / 2;
}
bool QQuickDialPrivate::isHorizontalOrVertical() const