Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Oct 2010 17:23:57 +0000 (19:23 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Oct 2010 17:23:57 +0000 (19:23 +0200)
commit4809920df3c3329d47f595c1287ab44b454abb88
treeaffbce24e8018cdf82857ca2368f0d132bd4a20c
parent6a786ab4bb4a5e1d80ce511461f2018237f1614a
parentf0c1f381af7d6338ded9f65d00ed54b1b9405ba9
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add missing data for the autotest of in-place conversion for Pixmap
  Avoid in-place convertion of images with multiple references
  Fix infinite loop when justifying undisplayable Arabic text