Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 Aug 2010 09:03:25 +0000 (11:03 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 Aug 2010 09:03:25 +0000 (11:03 +0200)
commite5aa5a9d7e97b975316b8cc18554743cccf06474
tree10ce08f34b15e632543bed91634b7e9799d982b2
parent76680eff3fbbdaace80bdb89f68e678c4c99e492
parent3c2dc7f652996d1f3b504b42d872734df2e9234f
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  WGL_COLOR_BITS_ARB should not take the alpha bits into account.