diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-11 15:31:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-11 15:31:59 (GMT) |
| commit | 0a2637b846c4bae5f0fe8eb50587c4b3194ae1e7 (patch) | |
| tree | 2bdeb852340d9ffc068dcc6189f87909b79b71d8 /src/gui/text/qfontdatabase.cpp | |
| parent | 42f3142df03bc978a99fb0c41cd23c8b5a99569c (diff) | |
| parent | 1e4197d2f2994d524116761046626bd430a2df3f (diff) | |
| download | Qt-0a2637b846c4bae5f0fe8eb50587c4b3194ae1e7.zip Qt-0a2637b846c4bae5f0fe8eb50587c4b3194ae1e7.tar.gz Qt-0a2637b846c4bae5f0fe8eb50587c4b3194ae1e7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Only test control character handling in X11
Compile when qreal != double
Make application font family names locale sensitive in X11
Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
Add line spacing to QTextBlockFormat, get/set functions, CSS support
Optimize texture glyph cache
Disable certain GPOS features by default
Move advances for control character in Indic syllable shaping
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 { |