diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-20 00:58:11 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-20 00:58:11 (GMT) |
| commit | babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2 (patch) | |
| tree | c0a44c57e54e77dd31e2a68959e03256124cdfbd /doc/src/declarative/elements.qdoc | |
| parent | 45cbfefe9d68152841beb6474c94eece0a085eb5 (diff) | |
| parent | 1dc2e92b4630a0c19d1d2bdf5a05cd18003c566a (diff) | |
| download | Qt-babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2.zip Qt-babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2.tar.gz Qt-babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/declarative/elements.qdoc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 32bf40e..88b5963 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -75,14 +75,12 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l TextEdit \o \l Rect \o \l AnimatedImage -\o \l BlendedImage \endlist \o \list \o \l MouseRegion \o \l KeyActions -\o \l FocusPanel \o \l FocusRealm \o \l KeyProxy \endlist @@ -97,12 +95,8 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list \o \l Repeater -\o \l ContentWrapper - \list - \o \l Content - \endlist \o \l ComponentInstance -\o \l WidgetContainer +\o \l GraphicsObjectContainer \endlist \header @@ -148,10 +142,6 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list -\o \l Shadow -\o \l Reflection -\o \l Blur -\o \l Highlight \o \l Particles \list \o \l ParticleMotionLinear |