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

Don't mark non-copyable QFontEngineFT::QGlyphSet as Q_RELOCATABLE_TYPE

Browse Source 
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 2c47d532490778e382b342907259c6dd11525f23.

Change-Id: I053f6bb25d4d6e2359f43f0dbf9c19667dfff170
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 38664dabedb9906ee576b717df174e5a503aea09)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-02-28 10:50:29 +01:00 committed by Qt Cherry-pick Bot
parent 6c5b7839b9
commit 7f09690ac8
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/freetype/qfontengine_ft_p.h
View File

@ -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)
{