diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
| commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
| tree | 9f8135751df2f995a4f55837ea065a4687245b71 /src/qml/doc/src/qmllanguageref/syntax | |
| parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
| parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'src/qml/doc/src/qmllanguageref/syntax')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc | 14 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/signals.qdoc | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index ed08d293f2..a8177d29d8 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -893,11 +893,11 @@ property in question is \c isCurrentItem, hence the attached property is referred to as \c ListView.isCurrentItem. An attached signal handler is referred to in the same way. For example, the -\c Component.isCompleted attached signal handler is commonly used to execute -some JavaScript code when a component's creation process has been completed. -In the example below, once the \l ListModel has been fully created, its -\c Component.onCompleted signal handler will automatically be invoked to -populate the model: +\l{Component::completed}{Component.onCompleted} attached signal handler is +commonly used to execute some JavaScript code when a component's creation +process has been completed. In the example below, once the \l ListModel has +been fully created, its \c Component.onCompleted signal handler will +automatically be invoked to populate the model: \qml import QtQuick 2.0 @@ -916,8 +916,8 @@ ListView { \endqml Since the name of the \e {attaching type} is \c Component and that type has a -\c completed signal, the attached signal handler is referred to as -\c Component.isCompleted. +\l{Component::completed}{completed} signal, the attached signal handler is +referred to as \c Component.onCompleted. \section3 A Note About Accessing Attached Properties and Signal Handlers diff --git a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc index 266cb11726..e7d75a89bc 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc @@ -144,7 +144,9 @@ Rectangle { An \l {Attached Properties and Attached Signal Handlers}{attached signal handler} is a signal handler that receives a signal from an \e {attaching type} rather than the object within which the handler is declared. -For example, \c \l {Component::isCompleted}{Component.isCompleted} is an attached signal handler. This handler is often used to execute some JavaScript code when its creation process has been completed, as in the example below: +For example, \l{Component::completed}{Component.onCompleted} is an attached +signal handler. This handler is often used to execute some JavaScript code when +its creation process has been completed, as in the example below: \qml import QtQuick 2.0 |