AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for fontconfig 2.9 behavior change

Browse Source 
Start from 2.9, fontconfig will reset the result to FcResultNoMatch at
the beginning of FcFontSort().

According to
http://lists.freedesktop.org/archives/fontconfig/2012-March/003857.html
the result value of FcFontSort() can be ignored, checking the nfont
value of the fontset returned is sufficient.

The fix works for pre-2.9 versions as well, since those versions don't
touch the result at all.

Change-Id: Iba6c1157e314088a90867292a4bd970bb873e284
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
This commit is contained in:
Jiang Jiang 2012-03-22 13:14:24 +01:00 committed by Qt by Nokia
parent cb33c3b2b6
commit 3c3c445daf
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
View File

@ -641,17 +641,15 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString family, const
FcPatternDestroy(pattern); FcPatternDestroy(pattern);
if (fontSet) { if (fontSet) {
if (result == FcResultMatch) { for (int i = 0; i < fontSet->nfont; i++) {
for (int i = 0; i < fontSet->nfont; i++) { FcChar8 *value = 0;
FcChar8 *value = 0; if (FcPatternGetString(fontSet->fonts[i], FC_FAMILY, 0, &value) != FcResultMatch)
if (FcPatternGetString(fontSet->fonts[i], FC_FAMILY, 0, &value) != FcResultMatch) continue;
continue; // capitalize(value);
// capitalize(value); QString familyName = QString::fromUtf8((const char *)value);
QString familyName = QString::fromUtf8((const char *)value); if (!fallbackFamilies.contains(familyName,Qt::CaseInsensitive) &&
if (!fallbackFamilies.contains(familyName,Qt::CaseInsensitive) && familyName.compare(family, Qt::CaseInsensitive)) {
familyName.compare(family, Qt::CaseInsensitive)) { fallbackFamilies << familyName;
fallbackFamilies << familyName;
}
} }
} }
FcFontSetDestroy(fontSet); FcFontSetDestroy(fontSet);