diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 12:37:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 12:37:07 (GMT) |
| commit | c601d93b04c93d0405baaec2ad9aa8e96aa98057 (patch) | |
| tree | 493839066bcab3629b7edfb8bbb05e9ca4456c6f /demos/declarative | |
| parent | 408c2d9d6279b5c69c3e4ba0663ec36ddd3d5542 (diff) | |
| parent | b2bae6c955440345ee4fac412b86d154a2ce540a (diff) | |
| download | Qt-c601d93b04c93d0405baaec2ad9aa8e96aa98057.zip Qt-c601d93b04c93d0405baaec2ad9aa8e96aa98057.tar.gz Qt-c601d93b04c93d0405baaec2ad9aa8e96aa98057.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:
The declarative parser should only save comment text (and not /*,*/,//)
Support for qsTrId and meta-data in comments for QML.
Flickable ensure internal pressed state is cleared when mouse is released.
Fix examples autotest
Support JS "in" operator on QML objects
Only emit change signal when variant properties actually change
Use QApplication in QDeclarativeEngine example.
Diffstat (limited to 'demos/declarative')
0 files changed, 0 insertions, 0 deletions