From a4ff400e25c76a32ec8252285dda043f07b19c15 Mon Sep 17 00:00:00 2001 From: Fabian Bumberger Date: Thu, 9 Jan 2014 01:57:41 +0100 Subject: 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 Reviewed-by: Simon Hausmann --- tests/auto/gui/text/qfontdatabase/LED_REAL.TTF | Bin 0 -> 4708 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/auto/gui/text/qfontdatabase/LED_REAL.TTF (limited to 'tests/auto/gui/text/qfontdatabase/LED_REAL.TTF') diff --git a/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF b/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF new file mode 100644 index 0000000000..f87ea95e0e Binary files /dev/null and b/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF differ -- cgit v1.2.3