diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:27 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:39 +0100 |
| commit | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (patch) | |
| tree | 897cf6bfb1814b0935982ff5975a6cbfb48d6d9e /src/plugins/platforms/cocoa/qcocoatheme.mm | |
| parent | 3d19422ef16a230bb11dbbfe4a8cc9667f39bf15 (diff) | |
| parent | 6c612c933803ef57ea45e907d0181b40659148ac (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: I89dc2e193bd01624c1fb50484610d516e39b1538
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoatheme.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 6b0e04acf8..8ec6e3801e 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -109,12 +109,23 @@ const QPalette *QCocoaTheme::palette(Palette type) const if (type == SystemPalette) { if (!m_systemPalette) m_systemPalette = qt_mac_createSystemPalette(); - return m_systemPalette; + } else { + if (m_palettes.isEmpty()) + m_palettes = qt_mac_createRolePalettes(); + return m_palettes.value(type, 0); } return 0; } +const QFont *QCocoaTheme::font(Font type) const +{ + if (m_fonts.isEmpty()) { + m_fonts = qt_mac_createRoleFonts(); + } + return m_fonts.value(type, 0); +} + QVariant QCocoaTheme::themeHint(ThemeHint hint) const { switch (hint) { |