diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 11:48:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 11:48:03 (GMT) |
| commit | dfc61f6b59886f7d223722bf149342cdd46581a8 (patch) | |
| tree | c37ec0a955a233976ff2d1ef3ff95f46f1769e9e /tools | |
| parent | 99f6250a4ac031b70757442715b226bc339ab699 (diff) | |
| parent | ee9c52d5dd38d99ea7d91cb612653f638e674ee3 (diff) | |
| download | Qt-dfc61f6b59886f7d223722bf149342cdd46581a8.zip Qt-dfc61f6b59886f7d223722bf149342cdd46581a8.tar.gz Qt-dfc61f6b59886f7d223722bf149342cdd46581a8.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:
Update docs with correct property name
Fix incorrect merge
Work around rendering bug in Rectangle.
Remove warnings.
Test e75088323ae15604139ddfd66b85cc3b8d43abeb
Add XmlListModel::errorString()
Fix dynamicscene example
Update old keyword in docs
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions