diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-10-30 00:05:59 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 10:49:03 (GMT) |
| commit | da616ffa54f22f3334f555ea0bdffe9521145b0b (patch) | |
| tree | a4e98f66c52e0697909490a5f44ce9a4e8d888bf | |
| parent | 41621a2915e43a1b2defd8b8b767af8783e8ef7c (diff) | |
| download | Qt-da616ffa54f22f3334f555ea0bdffe9521145b0b.zip Qt-da616ffa54f22f3334f555ea0bdffe9521145b0b.tar.gz Qt-da616ffa54f22f3334f555ea0bdffe9521145b0b.tar.bz2 | |
Revert "Return the correct system font on OS X Mavericks."
This fix is broken and a working solution will replace it shortly.
This reverts commit 7c4c43afb36449c9fb2d281327423df8eb916d64
Change-Id: I764e7da6e7a52916b87650483271d9aed099ed2b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| -rw-r--r-- | src/gui/kernel/qt_mac.cpp | 7 |
1 files changed, 0 insertions, 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<CTFontRef> 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<CFDictionaryRef> dict = CTFontCopyTraits(ctfont); CFNumberRef num = static_cast<CFNumberRef>(CFDictionaryGetValue(dict, kCTFontWeightTrait)); float fW; |