diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-05-14 00:41:47 +0300 |
|---|---|---|
| committer | Nikita Krupenko <krnekit@gmail.com> | 2016-05-18 15:15:33 +0000 |
| commit | 82c422b5b1c81f0572fdb2be1efba900200680d8 (patch) | |
| tree | a11647c78b50d193038c8767aca8e05c0ff73aef /src | |
| parent | 9b682c12c443f799f5e38cf0a76acfc3754e9e56 (diff) | |
Don't use QFont::exactMatch() for fonts comparison
This function can return false even if the font found. Compare fonts by
QFontInfo::family() instead.
Change-Id: I519dd11ef7cba7395ca5b815d3973ddf585c439a
Task-number: QTBUG-53377
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialtheme.cpp | 10 | ||||
| -rw-r--r-- | src/imports/controls/universal/qquickuniversaltheme.cpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp index 379a30fc..0d2f8a70 100644 --- a/src/imports/controls/material/qquickmaterialtheme.cpp +++ b/src/imports/controls/material/qquickmaterialtheme.cpp @@ -37,6 +37,7 @@ #include "qquickmaterialtheme_p.h" #include <QtGui/qfont.h> +#include <QtGui/qfontinfo.h> QT_BEGIN_NAMESPACE @@ -45,11 +46,14 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) { QFont font; font.setFamily(QStringLiteral("Roboto")); - if (!font.exactMatch()) + QString family = QFontInfo(font).family(); + + if (family != QStringLiteral("Roboto")) { font.setFamily(QStringLiteral("Noto")); + family = QFontInfo(font).family(); + } - if (font.exactMatch()) { - const QString family = font.family(); + if (family == QStringLiteral("Roboto") || family == QStringLiteral("Noto")) { systemFont.setFamily(family); buttonFont.setFamily(family); toolTipFont.setFamily(family); diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp index 856242b3..51642c4a 100644 --- a/src/imports/controls/universal/qquickuniversaltheme.cpp +++ b/src/imports/controls/universal/qquickuniversaltheme.cpp @@ -37,6 +37,7 @@ #include "qquickuniversaltheme_p.h" #include <QtGui/qfont.h> +#include <QtGui/qfontinfo.h> QT_BEGIN_NAMESPACE @@ -44,7 +45,7 @@ QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme) { const QFont font(QStringLiteral("Segoe UI")); - if (font.exactMatch()) { + if (QFontInfo(font).family() == QStringLiteral("Segoe UI")) { const QString family = font.family(); systemFont.setFamily(family); groupBoxTitleFont.setFamily(family); |