diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-28 23:31:14 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-28 23:31:14 +1000 |
commit | 174e01a16aba71cfaa7b095be6430f8e4a89d0b8 (patch) | |
tree | dfa7379fef4603f3c9b3af8f3ae3fa4c7cb7125b /src/gui/text/qfontdatabase_s60.cpp | |
parent | d599ec6e3e9b24a9ee781b60f684da9c35c91efb (diff) | |
parent | 22995948cd3f46780be5d8016708aeef0cd7b066 (diff) |
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:
Revert binary search in QTextEngine::findItem
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
0 files changed, 0 insertions, 0 deletions