diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-29 08:02:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-29 08:02:38 (GMT) |
commit | 6b3f2a3b96d01dc339d07a076300d29616603b28 (patch) | |
tree | 1681542fa9b680811c84f0efa13502d848d58a4c /src/gui/text/qtextodfwriter_p.h | |
parent | 9d6c186f418ea77f202404408aa6692805038bea (diff) | |
parent | ba21727195a1e7a98c731d1357a00d7b7bc058b6 (diff) | |
download | Qt-6b3f2a3b96d01dc339d07a076300d29616603b28.zip Qt-6b3f2a3b96d01dc339d07a076300d29616603b28.tar.gz Qt-6b3f2a3b96d01dc339d07a076300d29616603b28.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix vertical positioning of glyphs in raster engine with FreeType
Ensure a small event check interval on uikit platform.
Change default application font for uikit platform.
Use the QPoint memory layout change only on Desktop Mac
Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
Add IPHONEOS deployment vars to makespec
Post key events via QWindowSystemInterface, don't post events direcly
Use nicer fonts and a few little patches to uikit platform.
Update README and qmlapplicationviewer to suit 4.8.
Updated proof-of-concept UIKit mkspecs
Diffstat (limited to 'src/gui/text/qtextodfwriter_p.h')
0 files changed, 0 insertions, 0 deletions