diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 02:58:50 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 02:58:50 (GMT) |
| commit | 682bf305a82d748b97c5ee189c7d1033b84c0dc1 (patch) | |
| tree | 21c82eda2f76295cbd825e3d2d06efae0915d543 | |
| parent | 5eb45694ee65924f3815ed3c05d201e9cce69b4f (diff) | |
| download | Qt-682bf305a82d748b97c5ee189c7d1033b84c0dc1.zip Qt-682bf305a82d748b97c5ee189c7d1033b84c0dc1.tar.gz Qt-682bf305a82d748b97c5ee189c7d1033b84c0dc1.tar.bz2 | |
Doc fixes
| -rw-r--r-- | doc/src/declarative/binding.qdoc | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlstate.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/binding.qdoc b/doc/src/declarative/binding.qdoc index dfddf75..7e8933f 100644 --- a/doc/src/declarative/binding.qdoc +++ b/doc/src/declarative/binding.qdoc @@ -34,7 +34,7 @@ Data can be bound to C++ objects - see \l {QML/C++ Data Binding}. \target qtbinding \title QML/C++ Data Binding -The QML mechanisms of \l {Data Binding} can also be used to bind Qt C++ objects. +The QML mechanisms of data binding can also be used to bind Qt C++ objects. The data binding framework is based on Qt's property system (see the Qt documentation for more details on this system). If a binding is meant to be dynamic (where changes in one object are reflected in another object), \c NOTIFY must be specified for the property being tracked. If \c NOTIFY is not specified, any binding to that property will be an 'intialization' binding (the tracking object will be updated only once with the initial value of the tracked object). diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index a17d16e..508ef43 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -208,7 +208,7 @@ void QmlState::setWhen(QmlBinding *when) } /*! - \qmlproperty string State::extends + \qmlproperty string State::extend This property holds the state that this state extends The state being extended is treated as the base state in regards to |