From 69f7115c43ef17c2d8ff3f7842e64b539da94dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 18 Dec 2018 13:17:45 +0100
Subject: macOS: Merge qt_mac_createRoleFonts into only caller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id6e61a70e4ebe47896dcbc8680d1d6b06c747871
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/cocoa/qcocoatheme.mm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index 240deeddbd..c46df25b66 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -228,16 +228,12 @@ const QPalette *QCocoaTheme::palette(Palette type) const
     return nullptr;
 }
 
-QHash<QPlatformTheme::Font, QFont *> qt_mac_createRoleFonts()
-{
-    QCoreTextFontDatabase *ctfd = static_cast<QCoreTextFontDatabase *>(QGuiApplicationPrivate::platformIntegration()->fontDatabase());
-    return ctfd->themeFonts();
-}
-
 const QFont *QCocoaTheme::font(Font type) const
 {
     if (m_fonts.isEmpty()) {
-        m_fonts = qt_mac_createRoleFonts();
+        const auto *platformIntegration = QGuiApplicationPrivate::platformIntegration();
+        const auto *coreTextFontDb = static_cast<QCoreTextFontDatabase *>(platformIntegration->fontDatabase());
+        m_fonts = coreTextFontDb->themeFonts();
     }
     return m_fonts.value(type, nullptr);
 }
-- 
cgit v1.2.3