summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-21 03:51:24 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-21 03:51:24 (GMT)
commitbc5b2b8ea1259bffdbdafe9d509fc675476fdb97 (patch)
tree719a93d4ad493f0c47943ee380bda6935d0fe94a /doc/src
parentaf23b7a78ce50d747efc06cd26ea5b69349df811 (diff)
downloadQt-bc5b2b8ea1259bffdbdafe9d509fc675476fdb97.zip
Qt-bc5b2b8ea1259bffdbdafe9d509fc675476fdb97.tar.gz
Qt-bc5b2b8ea1259bffdbdafe9d509fc675476fdb97.tar.bz2
Renamed transition action elements
RunScriptAction -> ScriptAction ParentChangeAction -> ParentAction
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/animation.qdoc5
-rw-r--r--doc/src/declarative/elements.qdoc8
-rw-r--r--doc/src/declarative/qmlintro.qdoc8
-rw-r--r--doc/src/declarative/tutorial3.qdoc6
4 files changed, 12 insertions, 15 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index eea0fc3..28a3c47 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -89,12 +89,9 @@ Item {
states: [
State {
name: "moved"
- SetProperties {
+ PropertyChanges {
target: myrect
x: 50
- }
- SetProperties {
- target: myrect
y: 50
}
}
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index aef05d7..588ca86 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -18,9 +18,10 @@ The following table lists the QML elements provided by the Qt Declarative module
\o
\list
\o \l State
-\o \l SetProperties
+\o \l PropertyChanges
\o \l ParentChange
-\o \l RunScript
+\o \l StateChangeScript
+\o \l AnchorChanges
\endlist
\o
@@ -32,7 +33,8 @@ The following table lists the QML elements provided by the Qt Declarative module
\o \l SequentialAnimation
\o \l ParallelAnimation
\o \l SetPropertyAction
-\o \l ParentChangeAction
+\o \l ParentAction
+\o \l ScriptAction
\o \l Transition
\o \l Behavior
\o \l Follow
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index fec8f11..41da36e 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -201,8 +201,8 @@ If a list property has been the default property, it means the property tag can
\code
State {
changes: [
- SetProperties {},
- SetProperties {}
+ PropertyChanges {},
+ PropertyChanges {}
]
}
\endcode
@@ -211,8 +211,8 @@ can be simplified to
\code
State {
- SetProperties {}
- SetProperties {}
+ PropertyChanges {}
+ PropertyChanges {}
}
\endcode
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index 3517f97..d402a66 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -28,8 +28,7 @@ Rectangle {
State {
name: "down"
when: MouseRegion.pressed == true
- SetProperties { target: HelloText; y: 160 }
- SetProperties { target: HelloText color: "red" }
+ PropertyChanges { target: HelloText; y: 160; color: "red" }
}
]
transitions: [
@@ -72,8 +71,7 @@ states: [
State {
name: "down"
when: MouseRegion.pressed == true
- SetProperties { target: HelloText; y: 160 }
- SetProperties { target: HelloText; color: "red" }
+ PropertyChanges { target: HelloText; y: 160; color: "red" }
}
]
\endcode