summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-13 14:30:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-16 05:08:03 +0100
commit603e1882736f77102cebec67729aca8464de958c (patch)
treea02d277eb725fc3783213214e30e257e8d563de5 /src/platformsupport
parent8b06b4136fdf3b20c96389434b737eec00f174ff (diff)
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>
Diffstat (limited to 'src/platformsupport')
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index cf094078cb..aec32e1bca 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -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