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, 31 Mar 2010 10:55:09 +0000 (12:55 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 31 Mar 2010 10:55:09 +0000 (12:55 +0200)
commitb2d8bca28e1ea485c9ebbe02566cc099c33d8458
tree3b6bcb0107d2c78491a92ca81b4d5a0e052135ed
parent287a8d25b0e13602d02abc301e64060f46fff0e9
parentca51a4aab9f6b91b034a3b269718165b56883285
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:
  Allow attributes to be bound after a QGLShaderProgram is linked.