diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-16 13:19:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-16 13:19:07 (GMT) |
| commit | b83172f8cfb4439f17c96886f0c6046a885370f6 (patch) | |
| tree | f2af4115a1c949bb17cf5ef6a13d86a24fe17512 /src/gui/text/qtextcontrol.cpp | |
| parent | fdcb62d5d6a3e295273042555d2551eb491a5b2d (diff) | |
| parent | a31aa886f29ab49bb0aa757ce2253aa4e8ef3632 (diff) | |
| download | Qt-b83172f8cfb4439f17c96886f0c6046a885370f6.zip Qt-b83172f8cfb4439f17c96886f0c6046a885370f6.tar.gz Qt-b83172f8cfb4439f17c96886f0c6046a885370f6.tar.bz2 | |
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:
Compile
Implement a special case, simplified vertex shader for complex geometry
Revert "small cleanup regarding delayed layout in itemviews"
Make sure the delete and backspace keys are ignored when keyb-searching
Fix a crash in QSortFilterProxyModel when deleting a row
small cleanup regarding delayed layout in itemviews
Fixed wasted space in the texture cache.
Get debug code compiling since function signature changes
--warn;
That file was forgotten when adding SSE support under mingw
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
0 files changed, 0 insertions, 0 deletions