summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-03 03:34:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-03 03:34:58 (GMT)
commit41f9b733cc256bd33b467171ec26502f1f8c03e9 (patch)
tree369fefdd0b849ec386276c75de72ef6c816cf1e0 /doc/src
parent9c726c2f2791f82de52f54ffc1f580630d10c61d (diff)
parentd758910f3d8d5eb64f7c7d94e5c9ef9ae259230b (diff)
downloadQt-41f9b733cc256bd33b467171ec26502f1f8c03e9.zip
Qt-41f9b733cc256bd33b467171ec26502f1f8c03e9.tar.gz
Qt-41f9b733cc256bd33b467171ec26502f1f8c03e9.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: Don't modify the signal order on the second dynamic meta object pass Doc Support passing QObject derived types to QML methods
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/extending.qdoc10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 6388764..0cc989d 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -674,6 +674,16 @@ declaring a new property, and the corresponding C++ type.
\row \o variant \o QVariant
\endtable
+From QML you can also declare object and list properties using any element name
+like this:
+
+\code
+ property QtObject objectProperty
+ property Item itemProperty
+ property MyCustomType customProperty
+ property list<Item> listOfItemsProperty
+\endcode
+
QML supports two methods for adding a new property to a type: a new property
definition, and a property alias.