whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manually add Emoji font to fallback list on Mac OS 

It's not part of the fallback list we read from the plist file.

Change-Id: Ieaf306d4cd51a6bb6e6f41048876d3e674a4b99b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
bb10
Tor Arne Vestbø 2013-02-13 14:30:26 +01:00 committed by The Qt Project
parent 8b06b4136f
commit 603e188273
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

@ -395,6 +395,8 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
if (fallbackLists.contains(family))
return fallbackLists.value(family);
}
#else
Q_UNUSED(family);
#endif
// We were not able to find a fallback for the specific family,
@ -428,6 +430,10 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
else if ([item isKindOfClass: [NSString class]])
fallbackList.append(familyNameFromPostScriptName(psNameToFamily, item));
}
if (QCoreTextFontEngine::supportsColorGlyphs())
fallbackList.append(QLatin1String("Apple Color Emoji"));
fallbackLists[styleLookupKey.arg(fallbackStyleHint)] = fallbackList;
}
#else