diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml index b87a998e79c6fbe84a497f06c6ad2c6f530b2395..cb76cc8d008167ed9ee28cd36c49087dcd5d8759 100644 --- a/doc/examples/transitions/main.qml +++ b/doc/examples/transitions/main.qml @@ -105,6 +105,7 @@ Rectangle { Transition { from: "*"; to: "State1" NumberAnimation { + easing.type: Easing.OutBounce properties: "x,y"; duration: 1000 } diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 0aa17fd7619f0084f91557555f4489e32bda2d06..c975ba5425f5b569515c9077da57ffcd61a03313 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -34,7 +34,7 @@ \l {http://qt-project.org/doc/qt-5.0/qtquick/qtquick-index.html}{Qt Quick}. This tutorial describes how to use \QC to implement Qt states and transitions. We use - \l{http://qt-project.org/doc/qt-5.0/qtquick/quick-animation.html}{Qt example code} to + \l{http://qt-project.org/doc/qt-5.0/qtquick/animation.html}{Qt example code} to create an application that displays a Qt logo that moves between three rectangles on the page when you click them. @@ -72,7 +72,7 @@ \li Review the project settings, and click \gui{Finish} (on Windows and Linux) or \gui Done (on Mac OS) to create the project. - \li Press \key {Ctrl+R} (or \key {Cmd+R})to run the application. + \li Press \key {Ctrl+R} (or \key {Cmd+R}) to run the application. \endlist @@ -224,7 +224,7 @@ \li In the \gui Margin field, select 10 for the right anchor and 0 for the vertical center anchor. - \li In the code editor,add a pointer to a clicked expression to the + \li In the code editor, add a pointer to a clicked expression to the mouse area. The following expression sets the state to \e State1: