diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-29 16:20:59 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-29 16:20:59 (GMT) |
commit | c9fb043d9fa38dd8eec6976e7a338dc89ddc5b0e (patch) | |
tree | 69a3f39667e0ff22a3d7507fafcdb7c9cd219daf /src/gui/egl | |
parent | c9f0c578bbaf73211ad4729e1496e53867a641c9 (diff) | |
parent | 29a5089b83b1b43ecf2c746dac8cadbbe4385553 (diff) | |
download | Qt-c9fb043d9fa38dd8eec6976e7a338dc89ddc5b0e.zip Qt-c9fb043d9fa38dd8eec6976e7a338dc89ddc5b0e.tar.gz Qt-c9fb043d9fa38dd8eec6976e7a338dc89ddc5b0e.tar.bz2 |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert binary search in QTextEngine::findItem
Remove a duplicate include line
Save previous font engine for right bearing adjustment
Symbian^3 workaround: Avoid usage of linked fonts.
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 'src/gui/egl')
0 files changed, 0 insertions, 0 deletions