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>
Wed, 1 Jun 2011 23:48:33 +0000 (09:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 1 Jun 2011 23:48:33 +0000 (09:48 +1000)
commitd031b1aba3110776de4b70f8ffcb828f60b8b654
tree581da27112d97033b037b1af1e2395345ec84f41
parent16fdbcd175d29373a662dc9fb3606b26fc81c9c1
parent348894a550510e54e7709d18676b4b10c9e5e9e3
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:
  Avoid buffer overrun in QMacPixmapData resizing
  Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
  Missing glyphs transforming QStaticText on X11/raster with subpixel AA
  Fixed clipping errors for non-extended paint engines.