diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:21:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:21:16 +0200 |
| commit | 345226aa3ecee8642c3bf46e40c981d4a49d958e (patch) | |
| tree | eb49f01c70d239286cb3f08bbe677c47c640cd12 /src/qml/doc/src/qmllanguageref | |
| parent | 5149aa68eca6ede8836ec4f07a14d22d9da9b161 (diff) | |
| parent | a273a0ad9c1df7aed612ee6353753f668d545076 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib45654e3e79087da4754377f0d78b70c44ed4695
Diffstat (limited to 'src/qml/doc/src/qmllanguageref')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index de0515e5d0..3692605c18 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -855,7 +855,8 @@ are otherwise unavailable to the object. In particular, they allow objects to access properties or signals that are specifically relevant to the individual object. -A QML type implementation may choose to create an \e {attaching type} with +A QML type implementation may choose to \l {Providing Attached Objects for +Data Annotations}{create an \e {attaching type} in C++} with particular properties and signals. Instances of this type can then be created and \e attached to specific objects at run time, allowing those objects to access the properties and signals of the attaching type. These are accessed by |