diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-10-10 17:07:30 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-10-20 21:37:02 +0200 |
| commit | 61ceff89f79f277ee1050b2633b9e3bfee1a876c (patch) | |
| tree | 33fd32b0424cac1a240fdeac417f8b6af1330ebc /src/gui/text/freetype/qfontengine_ft.cpp | |
| parent | eb02561f58e232471d8c3250c396460dc8a2dbce (diff) | |
Replace MAKE_TAG macro with QFont::Tag
Task-number: QTBUG-117046
Change-Id: I26e0af634fed87199bb49d57e3aa3f4e3fea0e39
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/freetype/qfontengine_ft.cpp')
| -rw-r--r-- | src/gui/text/freetype/qfontengine_ft.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/freetype/qfontengine_ft.cpp b/src/gui/text/freetype/qfontengine_ft.cpp index f3a80d925d..3c01392e46 100644 --- a/src/gui/text/freetype/qfontengine_ft.cpp +++ b/src/gui/text/freetype/qfontengine_ft.cpp @@ -767,7 +767,7 @@ static FT_UShort calculateActualWeight(FT_Face face, QFontEngine::FaceId faceId) FT_Get_MM_Var(face, &var); if (var != nullptr && FT_UInt(faceId.instanceIndex) < var->num_namedstyles) { for (FT_UInt axis = 0; axis < var->num_axis; ++axis) { - if (var->axis[axis].tag == MAKE_TAG('w', 'g', 'h', 't')) { + if (var->axis[axis].tag == QFont::Tag("wght").value()) { return var->namedstyle[faceId.instanceIndex].coords[axis] >> 16; } } @@ -787,7 +787,7 @@ static bool calculateActualItalic(FT_Face face, QFontEngine::FaceId faceId) FT_Get_MM_Var(face, &var); if (var != nullptr && FT_UInt(faceId.instanceIndex) < var->num_namedstyles) { for (FT_UInt axis = 0; axis < var->num_axis; ++axis) { - if (var->axis[axis].tag == MAKE_TAG('i', 't', 'a', 'l')) { + if (var->axis[axis].tag == QFont::Tag("ital").value()) { return (var->namedstyle[faceId.instanceIndex].coords[axis] >> 16) == 1; } } |