diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 01:06:57 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 01:06:57 (GMT) |
commit | 6986f382c8d7b49342f47fe00445685945157187 (patch) | |
tree | bbe4a94dc06b4ffb83aa248183da7a1773c38cab /src/gui/text/qfont_s60.cpp | |
parent | 6e2c3e7306883cd4618742e37861e326e9c91895 (diff) | |
parent | 368dec26e5dccd6bbaf4f485180bc2ce47294953 (diff) | |
download | Qt-6986f382c8d7b49342f47fe00445685945157187.zip Qt-6986f382c8d7b49342f47fe00445685945157187.tar.gz Qt-6986f382c8d7b49342f47fe00445685945157187.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix .pro file
Add files missing from last commit
fix doc link
Add chapter on creating list property types
fix spelling
Change tutorial from using "Musician" etc. types to using "PieChart"
Text element does not clip even with clip=true
Diffstat (limited to 'src/gui/text/qfont_s60.cpp')
0 files changed, 0 insertions, 0 deletions