diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 05:39:47 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 05:39:47 +0200 |
| commit | cba9c55a97c0a04859658d4c7a67d5853a3d3a55 (patch) | |
| tree | 682c37f74f1cbda0575d0a378ed942d55c3e6c85 /src/gui/text/qfontengine_p.h | |
| parent | b1f9fcb175f99dd4eb3b7804c1e1e0d1421e549a (diff) | |
| parent | 9c0aaab82912d5f2b471121350175bbd8052ff4f (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix LeftToRight + setSpacing + setWrapping when drag-and-dropping
Remove tst_QStringRef::localeAwareCompare
Itemviews: use localeAwareCompare for comparing in the widget classes
tst_qstringref.cpp: Fix licence header and compilation on windows
Add some convenience functions for QStringRef
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
0 files changed, 0 insertions, 0 deletions