diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2016-04-27 15:09:55 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2016-04-27 20:20:10 +0000 |
| commit | 6493bcaf3ca4d233be4f3bfd8d16d860f47e8aa7 (patch) | |
| tree | 85ed597e14e95b011351e63f9a1928934b1231ce /src/platformsupport | |
| parent | fa93c7c7b05d0b41bb0d8c8f285925b27ec28cb4 (diff) | |
Check for required capability only when FC_CAPABILITY is available
If, by some reason, querying FC_CAPABILITY has failed,
believe FC_LANG unconditionally.
Change-Id: Idf94150359dff555f2a50ccaf146722407f43477
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 5305b8b970..fc04f3ab79 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -441,7 +441,7 @@ static void populateFromPattern(FcPattern *pattern) && requiresOpenType(j) && openType[j]) { FcChar8 *cap; res = FcPatternGetString (pattern, FC_CAPABILITY, 0, &cap); - if (res != FcResultMatch || !strstr((const char *)cap, openType[j])) + if (res == FcResultMatch && strstr(reinterpret_cast<const char *>(cap), openType[j]) == 0) writingSystems.setSupported(QFontDatabase::WritingSystem(j),false); } } |