diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 14:12:35 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 15:59:49 +0000 |
| commit | 4d8a83f2cb77e4b241a8bcd0375c7e9a9bcb38f8 (patch) | |
| tree | 7655b35d2dd3517ce65b8db2d0f461be48c0e039 /src/gui | |
| parent | 1236b1827c2d292c665ee7ef121dccae70f0429b (diff) | |
QIconLoader: don't make QIconDirInfo::type a bit-field
It doesn't save any space, is not required for ABI compat
(because it's private API), generates more code to extract
the field, and triggers a bug in older GCCs when synthesizing
a move constructor for this type:
src/gui/image/qiconloader_p.h:64:8: error: invalid conversion from 'unsigned char:4' to 'QIconDirInfo::Type' [-fpermissive]
src/corelib/tools/qvector.h:641:13: note: synthesized method 'QIconDirInfo& QIconDirInfo::operator=(QIconDirInfo&&)' first required here
Change-Id: I61e886566b67c7a18a318a3d026dc762600f8ab4
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qiconloader_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index 5b0362e218..ccf0a9d438 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -76,7 +76,7 @@ struct QIconDirInfo short maxSize; short minSize; short threshold; - Type type : 4; + Type type; }; Q_DECLARE_TYPEINFO(QIconDirInfo, Q_MOVABLE_TYPE); |