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>
Thu, 18 Nov 2010 15:53:04 +0000 (16:53 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Nov 2010 15:53:04 +0000 (16:53 +0100)
commit06d60696fcc88f058b53d08785cc01a580dfb4ed
treede9bc473225b58ab413d9002b4ad811ddf742673
parent4082e4711a1c54947429b15504caf778c6da22d0
parent9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456
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:
  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