1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix C++14 compilation in QRgba64

Browse Source 
QRgba64 has Q_DECL_RELAXED_CONSTEXPR that builds a QRgba64, but
it has no constructor that can be used in a constexpr.

Change-Id: Ia032b65151243d071440c05479e8f2549c8b9503
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
This commit is contained in:
Olivier Goffart 2015-03-15 13:52:55 +01:00 committed by Olivier Goffart (Woboq GmbH)
parent fd76e02e95
commit 77c0c1ca65
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/painting/qrgba64.h
View File

@ -54,7 +54,12 @@ public:
// When c++11 is mandatory, we can add all but a copy constructor. // When c++11 is mandatory, we can add all but a copy constructor.
Q_DECL_RELAXED_CONSTEXPR static QRgba64 fromRgba64(quint16 red, quint16 green, quint16 blue, quint16 alpha) Q_DECL_RELAXED_CONSTEXPR static QRgba64 fromRgba64(quint16 red, quint16 green, quint16 blue, quint16 alpha)
{ {
QRgba64 rgba64; QRgba64 rgba64
#ifdef Q_COMPILER_UNIFORM_INIT
= {}
#endif
;
rgba64.c.red = red; rgba64.c.red = red;
rgba64.c.green = green; rgba64.c.green = green;
rgba64.c.blue = blue; rgba64.c.blue = blue;
@ -63,7 +68,11 @@ public:
} }
Q_DECL_RELAXED_CONSTEXPR static QRgba64 fromRgba64(quint64 c) Q_DECL_RELAXED_CONSTEXPR static QRgba64 fromRgba64(quint64 c)
{ {
QRgba64 rgba64; QRgba64 rgba64
#ifdef Q_COMPILER_UNIFORM_INIT
= {}
#endif
;
rgba64.rgba = c; rgba64.rgba = c;
return rgba64; return rgba64;
} }