projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b53ea89 d3d3f5b)
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 01:44:27 +0000 (11:44 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 11 Jan 2011 01:44:27 +0000 (11:44 +1000)
commit0f0df28061c399d4d62a518e9a68ddbd1faa4de5
tree6f7d7e574e23e44eea7601d0fa30e32cbbfdc966tree | snapshot
parentb53ea893caf1626a1ebfd61545525d101f1c2833commit | diff
parentd3d3f5bc99108b622a93ed54f19ea7285d84f7f9commit | 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