Parent SHA1:7474ad6 (Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration)
Parent SHA1:622446f (Add QMacCompatGLenum overrides for new QGLShaderProgram functions)
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:
Add QMacCompatGLenum overrides for new QGLShaderProgram functions