diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 13:35:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 13:35:28 (GMT) |
| commit | a496f435792808e9faa36fd3e5c07cba51fffe75 (patch) | |
| tree | 3fd291ef393d0e5d9ff57d9e9b7d901104cbc477 | |
| parent | 3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0 (diff) | |
| parent | d14bc92ccdf263cfd05dc8d1bec21aa95edd20a4 (diff) | |
| download | Qt-a496f435792808e9faa36fd3e5c07cba51fffe75.zip Qt-a496f435792808e9faa36fd3e5c07cba51fffe75.tar.gz Qt-a496f435792808e9faa36fd3e5c07cba51fffe75.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
spelling fixes in extending.qdoc
| -rw-r--r-- | doc/src/declarative/extending.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index 5a95551..4b4e05e 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -51,7 +51,7 @@ to either instantiating an object instance, or assigning a property a value. QML relies heavily on Qt's meta object system and can only instantiate classes that derive from QObject. For visual element types, this will usually mean a subclass of QDeclarativeItem; for models used with the view elements, a subclass of QAbstractItemModel; -and for abitrary objects with properties, a direct subclass of QObject. +and for arbitrary objects with properties, a direct subclass of QObject. The QML engine has no intrinsic knowledge of any class types. Instead the programmer must register the C++ types with their corresponding QML names. @@ -522,7 +522,7 @@ The \c {invite()} method is similarly available if it is declared as a slot. \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0 \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 1 -The QML snippet shown above applies a property value source to the \c announcment property. +The QML snippet shown above applies a property value source to the \c announcement property. A property value source generates a value for a property that changes over time. Property value sources are most commonly used to do animation. Rather than @@ -562,7 +562,7 @@ assignment fails does the engine call the \l {QDeclarativePropertyValueSource::} the type to also be used in contexts other than just as a value source. \l {Extending QML - Property Value Source Example} shows the complete code used -implement the \c HappyBirthdaySong property value source. +to implement the \c HappyBirthdaySong property value source. \section1 Property Binding |