From da616ffa54f22f3334f555ea0bdffe9521145b0b Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 30 Oct 2013 01:05:59 +0100 Subject: Revert "Return the correct system font on OS X Mavericks." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix is broken and a working solution will replace it shortly. This reverts commit 7c4c43afb36449c9fb2d281327423df8eb916d64 Change-Id: I764e7da6e7a52916b87650483271d9aed099ed2b Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qt_mac.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp index ef0df5f..5d9c03e 100644 --- a/src/gui/kernel/qt_mac.cpp +++ b/src/gui/kernel/qt_mac.cpp @@ -67,13 +67,6 @@ QFont qfontForThemeFont(ThemeFontID themeID) #else QCFType ctfont = CopyCTThemeFont(themeID); QString familyName = QCFString(CTFontCopyFamilyName(ctfont)); - - // Fix for the new private UI font on Mavericks - if (familyName == QLatin1String(".Lucida Grande UI")) - familyName = QLatin1String("Lucida Grande"); - else if (familyName.startsWith(QLatin1String("."))) - qWarning("Qt: qfontForThemeFont: encountered unknown private system font: %s", familyName.toLatin1().constData()); - QCFType dict = CTFontCopyTraits(ctfont); CFNumberRef num = static_cast(CFDictionaryGetValue(dict, kCTFontWeightTrait)); float fW; -- cgit v0.12