Fix application font loading in basic font db
authorJiang Jiang <jiang.jiang@nokia.com>
Thu, 10 Nov 2011 17:01:56 +0000 (18:01 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 11 Nov 2011 15:47:23 +0000 (16:47 +0100)
commit89cfe9eb01ad75c14121dbd6038b7c791226acf1
treec04cc62a2a6f35d7522220a7f024c3a2190d827f
parentf02c2389ee02ea14adbdf6a76a484dd638326aa9
Fix application font loading in basic font db

We need to reregister fonts in initializeDb because basic font db
doesn't have an internal record like fontconfig does, so just
repopulating the font database won't work. db->reregisterAppFonts
is now used properly as intended (reregister application fonts
after the system font database has been cleared).

Also, static variable 'initialized' in initializeDb() is removed
since we check privateDb()->count to see if it needs to be populated
again.

Task-number: QTBUG-22063

Change-Id: Ifc66392b56b72acbe08b99256c61421c204be5d7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
src/gui/text/qfontdatabase_qpa.cpp