From d76dd6148f15651b8b8d6abc114725a18b8af9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 19 Oct 2022 10:47:12 +0200 Subject: [PATCH] QCoreTextFontEngine: Mark CGAffineTransformConcat as unused We don't know at this point why the result isn't assigned back to cgMatrix, but for now mark it as unused to fix warnings-are-errors builds. Change-Id: I6b32bbc42b2147b5304e1c72026e39d3e1eb8a4d Reviewed-by: Timur Pocheptsov (cherry picked from commit 87f8159c6a230e3ec1b8a628a20b04cc308d9fcf) Reviewed-by: Qt Cherry-pick Bot --- src/gui/text/coretext/qfontengine_coretext.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/text/coretext/qfontengine_coretext.mm b/src/gui/text/coretext/qfontengine_coretext.mm index 89166489926..e71ba93a7ef 100644 --- a/src/gui/text/coretext/qfontengine_coretext.mm +++ b/src/gui/text/coretext/qfontengine_coretext.mm @@ -386,7 +386,8 @@ void QCoreTextFontEngine::draw(CGContextRef ctx, qreal x, qreal y, const QTextIt CGAffineTransform cgMatrix = CGAffineTransformMake(1, 0, 0, -1, 0, -paintDeviceHeight); - CGAffineTransformConcat(cgMatrix, oldTextMatrix); + // FIXME: Should we include the old matrix here? If so we need to assign it. + Q_UNUSED(CGAffineTransformConcat(cgMatrix, oldTextMatrix)); if (synthesisFlags & QFontEngine::SynthesizedItalic) cgMatrix = CGAffineTransformConcat(cgMatrix, CGAffineTransformMake(1, 0, -SYNTHETIC_ITALIC_SKEW, 1, 0, 0));