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>
This commit is contained in:
parent
1236b1827c
commit
4d8a83f2cb
@ -76,7 +76,7 @@ struct QIconDirInfo
|
||||
short maxSize;
|
||||
short minSize;
|
||||
short threshold;
|
||||
Type type : 4;
|
||||
Type type;
|
||||
};
|
||||
Q_DECLARE_TYPEINFO(QIconDirInfo, Q_MOVABLE_TYPE);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user