diff options
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.h | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 10 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiostheme.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiostheme.mm | 10 |
4 files changed, 6 insertions, 17 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h index 436ed94351..1151f56bf8 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.h +++ b/src/plugins/platforms/cocoa/qcocoatheme.h @@ -89,7 +89,6 @@ private: mutable QPalette *m_systemPalette; QMacNotificationObserver m_systemColorObserver; mutable QHash<QPlatformTheme::Palette, QPalette*> m_palettes; - mutable QHash<QPlatformTheme::Font, QFont*> m_fonts; QMacKeyValueObserver m_appearanceObserver; }; diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index dfc1c8197b..cbea578cf9 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -297,7 +297,6 @@ QCocoaTheme::QCocoaTheme() QCocoaTheme::~QCocoaTheme() { reset(); - qDeleteAll(m_fonts); } void QCocoaTheme::reset() @@ -370,12 +369,9 @@ const QPalette *QCocoaTheme::palette(Palette type) const const QFont *QCocoaTheme::font(Font type) const { - if (m_fonts.isEmpty()) { - const auto *platformIntegration = QGuiApplicationPrivate::platformIntegration(); - const auto *coreTextFontDb = static_cast<QCoreTextFontDatabase *>(platformIntegration->fontDatabase()); - m_fonts = coreTextFontDb->themeFonts(); - } - return m_fonts.value(type, nullptr); + const auto *platformIntegration = QGuiApplicationPrivate::platformIntegration(); + const auto *coreTextFontDatabase = static_cast<QCoreTextFontDatabase *>(platformIntegration->fontDatabase()); + return coreTextFontDatabase->themeFonts().value(type, nullptr); } //! \internal diff --git a/src/plugins/platforms/ios/qiostheme.h b/src/plugins/platforms/ios/qiostheme.h index c9d833713d..594031599a 100644 --- a/src/plugins/platforms/ios/qiostheme.h +++ b/src/plugins/platforms/ios/qiostheme.h @@ -68,8 +68,6 @@ public: static void initializeSystemPalette(); private: - mutable QHash<QPlatformTheme::Font, QFont *> m_fonts; - static QPalette s_systemPalette; }; diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm index 584dd1c8fc..9131963818 100644 --- a/src/plugins/platforms/ios/qiostheme.mm +++ b/src/plugins/platforms/ios/qiostheme.mm @@ -70,7 +70,6 @@ QIOSTheme::QIOSTheme() QIOSTheme::~QIOSTheme() { - qDeleteAll(m_fonts); } QPalette QIOSTheme::s_systemPalette; @@ -170,12 +169,9 @@ QVariant QIOSTheme::themeHint(ThemeHint hint) const const QFont *QIOSTheme::font(Font type) const { - if (m_fonts.isEmpty()) { - QCoreTextFontDatabase *ctfd = static_cast<QCoreTextFontDatabase *>(QGuiApplicationPrivate::platformIntegration()->fontDatabase()); - m_fonts = ctfd->themeFonts(); - } - - return m_fonts.value(type, 0); + const auto *platformIntegration = QGuiApplicationPrivate::platformIntegration(); + const auto *coreTextFontDatabase = static_cast<QCoreTextFontDatabase *>(platformIntegration->fontDatabase()); + return coreTextFontDatabase->themeFonts().value(type, nullptr); } QT_END_NAMESPACE |