diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 05:40:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 05:40:43 (GMT) |
| commit | d1a21551dc31937db4b62b2406ea3820dd8a8c0a (patch) | |
| tree | 38949bd50cc2df96a56b702815b1838c9c2cae43 /src/declarative/util/qdeclarativebehavior.cpp | |
| parent | 19fd8c6c4c7e1a739cae53fa51c6994643ef5be1 (diff) | |
| parent | fd1e840eba4567e67b55a00f7f761fc9815eaa47 (diff) | |
| download | Qt-d1a21551dc31937db4b62b2406ea3820dd8a8c0a.zip Qt-d1a21551dc31937db4b62b2406ea3820dd8a8c0a.tar.gz Qt-d1a21551dc31937db4b62b2406ea3820dd8a8c0a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix failing autotest
XmlListModel should allow types other than application/xml
Document using Behaviors with States.
Diffstat (limited to 'src/declarative/util/qdeclarativebehavior.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativebehavior.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 41f8fe5..a1321e2 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -72,7 +72,7 @@ public: /*! \qmlclass Behavior QDeclarativeBehavior - \ingroup qml-animation-transition + \ingroup qml-animation-transition \since 4.7 \brief The Behavior element allows you to specify a default animation for a property change. @@ -91,7 +91,8 @@ public: If a \l{QML States}{state change} has a \l Transition that matches the same property as a Behavior, the \l Transition animation overrides the Behavior for that - state change. + state change. For general advice on using Behaviors to animate state changes, see + \l{Using QML Behaviors with States}. \sa {QML Animation and Transitions}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative */ |