diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 02:22:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 02:22:03 (GMT) |
| commit | b190fb2e281538b9cccc272cbc846e63390cb817 (patch) | |
| tree | 145566c2b0a2b53e2e2145771f27b97646394d73 /src/declarative/graphicsitems/qdeclarativetextedit_p.h | |
| parent | 934f022bd7cb141e1a73a07a912f0945e895e4f8 (diff) | |
| parent | fe90d7a3d9f00fa2ea46c0816f63c65f812c360f (diff) | |
| download | Qt-b190fb2e281538b9cccc272cbc846e63390cb817.zip Qt-b190fb2e281538b9cccc272cbc846e63390cb817.tar.gz Qt-b190fb2e281538b9cccc272cbc846e63390cb817.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Change pen correctly when drawing cached text
Fix BorderImage painting at sizes less than margin size.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p.h')
0 files changed, 0 insertions, 0 deletions