summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/elements.qdoc
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-09 05:31:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-09 05:31:43 (GMT)
commitae7a3485c0e6748361789491af33ee7b7fe093bc (patch)
tree7d653db085947561419efbea4f9d66659eecae05 /doc/src/declarative/elements.qdoc
parentbd54370a759db272ce06d2fcdcce3e90c1dd17e8 (diff)
parentdc4d2b260debda80b8a0d81c9a032050232fdaab (diff)
downloadQt-ae7a3485c0e6748361789491af33ee7b7fe093bc.zip
Qt-ae7a3485c0e6748361789491af33ee7b7fe093bc.tar.gz
Qt-ae7a3485c0e6748361789491af33ee7b7fe093bc.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.qdoc1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 47cb19c..ca17fda 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -101,7 +101,6 @@ The following table lists the QML elements provided by the Qt Declarative module
\o \l Loader
\o \l Repeater
\o \l SystemPalette
-\o \l ComponentInstance
\o \l GraphicsObjectContainer
\endlist