Don't mark non-copyable QFontEngineFT::QGlyphSet as Q_RELOCATABLE_TYPE
QGlyphSet is Q_DISABLE_COPY()'d.
Marking it also as Q_RELOCATABLE_TYPE incorrectly allows Qt containers
to use realloc() or memcpy() to relocate a type that was explicitly
designed not to be copied (or moved).
Amends 2c47d53249.
Pick-to: 6.5
Change-Id: I053f6bb25d4d6e2359f43f0dbf9c19667dfff170
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
parent
a776aea7aa
commit
38664dabed
|
|
@ -325,8 +325,6 @@ private:
|
|||
QFixed scalableBitmapScaleFactor;
|
||||
};
|
||||
|
||||
Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_RELOCATABLE_TYPE);
|
||||
|
||||
|
||||
inline size_t qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g, size_t seed = 0)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue