From 73ca0cff27aac15fd7e8eff0ed51657aed6a0da1 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Mon, 28 Mar 2016 11:10:51 +0300 Subject: Themes: cache result of QFont::family() Change-Id: I5318a61dbb699e2f251d218e614c1a2ff02d53a7 Reviewed-by: Mitch Curtis --- src/imports/controls/material/qquickmaterialtheme.cpp | 11 ++++++----- src/imports/controls/universal/qquickuniversaltheme.cpp | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp index 8fdc912c..8639fe17 100644 --- a/src/imports/controls/material/qquickmaterialtheme.cpp +++ b/src/imports/controls/material/qquickmaterialtheme.cpp @@ -49,11 +49,12 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) font.setFamily(QStringLiteral("Noto")); if (font.exactMatch()) { - systemFont.setFamily(font.family()); - buttonFont.setFamily(font.family()); - itemViewFont.setFamily(font.family()); - menuItemFont.setFamily(font.family()); - editorFont.setFamily(font.family()); + const QString family = font.family(); + systemFont.setFamily(family); + buttonFont.setFamily(family); + itemViewFont.setFamily(family); + menuItemFont.setFamily(family); + editorFont.setFamily(family); } systemFont.setPixelSize(14); diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp index 066d1194..154f42b1 100644 --- a/src/imports/controls/universal/qquickuniversaltheme.cpp +++ b/src/imports/controls/universal/qquickuniversaltheme.cpp @@ -45,9 +45,10 @@ QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme) { const QFont font(QStringLiteral("Segoe UI")); if (font.exactMatch()) { - systemFont.setFamily(font.family()); - groupBoxTitleFont.setFamily(font.family()); - tabButtonFont.setFamily(font.family()); + const QString family = font.family(); + systemFont.setFamily(family); + groupBoxTitleFont.setFamily(family); + tabButtonFont.setFamily(family); } systemFont.setPixelSize(15); -- cgit v1.2.3