From 07e5a05dcb91720a88122e4aba9d8ce6bfbd14ad Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 30 Jan 2020 07:56:02 +0100 Subject: Suppress deprecation warnings for QFont::ForceIntegerMetrics This flag has been deprecated, but until we remove it completely we need to continue supporting it, so we just suppress the warnings for now. Change-Id: I464e1cce42f78af76d46ec12eeb3e8d53d64d6a3 Reviewed-by: Friedemann Kleint --- src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp') diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp index 64ceb69c23..8273041549 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp @@ -1334,7 +1334,10 @@ void QFontEngineFT::doKerning(QGlyphLayout *g, QFontEngine::ShaperFlags flags) c } } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED if (shouldUseDesignMetrics(flags) && !(fontDef.styleStrategy & QFont::ForceIntegerMetrics)) +QT_WARNING_POP flags |= DesignMetrics; else flags &= ~DesignMetrics; @@ -1649,7 +1652,10 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlag if (face) unlockFace(); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) { +QT_WARNING_POP for (int i = 0; i < glyphs->numGlyphs; ++i) glyphs->advances[i] = glyphs->advances[i].round(); } @@ -1729,7 +1735,10 @@ glyph_metrics_t QFontEngineFT::boundingBox(glyph_t glyph) overall.width = g->width; overall.height = g->height; overall.xoff = g->advance; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) +QT_WARNING_POP overall.xoff = overall.xoff.round(); if (!cacheEnabled && g != &emptyGlyph) delete g; -- cgit v1.2.3