diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 20:40:31 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 20:40:31 (GMT) |
commit | 711229c3380f31201f16faeb489cc89730971336 (patch) | |
tree | 996d157291634a42f80133f51a600dc3b4bc23db /src/network/kernel/qhostinfo_p.h | |
parent | 0e7510e104365363836173a1bc068b16dec76bcc (diff) | |
parent | 49d2906a9566c8b44df48f51ca137b9ba2feb671 (diff) | |
download | Qt-711229c3380f31201f16faeb489cc89730971336.zip Qt-711229c3380f31201f16faeb489cc89730971336.tar.gz Qt-711229c3380f31201f16faeb489cc89730971336.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Make sure removed QTextBlock is invalid
Make sure QFont's resolve mask is copied on compilers with C++0x support
Fix glyph position issue with fallback fonts
Diffstat (limited to 'src/network/kernel/qhostinfo_p.h')
0 files changed, 0 insertions, 0 deletions