From d622607fb375527ae065ecf3f52c70c3788af88d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 24 Jan 2022 01:10:41 +0200 Subject: [PATCH] style argument of QFontDatabase::pointSizes() is optional Signed-off-by: Ivailo Monev --- src/gui/text/qfontdatabase.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 09d69ccc5..6bfeb2369 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -530,12 +530,11 @@ bool QFontDatabase::isSmoothlyScalable(const QString &family, const QString &sty \sa isSmoothlyScalable() */ -bool QFontDatabase::isScalable(const QString &family, const QString &style) const +bool QFontDatabase::isScalable(const QString &family, const QString &style) const { return isSmoothlyScalable(family, style); } - /*! \fn QList QFontDatabase::pointSizes(const QString &family, const QString &style) Returns a list of the point sizes available for the font with the @@ -554,7 +553,7 @@ QList QFontDatabase::pointSizes(const QString &family, const QString &style const QtFontFamily &fontfamily = db->at(i); if (fontfamily.family.compare(parsedfamily, Qt::CaseInsensitive) != 0 || (!parsedfoundry.isEmpty() && fontfamily.foundry.compare(parsedfoundry, Qt::CaseInsensitive) != 0) - || !isStyleMatch(fontfamily.style, style)) { + || (!style.isEmpty() && !isStyleMatch(fontfamily.style, style))) { continue; } result.append(fontfamily.pointsize);