summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-19 01:07:51 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-04-22 08:49:39 +0000
commitb31e98d477b5bc6a44b96ca1ea73c748e2fbb791 (patch)
tree5480627f0bae165ed29b6d74067dbf7e5ec75dbd /src
parentfe7f4a6d85f93bff7c5e7f15b276bebe4dded208 (diff)
Don't use anonymous types declared in an anonymous union
At least clang is unhappy with them when -Wnested-anon-types is enabled. Change-Id: Ia9869fecb836b27be69f7b9715fd614f384bb912 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qrgba64.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/painting/qrgba64.h b/src/gui/painting/qrgba64.h
index 51ce4ab10d..5316e32c57 100644
--- a/src/gui/painting/qrgba64.h
+++ b/src/gui/painting/qrgba64.h
@@ -40,13 +40,15 @@
QT_BEGIN_NAMESPACE
class QRgba64 {
+ struct qrgba_t {
+ quint16 red;
+ quint16 green;
+ quint16 blue;
+ quint16 alpha;
+ };
+
union {
- struct {
- quint16 red;
- quint16 green;
- quint16 blue;
- quint16 alpha;
- } c;
+ struct qrgba_t c;
quint64 rgba;
};
public: