Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 11:42:44 +0000 (21:42 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 11:42:44 +0000 (21:42 +1000)
commit948d5f22c309899657a9397e516d5892b02804c0
treeb1459a45a2a94bdb01e9363c6ad70cc8b8716758
parentfad9bc150608768923cf15a4478c9c8c93697e02
parent1daf67042da6e25ae1a2733b374f83375d79b713
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