aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-03-14 11:42:35 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-03-14 15:49:57 +0100
commitbb6d68703b67e042e2a7254c2ca6a004a1441cc5 (patch)
treeafd96cc83feb041768fb130b007cd1ef254b0df3 /src/quickcontrols
parentd4d18dbeaae231a098cbfb71495b2acc18e77902 (diff)
Look up Segoe UI presence without triggering font aliases
Pick-to: 6.7 Change-Id: I5f594adda733336e1209bdca011da9b2e5709a00 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/quickcontrols')
-rw-r--r--src/quickcontrols/universal/qquickuniversaltheme.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/quickcontrols/universal/qquickuniversaltheme.cpp b/src/quickcontrols/universal/qquickuniversaltheme.cpp
index fff5400986..286106d88c 100644
--- a/src/quickcontrols/universal/qquickuniversaltheme.cpp
+++ b/src/quickcontrols/universal/qquickuniversaltheme.cpp
@@ -3,7 +3,7 @@
#include "qquickuniversaltheme_p.h"
-#include <QtGui/qfontinfo.h>
+#include <QtGui/qfontdatabase.h>
#include <QtQuickTemplates2/private/qquicktheme_p.h>
QT_BEGIN_NAMESPACE
@@ -14,8 +14,9 @@ void QQuickUniversalTheme::initialize(QQuickTheme *theme)
QFont groupBoxTitleFont;
QFont tabButtonFont;
- const QFont font(QLatin1String("Segoe UI"));
- if (QFontInfo(font).family() == QLatin1String("Segoe UI")) {
+ const QLatin1String segoeUiFamilyName("Segoe UI");
+ if (QFontDatabase::families().contains(segoeUiFamilyName)) {
+ const QFont font(segoeUiFamilyName);
const QStringList families{font.family()};
systemFont.setFamilies(families);
groupBoxTitleFont.setFamilies(families);