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>
Fri, 8 Apr 2011 17:21:34 +0000 (03:21 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Apr 2011 17:21:34 +0000 (03:21 +1000)
commit43c831fb56b9e1cff95b21c210bd85f5b67c99b1
treeab1fecd8e25f6bc64eac5c0d3279fae6cec42afb
parentc392cb990ea27e4fa81683b3b2bcae844fad3039
parent32372616ed942685c7367d6aee58a7fd3849cc0b
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:
  Let's not write to the source buffer when blending argb32 on rgb16.