aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@jollamobile.com>2014-08-05 08:16:14 +0200
committerGunnar Sletta <gunnar.sletta@jollamobile.com>2014-08-06 10:56:37 +0200
commit5a74e882e9d26136caedba1f772a3c5c96e50247 (patch)
treeef8e32db9411f40efbe3b2b31c3b1ad8eef019a6
parent14b4747b17d522fe57f3a5f21738c5a89323b5e2 (diff)
Clarify Component.onCompleted/onDestruction docs
Change-Id: I86bb6b85043282f4f46a685e30b435a2f7430430 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
-rw-r--r--src/qml/qml/qqmlcomponent.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index b5af502a10..89ab353cdf 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -265,7 +265,7 @@ V8_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension);
/*!
\qmlattachedsignal Component::completed()
- Emitted after component "startup" has completed. This can be used to
+ Emitted after the object has been instantiated. This can be used to
execute script code at startup, once the full QML environment has been
established.
@@ -286,14 +286,13 @@ V8_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension);
/*!
\qmlattachedsignal Component::destruction()
- Emitted as the component begins destruction. This can be used to undo
+ Emitted as the object begins destruction. This can be used to undo
work done in response to the \l {completed}{completed()} signal, or other
imperative code in your application.
The corresponding handler is \c onDestruction. It can be declared on
- any object. However, it applies to the destruction of the component as
- a whole, and not the destruction of the specific object. The order of
- running the \c onDestruction handlers is undefined.
+ any object. The order of running the \c onDestruction handlers is
+ undefined.
\qml
Rectangle {