summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/animation.qdoc15
-rw-r--r--doc/src/declarative/elements.qdoc4
-rw-r--r--doc/src/declarative/qmlforcpp.qdoc6
-rw-r--r--doc/src/declarative/tutorial3.qdoc8
4 files changed, 17 insertions, 16 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 9edb54d..57881a8 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -25,7 +25,7 @@ Other Features:
\o Animation synchronization
\endlist
-The simplest form of animation is using \l NumericAnimation
+The simplest form of animation is using \l NumberAnimation
The following example creates a bouncing effect:
\code
@@ -40,9 +40,9 @@ Rect {
y: SequentialAnimation {
running: true
repeat: true
- NumericAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 }
+ NumberAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 }
PauseAnimation { duration: 1000 }
- NumericAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 }
+ NumberAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 }
}
}
}
@@ -111,7 +111,7 @@ For the previous example, a transition could describe how \c myrect moved from i
\code
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
properties: "x,y"
easing: "easeOutBounce"
duration: 200
@@ -130,7 +130,7 @@ Transition {
}
\endcode
-Transitions can happen in parallel, in sequence, or in any combination of the two:;
+Transitions can happen in parallel, in sequence, or in any combination of the two:
\code
Transition {
@@ -139,19 +139,20 @@ Transition {
reversible: true
SequentialAnimation {
ColorAnimation {
+ property: "color"
duration: 1000
}
PauseAnimation {
duration: 1000
}
ParallelAnimation {
- NumericAnimation {
+ NumberAnimation {
duration: 1000
easing: "easeOutBounce"
target: box1
properties: "x,y"
}
- NumericAnimation {
+ NumberAnimation {
duration: 1000
target: box2
properties: "x,y"
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index d078da0..9edb087 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -25,9 +25,9 @@ The following table lists the Qml elements provided by the Qt Declarative module
\o
\list
-\o \l NumericAnimation
+\o \l PropertyAnimation
+\o \l NumberAnimation
\o \l ColorAnimation
-\o \l VariantAnimation
\o \l PauseAnimation
\o \l SequentialAnimation
\o \l ParallelAnimation
diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc
index 4095071..c95cb71 100644
--- a/doc/src/declarative/qmlforcpp.qdoc
+++ b/doc/src/declarative/qmlforcpp.qdoc
@@ -438,7 +438,7 @@
\code
Button {
id: MyButton
- onClicked: NumericAnimation {
+ onClicked: NumberAnimation {
target: MyButton
property: "x"
to: 100
@@ -555,12 +555,12 @@
\code
Rect {
- x: NumericAnimation { running: true; repeat; true; from: 0; to: 100; }
+ x: NumberAnimation { running: true; repeat; true; from: 0; to: 100; }
}
\endcode
Here the \c x property of the rectangle will be animated from 0 to 100.
- To support this, the NumericAnimation class inherits the
+ To support this, the NumberAnimation class inherits the
QmlPropertyValueSource class. If a type inherits this class and is assigned
to a property for which type assignment would otherwise fail (ie. the
property itself doesn't have a type of QmlPropertyValueSource *), the QML
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index e52e353..9ae56c1 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -38,12 +38,12 @@ Rect {
toState: "down"
reversible: true
ParallelAnimation {
- NumericAnimation {
+ NumberAnimation {
properties: "y"
duration: 500
easing: "easeOutBounce"
}
- ColorAnimation { duration: 500 }
+ ColorAnimation { property: "color"; duration: 500 }
}
}
]
@@ -98,12 +98,12 @@ Because we want the same transition to be run in reverse when changing back from
\code
ParallelAnimation {
- NumericAnimation {
+ NumberAnimation {
properties: "y"
duration: 500
easing: "easeOutBounce"
}
- ColorAnimation { duration: 500 }
+ ColorAnimation { property: "color"; duration: 500 }
}
\endcode