diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-12 16:32:53 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-12 16:32:53 +1000 |
commit | c7cdf50dc944e8105f70d85d9563703825fa30ad (patch) | |
tree | 10876e5a4ea17931983c522ca4f5a6eb13cf7246 /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
parent | 5c71dec9ed46dde01c6e3300daf496a8a64320d8 (diff) | |
parent | ade1378a4fc479d7ff3de3eb636c222c195a9082 (diff) | |
download | qt4-tools-c7cdf50dc944e8105f70d85d9563703825fa30ad.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:
Check engine existence before increasing reference count
Keep reference count for cached font engines in QTextEngine
Optimize text layout.
Fix crash when app font is added
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions