Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 13:43:18 +0000 (15:43 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 13:43:18 +0000 (15:43 +0200)
commitfeb23c057b81210c1a46eee114c5c55a96197205
tree35e419ac314b627ded2f1c0c0a4aca6e108677b7
parent8f011df08139bea59c12ae0804969334a9374dc8
parent3f74a095086f49be23f526a5adc7e65687a19c31
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix regression with Qt::AlignRight on monospaced text in QTextLayout
  Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f