diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 13:11:30 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 13:11:30 (GMT) |
| commit | 3263f8036128cc4403cf6383324f5390eecee13b (patch) | |
| tree | 227ea1dfe86b9297cf7808b5b304a039c438e1fe /src/gui/text/qfontdatabase.cpp | |
| parent | 4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff) | |
| parent | 0faab4442040fdfe3790e3c02808fd45993f0265 (diff) | |
| download | Qt-3263f8036128cc4403cf6383324f5390eecee13b.zip Qt-3263f8036128cc4403cf6383324f5390eecee13b.tar.gz Qt-3263f8036128cc4403cf6383324f5390eecee13b.tar.bz2 | |
Merge branch 'qt-graphics-team-text-master'
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 bae2a20..ec94de9 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 { |