Fix symbol fonts support with FT engine
authorJiang Jiang <jiang.jiang@nokia.com>
Thu, 10 Nov 2011 18:04:14 +0000 (19:04 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 11 Nov 2011 15:47:23 +0000 (16:47 +0100)
commitd495d86110c8579253393eadfd83548c49a5cf2f
tree379cac483766757cb8b2214e8624888290c89103
parent89cfe9eb01ad75c14121dbd6038b7c791226acf1
Fix symbol fonts support with FT engine

It appears that the symbol_map we obtained with FreeType doesn't
work for common symbol fonts like Wingdings, in previous X11 code
we use the code path with normal charmap, to enable it we need to
make sure QT_NO_FONTCONFIG is not defined. And since the FcCharset
functions doesn't really operates on the font database, we can
safely skip the mutex calls.

Change-Id: I8c484de200be1d47c053b10be2c51d2273dcd359
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
src/gui/text/qfontengine_ft.cpp
src/platformsupport/fontdatabases/fontconfig/fontconfig.pri
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp