diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 06:29:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 06:29:13 (GMT) |
| commit | 9b8fcaa5e9b6fe348df40683e4c8a72e4ba95c89 (patch) | |
| tree | 49f6a311faf226e665e5f0f6167784a958ada5fa /doc/src/snippets/code/src_script_qscriptvalue.cpp | |
| parent | 1c4846bc35613f388fda28841e19c3a9cbc8c11f (diff) | |
| parent | aeadd5ae059b182b5bc3da1537b3193bf725c243 (diff) | |
| download | Qt-9b8fcaa5e9b6fe348df40683e4c8a72e4ba95c89.zip Qt-9b8fcaa5e9b6fe348df40683e4c8a72e4ba95c89.tar.gz Qt-9b8fcaa5e9b6fe348df40683e4c8a72e4ba95c89.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Make dynamicscene example embeddeable in another graphics scene
Some minor example fixes
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 'doc/src/snippets/code/src_script_qscriptvalue.cpp')
0 files changed, 0 insertions, 0 deletions