projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b344f19 0f0df28)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 11 Jan 2011 08:41:33 +0000 (18:41 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 11 Jan 2011 08:41:33 +0000 (18:41 +1000)
commit5d15fe23559e88a61995ad4f0c19795869fc2a0a
tree8bc3a62f270aa9112f961d55e56860d3d738f061tree | snapshot
parentb344f1933252ba34c73d03958550eb73746963e9commit | diff
parent0f0df28061c399d4d62a518e9a68ddbd1faa4de5commit | diff
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:
  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
6b46b7419a5aee9bd5fce67b7bfa8afe8e