diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 10:32:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 10:32:02 (GMT) |
commit | b089db709ba5e97b444db13a86b7fe2f4f063348 (patch) | |
tree | 33ea78f80322c5a5a39491f6d30f4c22dc6a9853 /util/unicode/.gitattributes | |
parent | 6e16cc33983c9ed2c8362f0d31ef712df7949375 (diff) | |
parent | eaf2e2187d9fec2102e3301098f85efe93518761 (diff) | |
download | Qt-b089db709ba5e97b444db13a86b7fe2f4f063348.zip Qt-b089db709ba5e97b444db13a86b7fe2f4f063348.tar.gz Qt-b089db709ba5e97b444db13a86b7fe2f4f063348.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:
Doc: Fixing typo
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 'util/unicode/.gitattributes')
0 files changed, 0 insertions, 0 deletions