whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Merge qt_mac_createRoleFonts into only caller 

Change-Id: Id6e61a70e4ebe47896dcbc8680d1d6b06c747871
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Tor Arne Vestbø 2018-12-18 13:17:45 +01:00
parent 8915c9715a
commit 69f7115c43
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/cocoa/qcocoatheme.mm
View File

@ -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);
}