diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 05:58:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 05:58:48 (GMT) |
| commit | cb85dd1db4e42b35fd3727874d718389238b801f (patch) | |
| tree | 2e7967d4d6ab6e49cd2786e85a4af9ca279f4814 /doc | |
| parent | af60a29d79bca27dde9441b6b8fc0eae185f08d5 (diff) | |
| parent | 51381e1454070960bc3c1d6acdfa8e742c37620c (diff) | |
| download | Qt-cb85dd1db4e42b35fd3727874d718389238b801f.zip Qt-cb85dd1db4e42b35fd3727874d718389238b801f.tar.gz Qt-cb85dd1db4e42b35fd3727874d718389238b801f.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:
Labs (experimental) Gesture support.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 5eaaf7e..1bb739d 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -132,6 +132,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l FocusScope \o \l Flickable \o \l Flipable +\o \l GestureArea (experimental) \endlist \o @@ -194,7 +195,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \list -\o \l Particles +\o \l Particles (experimental) \list \o \l ParticleMotionLinear \o \l ParticleMotionGravity |