From 09f59111425555f106ebb1275891a41fc5fa76c7 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 15 Apr 2025 15:39:57 +0200 Subject: [PATCH] Utils: Support "Inter Variable" as design font Qt 6.7 supports variable fonts. The variable variant of "Inter" has "Inter Variable" as family name. Change-Id: I3d91fa46da48106169183ea30e33b8e1e81caae6 Reviewed-by: Cristian Adam --- src/libs/utils/stylehelper.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index f06bae0c7b7..a63b7105759 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -3,6 +3,7 @@ #include "stylehelper.h" +#include "algorithm.h" #include "theme/theme.h" #include "hostosinfo.h" #include "qtcassert.h" @@ -917,9 +918,10 @@ QColor StyleHelper::ensureReadableOn(const QColor &background, const QColor &des static const QStringList &applicationFontFamilies() { const static QStringList families = [] { - const QLatin1String familyName("Inter"); // Font is either installed in the system, or was loaded from share/qtcreator/fonts/ - return QFontDatabase::hasFamily(familyName) ? QStringList(familyName) : QStringList(); + const QStringList candidates = {"Inter", "Inter Variable"}; + const QString family = Utils::findOrDefault(candidates, &QFontDatabase::hasFamily); + return family.isEmpty() ? QStringList() : QStringList(family); }(); return families; }