diff options
Diffstat (limited to 'src/imports/controls/universal/qquickuniversaltheme.cpp')
| -rw-r--r-- | src/imports/controls/universal/qquickuniversaltheme.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp index 290faa5d..dc516b45 100644 --- a/src/imports/controls/universal/qquickuniversaltheme.cpp +++ b/src/imports/controls/universal/qquickuniversaltheme.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -37,17 +37,19 @@ #include "qquickuniversaltheme_p.h" #include <QtGui/qfont.h> +#include <QtGui/qfontinfo.h> QT_BEGIN_NAMESPACE QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme) { - const QFont font(QStringLiteral("Segoe UI")); - if (font.exactMatch()) { - systemFont.setFamily(font.family()); - groupBoxTitleFont.setFamily(font.family()); - tabButtonFont.setFamily(font.family()); + const QFont font(QLatin1String("Segoe UI")); + if (QFontInfo(font).family() == QLatin1String("Segoe UI")) { + const QString family = font.family(); + systemFont.setFamily(family); + groupBoxTitleFont.setFamily(family); + tabButtonFont.setFamily(family); } systemFont.setPixelSize(15); @@ -59,10 +61,6 @@ QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme) tabButtonFont.setWeight(QFont::Light); } -QQuickUniversalTheme::~QQuickUniversalTheme() -{ -} - const QFont *QQuickUniversalTheme::font(QPlatformTheme::Font type) const { switch (type) { |