aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-03-28 11:10:51 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-03-28 20:50:19 +0000
commit73ca0cff27aac15fd7e8eff0ed51657aed6a0da1 (patch)
tree532286b85e485b8aaf209f932b54f14187db0074
parente9b9a41723e859d06a94f7e6c7a3d6a130631abe (diff)
Themes: cache result of QFont::family()
Change-Id: I5318a61dbb699e2f251d218e614c1a2ff02d53a7 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r--src/imports/controls/material/qquickmaterialtheme.cpp11
-rw-r--r--src/imports/controls/universal/qquickuniversaltheme.cpp7
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);