diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-02-15 15:06:00 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 05:26:34 +0100 |
| commit | 2801db558c56e98753e297c1aeabd4fd2975e09a (patch) | |
| tree | 14726483adef27b2e19f67ee0a4a0d2ef1a577a9 /src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | |
| parent | 4212898822f1798dac0167e4f6a147bd8a3b3dcc (diff) | |
Avoid loading and keeping unused fallback font engines
When we request glyphs from fallback fonts, we would potentially
load all fonts on the system into memory. This is especially true
for glyphs that are not supported by any font (or by the last in
the list) in any "Common" script (which e.g. includes CJK).
This would make any application which tried to display unsupported
glyphs use huge amounts of memory for keeping unused fonts cached,
only limited by the number of fonts on the system.
The patch contains two solutions: First, before loading the font,
the multi font engine will be asked whether it needs to be tried
for the given character. By default, this will always be true, so
all fonts will be tried, but with the new font config multi engine
in the platform plugin, it will ask FontConfig whether the font
contains a glyph for the character.
Should the font be loaded and still fail to resolve the character
(which could be the case for other platforms), we will simply
delete it again immediately instead keeping it cached.
Change-Id: I92dfb39289a359f49caa02c2caf8baf66098fb59
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/fontconfig/fontconfig.pri')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri index 7ea1c64e33..2c896ef2cc 100644 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri @@ -1,3 +1,5 @@ -HEADERS += $$PWD/qfontconfigdatabase_p.h -SOURCES += $$PWD/qfontconfigdatabase.cpp +HEADERS += $$PWD/qfontconfigdatabase_p.h \ + fontdatabases/fontconfig/qfontenginemultifontconfig_p.h +SOURCES += $$PWD/qfontconfigdatabase.cpp \ + fontdatabases/fontconfig/qfontenginemultifontconfig.cpp DEFINES -= QT_NO_FONTCONFIG |