diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-19 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-19 01:00:10 +0100 |
| commit | 35a461d0261af4178e560df3e3c8fd6fd19bdeb5 (patch) | |
| tree | 8b4336316bbc992f4f537b3d974472dc75ce8752 /src/gui/painting/qcolor.h | |
| parent | 1e654450157ca422833d48c0faf4fe0836c3125f (diff) | |
| parent | 858c5a73fc7d2bee1d116fb70f723c277bc0dc6d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I68702c9f9680772d332b5bb777ddd2663168abd5
Diffstat (limited to 'src/gui/painting/qcolor.h')
| -rw-r--r-- | src/gui/painting/qcolor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 423a0ac50f..ad624e6b60 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -74,10 +74,10 @@ public: QColor(Qt::GlobalColor color) noexcept; Q_DECL_CONSTEXPR QColor(int r, int g, int b, int a = 255) noexcept : cspec(isRgbaValid(r, g, b, a) ? Rgb : Invalid), - ct(cspec == Rgb ? a * 0x0101 : 0, - cspec == Rgb ? r * 0x0101 : 0, - cspec == Rgb ? g * 0x0101 : 0, - cspec == Rgb ? b * 0x0101 : 0, + ct(ushort(cspec == Rgb ? a * 0x0101 : 0), + ushort(cspec == Rgb ? r * 0x0101 : 0), + ushort(cspec == Rgb ? g * 0x0101 : 0), + ushort(cspec == Rgb ? b * 0x0101 : 0), 0) {} QColor(QRgb rgb) noexcept; QColor(QRgba64 rgba64) noexcept; |