Parent SHA1:d43d9c0 (Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration)
Parent SHA1:dd1a2ad (Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Performance: Use QImage's smoothscaling instead of old private code