summaryrefslogtreecommitdiffstats
path: root/examples/declarative/states
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-02-16 01:59:27 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-02-18 05:17:13 (GMT)
commitad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6 (patch)
tree144a7a8f3208d9388b8666d26aa0a231b325b87f /examples/declarative/states
parent635b329592f26d64eeb6212b6056249b15293dcf (diff)
downloadQt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.zip
Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.tar.gz
Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.tar.bz2
Get rid of the matchProperties/properties distinction, as it
has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
Diffstat (limited to 'examples/declarative/states')
-rw-r--r--examples/declarative/states/transitions.qml8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 925d90e..ba97d9be 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -48,23 +48,23 @@ Rectangle {
}
]
- // transitions define how the matchProperties change.
+ // transitions define how the properties change.
transitions: [
// When transitioning to 'Position1' move x,y over a duration of 1 second,
// with easeOutBounce easing function.
Transition {
from: "*"; to: "Position1"
- NumberAnimation { matchProperties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
+ NumberAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
},
// When transitioning to 'Position2' move x,y over a duration of 2 seconds,
// with easeInOutQuad easing function.
Transition {
from: "*"; to: "Position2"
- NumberAnimation { matchProperties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
+ NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
},
// For any other state changes move x,y linearly over duration of 200ms.
Transition {
- NumberAnimation { matchProperties: "x,y"; duration: 200 }
+ NumberAnimation { properties: "x,y"; duration: 200 }
}
]
}