diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-08-01 23:28:51 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-08-01 23:28:51 (GMT) |
| commit | 7a2d31989f0f50a34550be846a6f632c2f9e3f59 (patch) | |
| tree | 0a831fd9e0b74691760cdd2aa0e4e529a2f69c03 /doc/src/declarative/tutorial.qdoc | |
| parent | 172107be09761b703b6025c98b46a2798ee0e3da (diff) | |
| parent | e93d11c733bb44208089a7488c6e7a176468d407 (diff) | |
| download | Qt-7a2d31989f0f50a34550be846a6f632c2f9e3f59.zip Qt-7a2d31989f0f50a34550be846a6f632c2f9e3f59.tar.gz Qt-7a2d31989f0f50a34550be846a6f632c2f9e3f59.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/tutorial.qdoc')
| -rw-r--r-- | doc/src/declarative/tutorial.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc index 7a97eb1..f913d44 100644 --- a/doc/src/declarative/tutorial.qdoc +++ b/doc/src/declarative/tutorial.qdoc @@ -222,5 +222,5 @@ This is equivalent to writing the two transitions separately. The \l ParallelAnimation element makes sure that the two types of animations (number and color) start at the same time. We could also run them one after the other by using \l SequentialAnimation instead. -For more details on states and transitions, see \l {QML States} and the {declarative/animation/states}{states and transitions example}. +For more details on states and transitions, see \l {QML States} and the \l{declarative/animation/states}{states and transitions example}. */ |