diff options
Diffstat (limited to 'examples')
37 files changed, 86 insertions, 64 deletions
diff --git a/examples/declarative/animation/animation.qml b/examples/declarative/animation/animation.qml index 5cb471e..37e68d6 100644 --- a/examples/declarative/animation/animation.qml +++ b/examples/declarative/animation/animation.qml @@ -14,7 +14,7 @@ Rect { running: true repeat: true // Move from 0 to 360 in 500ms, using the easeInOutQuad easing function - NumericAnimation { + NumberAnimation { from: 0 to: 360 easing: "easeInOutQuad" @@ -25,7 +25,7 @@ Rect { duration: 200 } // Then move back to 0 in 2 seconds, using the easeInOutElastic easing function - NumericAnimation { + NumberAnimation { from: 360 to: 0 easing: "easeInOutElastic" @@ -37,11 +37,13 @@ Rect { running: true repeat: true ColorAnimation { + property: "color" from: "#FF0000" to: "#00FF00" duration: 5000 } ColorAnimation { + property: "color" from: "#00FF00" to: "#FF0000" duration: 5000 diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml index e6a50cd..4c092bf 100644 --- a/examples/declarative/behaviours/test.qml +++ b/examples/declarative/behaviours/test.qml @@ -56,7 +56,7 @@ Rect { id: bluerect x: Behavior { SequentialAnimation { - NumericAnimation { + NumberAnimation { target: bluerect properties: "y" from: 0 @@ -64,7 +64,7 @@ Rect { easing: "easeOutBounce(amplitude:30)" duration: 250 } - NumericAnimation { + NumberAnimation { target: bluerect properties: "y" from: 10 @@ -73,18 +73,18 @@ Rect { duration: 250 } } - NumericAnimation { duration: 500 } + NumberAnimation { duration: 500 } } parent: Behavior { SequentialAnimation { - NumericAnimation { + NumberAnimation { target: bluerect properties: "opacity" to: 0 duration: 150 } SetPropertyAction {} - NumericAnimation { + NumberAnimation { target: bluerect properties: "opacity" to: 1 diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml index af675d1..4fdf512 100644 --- a/examples/declarative/easing/easing.qml +++ b/examples/declarative/easing/easing.qml @@ -63,7 +63,7 @@ Rect { font.italic: true x: SequentialAnimation { id: Anim - NumericAnimation { + NumberAnimation { from: 0 to: Window.width / 2 easing: type @@ -72,7 +72,7 @@ Rect { PauseAnimation { duration: 300 } - NumericAnimation { + NumberAnimation { to: 0 from: Window.width / 2 easing: type diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml index 4c9aecc..61b8794 100644 --- a/examples/declarative/flowview/flowview.qml +++ b/examples/declarative/flowview/flowview.qml @@ -23,8 +23,8 @@ Rect { fromState: "" ; toState: "rotated" reversible: true SequentialAnimation { - NumericAnimation { filter: [TopBar, BottomBar]; properties: "x,y"; easing: "easeInOutQuad" } - NumericAnimation { filter: [LeftBar, RightBar]; properties: "x,y"; easing: "easeInOutQuad"} + NumberAnimation { filter: [TopBar, BottomBar]; properties: "x,y"; easing: "easeInOutQuad" } + NumberAnimation { filter: [LeftBar, RightBar]; properties: "x,y"; easing: "easeInOutQuad"} } } @@ -66,7 +66,7 @@ Rect { SequentialAnimation { ParentChangeAction{} PauseAnimation { duration: 50 * List.FlowView.column } - NumericAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" } } }, Transition { @@ -74,7 +74,7 @@ Rect { SequentialAnimation { ParentChangeAction{} PauseAnimation { duration: 50 * (Grid.FlowView.row * 2 + Grid.FlowView.column) } - NumericAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" } } } ] diff --git a/examples/declarative/follow/follow.qml b/examples/declarative/follow/follow.qml index 3258ea6..21a0309 100644 --- a/examples/declarative/follow/follow.qml +++ b/examples/declarative/follow/follow.qml @@ -7,11 +7,11 @@ Rect { y: 200; width: 60; height: 20 y: SequentialAnimation { running: true; repeat: true - NumericAnimation { + NumberAnimation { to: 20; duration: 500 easing: "easeInOutQuad" } - NumericAnimation { + NumberAnimation { to: 200; duration: 2000 easing: "easeOutBounce" } diff --git a/examples/declarative/follow/pong.qml b/examples/declarative/follow/pong.qml index 582b04c..93ee6a7 100644 --- a/examples/declarative/follow/pong.qml +++ b/examples/declarative/follow/pong.qml @@ -16,9 +16,9 @@ Rect { // Move the ball to the right and back to the left repeatedly x: SequentialAnimation { running: true; repeat: true - NumericAnimation { to: Page.width-40; duration: 2000 } + NumberAnimation { to: Page.width-40; duration: 2000 } SetPropertyAction { target: Ball; property: "direction"; value: "left" } - NumericAnimation { to: 20; duration: 2000 } + NumberAnimation { to: 20; duration: 2000 } SetPropertyAction { target: Ball; property: "direction"; value: "right" } } diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml index b9d56b2..11230e1 100644 --- a/examples/declarative/listview/highlight.qml +++ b/examples/declarative/listview/highlight.qml @@ -28,7 +28,7 @@ Rect { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "x"; duration: 200 } } diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index 829f074..6536b06 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -111,8 +111,8 @@ Rect { Transition { // Make the state changes smooth ParallelAnimation { - ColorAnimation { duration: 500 } - NumericAnimation { + ColorAnimation { property: "color"; duration: 500 } + NumberAnimation { duration: 300; properties: "detailsOpacity,x,yPosition,height,width" } } diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index df8660f..03fcc8d 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -29,7 +29,7 @@ Item { source: "pics/flag.png" opacity: modelData.hasFlag opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -73,7 +73,7 @@ Item { PauseAnimation { duration: {var ret = Math.abs(flipable.parent.x-field.clickx) + Math.abs(flipable.parent.y-field.clicky); if (ret > 0) {if(modelData.hasMine==true && modelData.flipped==true){ret*3;}else{ret;}} else {0}} } - NumericAnimation { + NumberAnimation { easing: "easeInOutQuad" properties: "rotation" } diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index bf40d2d..ae28ef1 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -24,7 +24,7 @@ Rect { Transition { fromState: "*" toState: "*" - NumericAnimation { + NumberAnimation { properties: "opacity" duration: 400 } diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml index cd93ec9..e0c2dd9 100644 --- a/examples/declarative/slideswitch/Switch.qml +++ b/examples/declarative/slideswitch/Switch.qml @@ -50,7 +50,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 } + NumberAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 } } ] } diff --git a/examples/declarative/states/states.qml b/examples/declarative/states/states.qml index 6bd9813..c7ee172 100644 --- a/examples/declarative/states/states.qml +++ b/examples/declarative/states/states.qml @@ -26,15 +26,21 @@ Rect { // In state 'Position1', change the 'myrect' item x, y to 150, 50. State { name: "Position1" - SetProperties { target: myrect; x: 150 } - SetProperties { target: myrect; y: 50 } + SetProperties { + target: myrect + x: 150 + y: 50 + } }, // In state 'Position2', change y to 100. We do not specify 'x' here - // it will therefore be restored to its default value of 0, if it // had been changed. State { name: "Position2" - SetProperties { target: myrect; y: 200 } + SetProperties { + target: myrect + y: 200 + } } ] } diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml index d01fea8..1a719ed 100644 --- a/examples/declarative/states/transitions.qml +++ b/examples/declarative/states/transitions.qml @@ -26,15 +26,21 @@ Rect { // In state 'Position1', change the 'myrect' item x, y to 150, 50. State { name: "Position1" - SetProperties { target: myrect; x: 150; } - SetProperties { target: myrect; y: 50; } + SetProperties { + target: myrect + x: 150 + y: 50 + } }, // In state 'Position2', change y to 100. We do not specify 'x' here - // it will therefore be restored to its default value of 0, if it // had been changed. State { name: "Position2" - SetProperties { target: myrect; y: 200 } + SetProperties { + target: myrect + y: 200 + } } ] @@ -44,17 +50,17 @@ Rect { // with easeOutBounce easing function. Transition { fromState: "*"; toState: "Position1" - NumericAnimation { properties: "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 { fromState: "*"; toState: "Position2" - NumericAnimation { properties: "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 { - NumericAnimation { properties: "x,y"; duration: 200 } + NumberAnimation { properties: "x,y"; duration: 200 } } ] } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml index 00dec9e..58662d1 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml @@ -102,7 +102,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml index 0d607a9..064aaa2 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml @@ -48,7 +48,7 @@ FocusRealm { onClicked: { parent.parent.focus=true } } opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml index 3a9f318..a0f3880 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml @@ -101,7 +101,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml index 3a9f318..a0f3880 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml @@ -101,7 +101,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml index 362591e..7baa8af 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml @@ -103,7 +103,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml index 5595414..55a13a1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml @@ -109,7 +109,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml index 8ae4d7d..cdbcd13 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml @@ -49,7 +49,7 @@ Item { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "width,rightMargin" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml index b55aab8..353e440 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml @@ -71,7 +71,7 @@ Rect { text: fieldText.label opacity: textEdit.text == '' ? 1 : 0 opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -129,11 +129,12 @@ Rect { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,leftMargin,rightMargin" duration: 200 } ColorAnimation { + property: "color" duration: 150 } } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml index 6b4cd99..a9bf3ee 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml @@ -104,7 +104,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml index 06a959d..4cd74a7 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml @@ -47,7 +47,7 @@ Item { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "width,rightMargin" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml index 1a5b77b..cb2c368 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml @@ -73,7 +73,7 @@ Rect { text: fieldText.label opacity: textEdit.text == '' ? 1 : 0 opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -130,11 +130,12 @@ Rect { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,leftMargin,rightMargin" duration: 200 } ColorAnimation { + property: "color" duration: 150 } } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml index 4398ac1..05146b7 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml @@ -109,7 +109,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml index 0d607a9..064aaa2 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml @@ -48,7 +48,7 @@ FocusRealm { onClicked: { parent.parent.focus=true } } opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } diff --git a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml index 1be4b99..120c7ba 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml @@ -98,7 +98,7 @@ Item { //! [transitions] transitions: [ Transition { - NumericAnimation { + NumberAnimation { duration: 500 properties: "yPosition,height,opacity" } diff --git a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml index a3b3e18..82b55af 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml @@ -114,7 +114,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { duration: 500 properties: "yPosition,height,opacity" } diff --git a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml index 0d607a9..064aaa2 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml @@ -48,7 +48,7 @@ FocusRealm { onClicked: { parent.parent.focus=true } } opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml index 5623b26..09af769 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml @@ -35,6 +35,7 @@ Item { fromState: "*" toState: "pressed" ColorAnimation { + property: "color" duration: 200 } }, @@ -42,13 +43,14 @@ Item { fromState: "pressed" toState: "*" ColorAnimation { + property: "color" duration: 1000 } } ] } opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml index 06a959d..4cd74a7 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml @@ -47,7 +47,7 @@ Item { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "width,rightMargin" duration: 200 } diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml index b4dc559..417c08a 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml @@ -73,7 +73,7 @@ Rect { text: fieldText.label opacity: textEdit.text == '' ? 1 : 0 opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -130,11 +130,12 @@ Rect { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,leftMargin,rightMargin" duration: 200 } ColorAnimation { + property: "color" duration: 150 } } diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml index 95ca062..a962eb3 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml @@ -108,7 +108,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml index e0515ec..664bf45 100644 --- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml +++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml @@ -14,8 +14,11 @@ Rect { State { name: "down" when: MouseRegion.pressed == true - SetProperties { target: HelloText; y: 160 } - SetProperties { target: HelloText; color: "red" } + SetProperties { + target: HelloText + y: 160 + color: "red" + } } ] transitions: [ @@ -24,12 +27,12 @@ Rect { toState: "down" reversible: true ParallelAnimation { - NumericAnimation { + NumberAnimation { properties: "y" duration: 500 easing: "easeOutBounce" } - ColorAnimation { duration: 500 } + ColorAnimation { property: "color"; duration: 500 } } } ] diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml index c70a211..8f78822 100644 --- a/examples/declarative/velocity/Day.qml +++ b/examples/declarative/velocity/Day.qml @@ -100,7 +100,7 @@ Rect { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "rotation,scale" duration: 200 } diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml index 5e4735e..640416f 100644 --- a/examples/declarative/webview/content/SpinSquare.qml +++ b/examples/declarative/webview/content/SpinSquare.qml @@ -13,7 +13,7 @@ Item { width: Root.width height: width } - rotation: NumericAnimation { + rotation: NumberAnimation { from: 0 to: 360 repeat: true diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index a5bb2f1..d20da99 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -74,12 +74,12 @@ Rect { toState: "Details" reversible: true SequentialAnimation { - NumericAnimation { + NumberAnimation { duration: 200 properties: "height" easing: "easeOutQuad" } - NumericAnimation { + NumberAnimation { duration: 200 properties: "opacity" } |