From b363ad4fa517ce2db6b3eb4ea9230aa98d87bace Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 12 Jan 2021 10:13:01 +0200 Subject: [PATCH] use correct type for script in qt_addPatternProps() and getFcPattern() Signed-off-by: Ivailo Monev --- src/gui/text/qfontdatabase_x11_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/text/qfontdatabase_x11_p.h b/src/gui/text/qfontdatabase_x11_p.h index 3b64b1e3e..d9ccb683b 100644 --- a/src/gui/text/qfontdatabase_x11_p.h +++ b/src/gui/text/qfontdatabase_x11_p.h @@ -807,7 +807,7 @@ static const char *styleHint(const QFontDef &request) } #ifndef QT_NO_FONTCONFIG -static void qt_addPatternProps(FcPattern *pattern, int screen, int script, const QFontDef &request) +static void qt_addPatternProps(FcPattern *pattern, int screen, QUnicodeTables::Script script, const QFontDef &request) { double size_value = qMax(qreal(1.), request.pixelSize); FcPatternDel(pattern, FC_PIXEL_SIZE); @@ -873,7 +873,7 @@ static bool preferScalable(const QFontDef &request) } -static FcPattern *getFcPattern(const QFontPrivate *fp, int script, const QFontDef &request) +static FcPattern *getFcPattern(const QFontPrivate *fp, QUnicodeTables::Script script, const QFontDef &request) { if (!qt_x11Data->has_fontconfig) return 0; -- 2.11.0