diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-15 05:46:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-15 21:26:11 +0200 |
| commit | 978a43ad4dbb069c037476ed0ef5978cc2db7a33 (patch) | |
| tree | 3a018fd4fd54395824dd62a4ee60cbca806116d3 | |
| parent | 6ca50b79bc736415e6e76b1dff2956eaca9f5236 (diff) | |
Fix conversion warnings when setting alpha to QColor
Adapt to 5bb4baae0379d5903f547f0399be9620f5ab06a0.
Change-Id: Id65f87740f9de8e0d3624ff63c431dcad642f3a5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qstylehelper.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index acbb9a2610..9c56c82578 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -1017,7 +1017,7 @@ QPixmap QItemDelegate::selectedPixmap(const QPixmap &pixmap, const QPalette &pal QColor color = palette.color(enabled ? QPalette::Normal : QPalette::Disabled, QPalette::Highlight); - color.setAlphaF((qreal)0.3); + color.setAlphaF(0.3f); QPainter painter(&img); painter.setCompositionMode(QPainter::CompositionMode_SourceAtop); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1a861695af..8040560e7c 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5388,7 +5388,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP #endif QPainter p(q); QColor tint = q->palette().window().color(); - tint.setAlphaF(qreal(.6)); + tint.setAlphaF(.6f); p.fillRect(toBePainted.boundingRect(), tint); #ifndef QT_NO_OPENGL endBackingStorePainting(); diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 0ac4077a94..3d447671df 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6435,7 +6435,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/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index ea65227fd5..5b771c6fba 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -348,7 +348,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, |