Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Jan 2011 14:00:36 +0000 (00:00 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Jan 2011 14:00:36 +0000 (00:00 +1000)
commitd888b168932fbdc65881ced1aa55165f286ea6d2
tree0e24b77785255d4dff8f6a8545c5b373d67449c4
parentb089db709ba5e97b444db13a86b7fe2f4f063348
parenta53e579a388c6bca6374b56328622bc8c1e0f138
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Mac: pixmaps dont treat alpha exactly the same as other platforms