diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-09-25 15:11:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 09:49:53 +0200 |
| commit | 5df3c92b9aa892a2e406a42cf4c28eb4b53d8389 (patch) | |
| tree | d133e17922a7bc114ad5156210d8dfb6ffd50456 | |
| parent | 592101743a1d396db71503a2d7f2c5cb223f4ca8 (diff) | |
doc: Fix some typos in C++ integration documentation
Change-Id: I883109cf2528a5e10487b38f453c2eed96cc3204
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | src/qml/doc/src/cppintegration/contextproperties.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/definetypes.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/exposecppattributes.qdoc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppintegration/contextproperties.qdoc b/src/qml/doc/src/cppintegration/contextproperties.qdoc index 33b4fd4d6a..047a6800f9 100644 --- a/src/qml/doc/src/cppintegration/contextproperties.qdoc +++ b/src/qml/doc/src/cppintegration/contextproperties.qdoc @@ -30,7 +30,7 @@ \brief Description of how to embed C++ data into QML using context properties When loading a QML object into a C++ application, it can be useful to directly embed some C++ data -that can be used from within th QML code. This makes it possible, for example, to invoke a C++ +that can be used from within the QML code. This makes it possible, for example, to invoke a C++ method on the embedded object, or use a C++ object instance as a data model for a QML view. The ability to inject C++ data into a QML object is made possible by the QQmlContext class. This diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 3f4c5c18ac..249cc32884 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -361,7 +361,7 @@ the attributes to be made accessible to \e attachee objects. For the The QML engine invokes this method in order to attach an instance of the attached object type to the \e attachee specified by the \c object - paramter. It is customary, though not strictly required, for this method + parameter. It is customary, though not strictly required, for this method implementation to parent the returned instance to \c object in order to prevent memory leaks. diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc index 99b9221cd3..ab1deb7fd6 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -145,7 +145,7 @@ Text { } \endqml -For maximum interopability with QML, \b {any property that is writable should +For maximum interoperability with QML, \b {any property that is writable should have an associated NOTIFY signal} that is emitted whenever the property value has changed. This allows the property to be used with \l{Property Binding}{property binding}, which is an essential feature of QML that enables |