diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2016-02-01 21:47:13 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-02 16:17:24 +0000 |
| commit | 54ad7f2456cd851b6d55f9289414585de952a882 (patch) | |
| tree | d4f8b747341315d294c3a67d30c9a61553d9072c /src/imports | |
| parent | 2bac7d87d535dcc256bb0d2e04b1ada19fbb29f7 (diff) | |
Fix Universal & Material style font checks
Use QFont::exactMatch() to find out whether the font exists.
Change-Id: Ie4f0a3a55c9337c504684aa285c93391e41279aa
Task-number: QTBUG-50815
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/material/qtlabsmaterialstyleplugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp index ca10c289..2d867308 100644 --- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp @@ -86,7 +86,7 @@ void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char QQuickStyleSelector selector; if (selector.style() == QLatin1String("material")) { - if (QFont(QStringLiteral("Roboto")).family() == QLatin1String("Roboto")) { + if (QFont(QStringLiteral("Roboto")).exactMatch()) { QPlatformTheme *old = QGuiApplicationPrivate::platform_theme; if (old) { QQuickProxyTheme *theme = new QQuickMaterialTheme(old); diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index 6eceb44b..6f215d75 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -84,7 +84,7 @@ void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char { QQuickStyleSelector selector; if (selector.style() == QLatin1String("universal")) { - if (QFont(QStringLiteral("Segoe UI")).family() == QLatin1String("Segoe UI")) { + if (QFont(QStringLiteral("Segoe UI")).exactMatch()) { QPlatformTheme *old = QGuiApplicationPrivate::platform_theme; if (old) { QQuickProxyTheme *theme = new QQuickUniversalTheme(old); |