diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 10:38:45 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 10:38:45 (GMT) |
| commit | d39b1e08921d6261f2f618cbd92b1415d69592eb (patch) | |
| tree | 2309c392bb86470cf4268175941fdf1894357ab1 /doc/src | |
| parent | bb35b65bbfba82e0dd0ac306d3dab54436cdaff6 (diff) | |
| parent | faaaff5257c105860f58a4ad3df531b36e27627d (diff) | |
| download | Qt-d39b1e08921d6261f2f618cbd92b1415d69592eb.zip Qt-d39b1e08921d6261f2f618cbd92b1415d69592eb.tar.gz Qt-d39b1e08921d6261f2f618cbd92b1415d69592eb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into testMerge
Diffstat (limited to 'doc/src')
| -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 |