diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
| commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
| tree | 3de2560e4259f22224f334be17618386860decc7 /src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | |
| parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
| parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 14ae32d55a..8c3ca2d229 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -545,6 +545,14 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, QChar::Script sc } } + if (antialias) { + // If antialiasing is not fully disabled, fontconfig may still disable it on a font match basis. + FcBool fc_antialias; + if (FcPatternGetBool(match, FC_ANTIALIAS,0, &fc_antialias) != FcResultMatch) + fc_antialias = true; + antialias = fc_antialias; + } + if (f.hintingPreference == QFont::PreferDefaultHinting) { const QPlatformServices *services = QGuiApplicationPrivate::platformIntegration()->services(); if (services && (services->desktopEnvironment() == "GNOME" || services->desktopEnvironment() == "UNITY")) { |