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 18:16:21 +0000 (20:16 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 18:16:21 +0000 (20:16 +0200)
commit8e8844a1d3e9be22f84ef2b22312dd261a911092
tree2185c82f877afbde2e8af6ab99c8731cdf9f85d1
parent02f3facbc114fdc1e12cb0abf5be7b0cf42ce0a4
parentfeb23c057b81210c1a46eee114c5c55a96197205
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