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>
Fri, 13 Aug 2010 02:17:41 +0000 (04:17 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 Aug 2010 02:17:41 +0000 (04:17 +0200)
commit1534ac035f0dc5ca82e84ecbb79d2f50e689e34a
tree24188deb06c3c13ac5c64f8c8d521659de41caf6
parent574845691eec14d4df0d13bb182a83c997546150
parentf37b6a4cd767817ab699c5baeb40c23ad8172a7b
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:
  Don't define highp/mediump/lowp if desktop GL has them