Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 09:00:01 +0000 (19:00 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 09:00:01 +0000 (19:00 +1000)
commitf15c1fff3f4d4f2b3e0f25d986f0b190c194f9fb
treedd4fa1be89b673bcc9b96dcc621a8d1d9ee18993
parent33558a886da1aba53b7c01ae0a8b3f9ba5bf0614
parent80a230e221402e77c1ece2f1d37e4fe5755d26db
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix QPainter::drawGlyphs() with non-affine transformation