diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-07-06 18:36:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 09:05:06 +0200 |
| commit | 60a13ee3fd021080d92a11b3456602103ad61a79 (patch) | |
| tree | 346da0c9cebd5fdac2d796cd56b6ccb08f26042f /src/qml/doc/src/qtqml.qdoc | |
| parent | 867704b37cfbe055ba947291cde343204ce8e52a (diff) | |
Improve object attributes documentation
There is no conceptual difference between custom attributes
(custom properties, signals and methods defined in QML object
declarations) and non-custom attributes (defined in C++).
This change coalesces the documentation for the different attribute
types, and also fixes some line wrapping issues.
Change-Id: I8cb8d71025e873523cb4389827eef7967e49a626
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/qml/doc/src/qtqml.qdoc')
| -rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index c69a884e2e..61df39245f 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -152,12 +152,10 @@ types, animation classes, and canvas integration) for the QML language. \li \l{qtqml-syntax-objectattributes.html}{QML Object Attributes} \list - \li \l{qtqml-syntax-objectattributes.html#the-id-assignment}{The \e id Assignment} - \li \l{qtqml-syntax-objectattributes.html#property-initialization}{Property Initialization} - \li \l{qtqml-syntax-objectattributes.html#custom-properties}{Custom Properties} - \li \l{qtqml-syntax-objectattributes.html#signal-handlers}{Signal Handlers} - \li \l{qtqml-syntax-objectattributes.html#custom-signals}{Custom Signals} - \li \l{qtqml-syntax-objectattributes.html#custom-methods}{Custom Methods} + \li \l{qtqml-syntax-objectattributes.html#the-id-attribute}{The \e id Attribute} + \li \l{qtqml-syntax-objectattributes.html#property-attributes}{Property Attributes} + \li \l{qtqml-syntax-objectattributes.html#signal-attributes}{Signal Attributes} + \li \l{qtqml-syntax-objectattributes.html#method-attributes}{Method Attributes} \li \l{qtqml-syntax-objectattributes.html#attached-properties-and-attached-signal-handlers}{Attached Properties and Attached Signal Handlers} \endlist |