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, 15 Sep 2010 00:56:37 +0000 (02:56 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 15 Sep 2010 00:56:37 +0000 (02:56 +0200)
commitec6777f809983a80f3258417769afd495a834b43
tree751ffafc3570ef37eeb591057c70622fb75f5380
parent05eb27a2007ebc1cae40c6331ee8b4d2fb76c1d9
parentcb764eaf91e3a8ef30b280671d5c991ec926d14c
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:
  Prevent crash in QGLGlyphCache due to dangling context references.