diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 06:11:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 06:11:13 (GMT) |
| commit | 75121229e20361eefb2655932033bdbb557df433 (patch) | |
| tree | 72da3a72b21d3c29af2cfefdb98084832c22c0bc /templates | |
| parent | 934f022bd7cb141e1a73a07a912f0945e895e4f8 (diff) | |
| parent | e46bf51f830dcc80932b9219fe608d1bc1a388ad (diff) | |
| download | Qt-75121229e20361eefb2655932033bdbb557df433.zip Qt-75121229e20361eefb2655932033bdbb557df433.tar.gz Qt-75121229e20361eefb2655932033bdbb557df433.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:
Fix license header.
Change pen correctly when drawing cached text
Fix BorderImage painting at sizes less than margin size.
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions