diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-27 22:12:04 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-27 22:12:04 +1000 |
commit | 15d36189d0dcc5c97deadcf83bc072873726d449 (patch) | |
tree | 4adbf3c994570d123922521ed5df85238289065e /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
parent | d380d36a84a2b5814e7b06d28a5cc68866e9fd2b (diff) | |
parent | cc500b182e26d53ca16136f24a06a111f4374425 (diff) | |
download | qt4-tools-15d36189d0dcc5c97deadcf83bc072873726d449.tar.gz |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Save previous font engine for right bearing adjustment
Fix compilation under OSX 10.7 or using llvm-gcc.
Fix typo in QFontDialog docs
Reset previousGlyph once we reached a new text item
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions