aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-06-13 17:36:37 +0200
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2013-06-13 17:41:40 +0200
commitc1189541c54795cf99844aa4c1a5c3f034bc13be (patch)
tree50e05d66a13edc9f546dede4b223b1199ede8bac
parent3bf485072326f94b72ddb11240c3a1da4e4eaa8a (diff)
Doc: fixed issues in the Qt Quick app tutorial
Added missing spaces, fixed a link to Qt 5 docs, and added a missing line of example code. Change-Id: Ic7305aa6b44b7b9edf33a6828d965ab84289e353 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r--doc/examples/transitions/main.qml1
-rw-r--r--doc/src/qtquick/qtquick-app-tutorial.qdoc6
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml
index b87a998e79..cb76cc8d00 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 0aa17fd761..c975ba5425 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: