aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-01-14 11:05:15 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-01-14 11:54:41 +0100
commite1ed06a8555bf51ca63b5be2dd9c0981a0f2b7f2 (patch)
treeacac43b009e1cdbdbe905410263175e3073eab4a
parent83f49d3f4c0041bf2c74ff1ff2eb03c5d37aa1f4 (diff)
Fix MSVC warnings about precision loss when converting double to float
The warnings appeared after porting QCcolor to float. Change-Id: I248f15a7a403281e849f030e412c159f9732261e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/fusion/impl/qquickfusionknob.cpp2
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp2
-rw-r--r--src/imports/nativestyle/qstyle/qquickcommonstyle.cpp2
-rw-r--r--src/imports/nativestyle/qstyle/qquickstylehelper.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/fusion/impl/qquickfusionknob.cpp b/src/imports/controls/fusion/impl/qquickfusionknob.cpp
index a641d190..27ac54d3 100644
--- a/src/imports/controls/fusion/impl/qquickfusionknob.cpp
+++ b/src/imports/controls/fusion/impl/qquickfusionknob.cpp
@@ -62,7 +62,7 @@ void QQuickFusionKnob::paint(QPainter *painter)
qMin(140, color .saturation()),
qMax(180, color.value()));
color = color.lighter(104);
- color.setAlphaF(qreal(0.8));
+ color.setAlphaF(0.8f);
const qreal sz = qMin(w, h);
QRectF rect(0, 0, sz, sz);
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index a130db6c..d70728a0 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -883,7 +883,7 @@ QColor QQuickMaterialStyle::hintTextColor() const
QColor QQuickMaterialStyle::textSelectionColor() const
{
QColor color = accentColor();
- color.setAlphaF(0.4);
+ color.setAlphaF(0.4f);
return color;
}
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
index 02d58bf4..e4adebd9 100644
--- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
+++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp
@@ -6062,7 +6062,7 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p
case QIcon::Selected: {
QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
QColor color = opt->palette.color(QPalette::Normal, QPalette::Highlight);
- color.setAlphaF(qreal(0.3));
+ color.setAlphaF(0.3f);
QPainter painter(&img);
painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
painter.fillRect(0, 0, img.width(), img.height(), color);
diff --git a/src/imports/nativestyle/qstyle/qquickstylehelper.cpp b/src/imports/nativestyle/qstyle/qquickstylehelper.cpp
index 346408a4..ebc82864 100644
--- a/src/imports/nativestyle/qstyle/qquickstylehelper.cpp
+++ b/src/imports/nativestyle/qstyle/qquickstylehelper.cpp
@@ -333,7 +333,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter)
QPointF dp = calcRadialPos(option, qreal(0.70));
buttonColor = buttonColor.lighter(104);
- buttonColor.setAlphaF(qreal(0.8));
+ buttonColor.setAlphaF(0.8f);
const qreal ds = r/qreal(7.0);
QRectF dialRect(dp.x() - ds, dp.y() - ds, 2*ds, 2*ds);
QRadialGradient dialGradient(dialRect.center().x() + dialRect.width()/2,