diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-30 01:17:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-30 01:17:51 (GMT) |
| commit | e42d95d4e9d0dc547c604939f88de95180e74fa0 (patch) | |
| tree | b4c34e7ca6eae4c2fdb0a838da6c8cf39d1d0eb3 /doc/src/snippets/declarative/integrating-javascript/script.js | |
| parent | 4973e73c064f706aaadbda4c4cb27ff5c577702e (diff) | |
| parent | 08ec866fc93c14b9aac8c5ad7092564b6dfecf31 (diff) | |
| download | Qt-e42d95d4e9d0dc547c604939f88de95180e74fa0.zip Qt-e42d95d4e9d0dc547c604939f88de95180e74fa0.tar.gz Qt-e42d95d4e9d0dc547c604939f88de95180e74fa0.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:
Remove expect-fails from passing tests
Add license to example code
Improve consistency in handling of aliases, bindings and value types
Move KeyNavigation example to snippets, plus some doc rewording
Diffstat (limited to 'doc/src/snippets/declarative/integrating-javascript/script.js')
0 files changed, 0 insertions, 0 deletions