diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-23 12:36:42 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-26 14:03:35 +0000 |
| commit | 8317e62c3e2381e6287c9a7e861d20f78aaea03f (patch) | |
| tree | 4e07c885882183197987955f94dfe61973527588 /src/quickcontrols2 | |
| parent | 33966b5b9b026f24ac94c0905280deb4d004df81 (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/quickcontrols2')
| -rw-r--r-- | src/quickcontrols2/qquickcolor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |