summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-09-09 05:14:21 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-09-09 05:14:21 (GMT)
commit6878a0b7c507d21366cacee0a09bafeb81726d82 (patch)
tree457c32d1ec3044efe99c5950bce1cca6db41e41a /doc/src
parent7731e5f7d33d3ec251299c7651e777d7e0054573 (diff)
downloadQt-6878a0b7c507d21366cacee0a09bafeb81726d82.zip
Qt-6878a0b7c507d21366cacee0a09bafeb81726d82.tar.gz
Qt-6878a0b7c507d21366cacee0a09bafeb81726d82.tar.bz2
Move ComponentInstance functionality into Loader
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/elements.qdoc1
-rw-r--r--doc/src/tutorials/declarative.qdoc2
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index bfaf4ab..4eda947 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -100,7 +100,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
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 7780988..48beabd 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -392,7 +392,7 @@
the contact field.
There are also two other ways to reuse components in QML. A component
- can be reused from within the same QML file using Component and ComponentInstance
+ can be reused from within the same QML file using Component and Loader
elements. The next code snippet produces three red rounded rectangles
within a large blue rectangle.