summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecomponent.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-29 22:27:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-29 22:27:50 (GMT)
commit4277b05af534ff29c31fdd20189638704d8e48fa (patch)
tree9575b9fb64e8dda8137cf9892e32e34d86c250c7 /src/declarative/qml/qdeclarativecomponent.h
parent4973e73c064f706aaadbda4c4cb27ff5c577702e (diff)
parent312604c85b1e6a6fc6de505bac86848936f81edd (diff)
downloadQt-4277b05af534ff29c31fdd20189638704d8e48fa.zip
Qt-4277b05af534ff29c31fdd20189638704d8e48fa.tar.gz
Qt-4277b05af534ff29c31fdd20189638704d8e48fa.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: Improve consistency in handling of aliases, bindings and value types Move KeyNavigation example to snippets, plus some doc rewording
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.h')
0 files changed, 0 insertions, 0 deletions