From 74cade1ee42dbe15d3242b08d5880e08e6294e2e 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: I70fc823075923aa426da1eb3e052affcc416e399 Reviewed-by: Konstantin Ritt --- tests/auto/gui/text/qfontdatabase/FreeMono.ttf | Bin 267400 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/auto/gui/text/qfontdatabase/FreeMono.ttf (limited to 'tests/auto/gui/text/qfontdatabase/FreeMono.ttf') diff --git a/tests/auto/gui/text/qfontdatabase/FreeMono.ttf b/tests/auto/gui/text/qfontdatabase/FreeMono.ttf deleted file mode 100644 index d7ce52ddc7..0000000000 Binary files a/tests/auto/gui/text/qfontdatabase/FreeMono.ttf and /dev/null differ -- cgit v1.2.3