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>
Tue, 12 Oct 2010 11:00:27 +0000 (13:00 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 12 Oct 2010 11:00:27 +0000 (13:00 +0200)
commitf863591b4e4aaddb65ea7119dda0d04aa13753b5
tree7c7053c7e3b3eef6b688656fc4d2868cfe9737e2
parentb892a9a83181baabc755919b86feaed83677384e
parent8bac84cba1cc1de4c3d0b87772168184a2540076
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:
  Revert "Don't define highp/mediump/lowp if desktop GL has them"