diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-01-05 19:39:00 +0100 |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-01-06 13:50:48 +0100 |
| commit | 18447df1d021cfed69472b867cb7593401be27a6 (patch) | |
| tree | 69406c23ec173d51f5ce3d5259d3638e0cdf0fad /src/gui/text/qfontdatabase.cpp | |
| parent | 09b06552f98f8ee8be4d156049a6a37a4abed6bd (diff) | |
Make application font family names locale sensitive in X11
So that they will match the family names returned by
QFontDatabase::families. Because the family names returned
by FcFreeTypeQueryFace are not sorted with locale as the
names returned by FcFontList, we have to find out the
family name matching the system language in the former case.
Task-number: QTBUG-14269
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index bae2a209a6..ec94de970e 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -664,6 +664,9 @@ public: } int count; +#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG) + QString systemLang; +#endif QtFontFamily **families; struct ApplicationFont { |