diff options
author | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:21 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:21 (GMT) |
commit | d3b898e973662707f9644b4fe5f8d18849929723 (patch) | |
tree | cf7644a23cc1787c1b710c7c1ebd0b6e028d3ca7 /doc/src/examples | |
parent | a8030e0c543e538652605557843b845f89b11589 (diff) | |
parent | 40b6c1dd9199ac5e0d6a1921b05c11e647d09dca (diff) | |
download | Qt-d3b898e973662707f9644b4fe5f8d18849929723.zip Qt-d3b898e973662707f9644b4fe5f8d18849929723.tar.gz Qt-d3b898e973662707f9644b4fe5f8d18849929723.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/examples')
-rw-r--r-- | doc/src/examples/qml-examples.qdoc | 1 | ||||
-rw-r--r-- | doc/src/examples/qml-extending.qdoc | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 0d191c9..b140562 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -137,6 +137,7 @@ \o \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties} \o \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties} \o \l {declarative/cppextensions/referenceexamples/signal}{Signal Support} + \o \l {declarative/cppextensions/referenceexamples/methods}{Methods Support} \o \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source} \o \l {declarative/cppextensions/referenceexamples/binding}{Binding} \endlist diff --git a/doc/src/examples/qml-extending.qdoc b/doc/src/examples/qml-extending.qdoc index b419fe4..21ec3bb 100644 --- a/doc/src/examples/qml-extending.qdoc +++ b/doc/src/examples/qml-extending.qdoc @@ -253,6 +253,20 @@ This example builds on: */ /*! +\example declarative/cppextensions/referenceexamples/methods +\title Extending QML - Methods Example + +This example builds on: +\list +\o \l {Extending QML - Default Property Example} +\o \l {Extending QML - Inheritance and Coercion Example} +\o \l {Extending QML - Object and List Property Types Example} +\o \l {Extending QML - Adding Types Example} +\endlist + +*/ + +/*! \example declarative/cppextensions/referenceexamples/valuesource \title Extending QML - Property Value Source Example |