diff options
author | Fabian Bumberger <fbumberger@rim.com> | 2014-01-09 01:57:41 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-28 19:32:40 +0100 |
commit | a4ff400e25c76a32ec8252285dda043f07b19c15 (patch) | |
tree | e0131340c8313c1e667e05e7a51ff7f4930d86ec /tests/auto/gui/text/qfontdatabase/LED_REAL.TTF | |
parent | 22ec4ed86664ab795d2fa47245645b6a73018039 (diff) |
Fix application font removal when using FontConfig
This patch fixes an issue when a font that was added with QFontDatabase::addApplicationFont
can not be removed any more.
The reason for that is that QFontconfigDatabase::addApplicationFont adds the font to the FontConfig
application set from where it cannot be removed any more and is picked up every time the font database is
repopulated (e.g. after a call to QFontDatabase::removeApplicationFont).
This also fixes the QFontDatabase autotest which unfortunately does not fail on linux, because it tries
to add "FreeMono" (which in most cases is already there as a system font). So this patch removes FreeMono and adds
LED_REAL as test font.
Change-Id: I2fa5f4df0ad2099ac28673760ea25234c725dfc6
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/gui/text/qfontdatabase/LED_REAL.TTF')
-rw-r--r-- | tests/auto/gui/text/qfontdatabase/LED_REAL.TTF | bin | 0 -> 4708 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF b/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF Binary files differnew file mode 100644 index 0000000000..f87ea95e0e --- /dev/null +++ b/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF |