1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UIKit: Don't populate font families with no matching fonts

Browse Source 
[UIFont familyNames] will return a list of fonts that include the fonts
Telugu Sangam MN, Heiti SC, Heiti TC, and Bangla Sangam MN, but when
calling [UIFont fontNamesForFamilyName:] for these fonts we get an
empty list.

The problem appeared when we tried to then populate these fonts, as
CTFontDescriptorCreateMatchingFontDescriptors() would return a list
of font descriptors from the PingFang SC font when called with
NSFontFamilyAttribute = "Heiti SC". This is due to PingFang being a
replacement for Heiti in later iOS versions.

Task-number: QTBUG-50624
Change-Id: I22684e247d472c30775321b6976b3aeb6ea579f5
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Tor Arne Vestbø 2016-06-08 16:47:31 +02:00 committed by Tor Arne Vestbø
parent 91bf773b18
commit e5e93345c5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
View File

@ -206,6 +206,12 @@ void QCoreTextFontDatabase::populateFontDatabase()
if (familyName.startsWith(QLatin1Char('.')) || familyName == QLatin1String("LastResort"))
continue;
#if defined(Q_OS_IOS) || defined(Q_OS_TVOS)
// Skip font families with no corresponding fonts
if (![UIFont fontNamesForFamilyName:(NSString*)familyNameRef].count)
continue;
#endif
QPlatformFontDatabase::registerFontFamily(familyName);
#if defined(Q_OS_OSX)