projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fad9bc1 1daf670)
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)
* '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


Trivial merge
Domain: UI Framework / Uncategorized;