Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 11:47:06 +0000 (21:47 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 11:47:06 +0000 (21:47 +1000)
commite6d2e23a0694146e4050560f2fb8100f40188597
tree34336c7248d865363216f8b0d97706e1892c099c
parent35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5
parentd4b722868bbd2b228a877e15e5ca44dd9ad8d94c
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix rendering of Mac controls onto a QImage