Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 19 Nov 2010 17:57:02 +0000 (18:57 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 19 Nov 2010 17:57:02 +0000 (18:57 +0100)
commit0cfa6daa4776cd78370e644fae3005ae432b83c7
tree477925717dbd19a94f1763c0e14a66f75cfeb91f
parentd11e18b654de3c9e36455b5d6447a9d6273a6e2a
parentc82ba87a0e8e416099e95898386ea25c790c3da3
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc: Fixing typo.
  Fix possible missing glyphs in raster engine glyph cache
  Fix possible corrupted text when gl glyph cache becomes full
  Check correctly before including SSE4.2 header.
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine