diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 07:02:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 07:02:47 (GMT) |
| commit | faaaff5257c105860f58a4ad3df531b36e27627d (patch) | |
| tree | 76540ae0ef94b3069afb2f043bd0d26d0b26cc5b /doc | |
| parent | af60a29d79bca27dde9441b6b8fc0eae185f08d5 (diff) | |
| parent | 3a632cb5f1c1da5c2e72ce167e35a42778867829 (diff) | |
| download | Qt-faaaff5257c105860f58a4ad3df531b36e27627d.zip Qt-faaaff5257c105860f58a4ad3df531b36e27627d.tar.gz Qt-faaaff5257c105860f58a4ad3df531b36e27627d.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:
Fix anchors, etc.
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 |