Revert "Fix application font removal when using FontConfig"

This reverts commit a4ff400e25c76a32ec8252285dda043f07b19c15.
The patch caused a regression for bold fonts which is currently
blocking the alpha of Qt 5.3, so lets revert it and try
resubmitting a fixed version later to avoid delaying any release.

Task-number: QTBUG-36929
Change-Id: I8d474b09b2270eb2f861853e60605429be08e2d9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

4 files changed, 1 insertions, 35 deletions

diff --git a/tests/auto/gui/text/qfontdatabase/FreeMono.ttf b/tests/auto/gui/text/qfontdatabase/FreeMono.ttf
new file mode 100644
index 0000000000..d7ce52ddc7
--- /dev/null
+++ b/tests/auto/gui/text/qfontdatabase/FreeMono.ttf
diff --git a/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF b/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF
deleted file mode 100644
index f87ea95e0e..0000000000
--- a/tests/auto/gui/text/qfontdatabase/LED_REAL.TTF
+++ /dev/null
diff --git a/tests/auto/gui/text/qfontdatabase/LED_REAL_readme.txt b/tests/auto/gui/text/qfontdatabase/LED_REAL_readme.txt
deleted file mode 100644
index 06a5b40313..0000000000
--- a/tests/auto/gui/text/qfontdatabase/LED_REAL_readme.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Font: LED Real (led_real.ttf)
-Created By: Matthew Welch
-E-Mail: daffy-duck@worldnet.att.net
-Web Address: http://home.att.net/~daffy-duck
-             (PGP public key available here)
-
-LED Real, like all of my fonts, is free.  You can use it for most
-personal or business uses you'd like, and I ask for no money.  I
-would, however, like to hear from you.  If you use my fonts for
-something please send me a postcard or e-mail letting me know how
-you used it.  Send me a copy if you can or let me know where I can
-find your work.
-
-You may use this font for graphical or printed work, but you may not
-sell it or include it in a collection of fonts (on CD or otherwise)
-being sold. You can redistribute this font as long as you charge
-nothing to receive it. If you redistribute it include this text file
-with it as is (without modifications).
-
-If you use this font for commercial purposes please credit me in
-at least some little way.
-
-About the font:
-
-Unlike most LED/LCD style fonts mine could be recreated with an
-actual LED.  I created this font working from memories of the good
-old Speak and Spell display.  Since I don't have an actual Speak
-and Spell to work from I had to just do as well as I could in its
-spirit.  Be warned that some characters look just like others.  The
-( and the <, for instance.  Also C and [.  Most of these will be
-pretty clear in context.  To see all the sections of the LED "lit
-up" at once use character 127 (hold down alt and type 0127 on the
-numeric keypad).  This font is, of course, monospaced.
-
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 28db0ba291..fa5c81a2f0 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -83,7 +83,7 @@ private:
 };
 
 tst_QFontDatabase::tst_QFontDatabase()
-    : m_testFont(QFINDTESTDATA("LED_REAL.TTF"))
+    : m_testFont(QFINDTESTDATA("FreeMono.ttf"))
 {
 }