diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 21:42:44 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 21:42:44 +1000 |
| commit | 948d5f22c309899657a9397e516d5892b02804c0 (patch) | |
| tree | b1459a45a2a94bdb01e9363c6ad70cc8b8716758 /src/network/socket/qhttpsocketengine.cpp | |
| parent | fad9bc150608768923cf15a4478c9c8c93697e02 (diff) | |
| parent | 1daf67042da6e25ae1a2733b374f83375d79b713 (diff) | |
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
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
0 files changed, 0 insertions, 0 deletions