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>
Mon, 25 Oct 2010 22:02:42 +0000 (00:02 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 25 Oct 2010 22:02:42 +0000 (00:02 +0200)
commitef704ebad66559170d761459d42d6c99996db529
treee7772e3e9fec69d2816d36c5bb73441facf7d06b
parent667d94f6ab824a9b56c28943f02054467741e070
parent4117403ad5170110849b7d0663337b1571304a8e
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:
  Simplify calculation of center point and scale for PinchRecongizer
  Doc: Fixing typo
  QtDFB: Make transparent windows behave better
  For meego graphics system, use floyd-steinberg dithering when converting to 16bit.
  Added support for blitting to native child widgets in GL window surface.
src/opengl/qwindowsurface_gl.cpp