From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Fri, 6 May 2011 14:05:46 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4341
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de47cd9b668d4c43b26f21cc05a37399f4a5be12;p=profile%2Fivi%2Fqtbase.git

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
---

de47cd9b668d4c43b26f21cc05a37399f4a5be12