From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Thu, 5 May 2011 11:42:44 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4351
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=948d5f22c309899657a9397e516d5892b02804c0;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:
  Only enable design metrics for scalable fonts
  Add a way to retrieve CTFontRef from QFont
---

948d5f22c309899657a9397e516d5892b02804c0