From 38664dabedb9906ee576b717df174e5a503aea09 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 28 Feb 2023 10:50:29 +0100 Subject: [PATCH] Don't mark non-copyable QFontEngineFT::QGlyphSet as Q_RELOCATABLE_TYPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Pick-to: 6.5 Change-Id: I053f6bb25d4d6e2359f43f0dbf9c19667dfff170 Reviewed-by: Mårten Nordheim --- src/gui/text/freetype/qfontengine_ft_p.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/text/freetype/qfontengine_ft_p.h b/src/gui/text/freetype/qfontengine_ft_p.h index 3cc76358384..e1951749602 100644 --- a/src/gui/text/freetype/qfontengine_ft_p.h +++ b/src/gui/text/freetype/qfontengine_ft_p.h @@ -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) {