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 14:05:46 +0000 (00:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 14:05:46 +0000 (00:05 +1000)
commitde47cd9b668d4c43b26f21cc05a37399f4a5be12
tree1edc25bd9368818f75cfb72cc15a28c2296debd6
parent629428a3c20b4a4ed1bde7ac748b1a84333ecc39
parent4135b6b3235d0a87dce586300b54ec4355cc98ca
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 QRawFont::setPixelSize() on Mac