From 6e0c76a209b87e306e48266962f5668237e63c62 Mon Sep 17 00:00:00 2001 From: Leonardo Sobral Cunha Date: Thu, 11 Feb 2010 20:44:13 +0000 Subject: Removed "running: true" for animations used as propertyvaluesource This attribution is not necessary anymore since 923710196d6d5..., Reviewed-by: Michael Brasser --- examples/declarative/animations/color-animation.qml | 10 +++++----- examples/declarative/animations/property-animation.qml | 2 +- examples/declarative/border-image/content/MyBorderImage.qml | 4 ++-- examples/declarative/dynamic/dynamic.qml | 2 +- examples/declarative/effects/effects.qml | 3 ++- examples/declarative/fillmode/fillmode.qml | 1 - examples/declarative/fonts/banner.qml | 2 +- examples/declarative/fonts/hello.qml | 4 ++-- examples/declarative/parallax/qml/Smiley.qml | 2 +- examples/declarative/progressbar/progressbars.qml | 6 +++--- examples/declarative/tvtennis/tvtennis.qml | 2 +- examples/declarative/webview/content/SpinSquare.qml | 1 - tests/auto/declarative/animations/data/badtype1.qml | 2 +- tests/auto/declarative/animations/data/badtype2.qml | 2 +- tests/auto/declarative/animations/data/badtype3.qml | 2 +- tests/auto/declarative/animations/data/properties.qml | 2 +- tests/auto/declarative/animations/data/properties2.qml | 2 +- tests/auto/declarative/animations/data/properties3.qml | 2 +- tests/auto/declarative/animations/data/properties4.qml | 2 +- tests/auto/declarative/animations/data/properties5.qml | 2 +- .../visual/animation/pauseAnimation/pauseAnimation.qml | 1 - tests/auto/declarative/visual/qmleasefollow/easefollow.qml | 2 +- .../visual/qmlgraphicsborderimage/content/MyBorderImage.qml | 4 ++-- tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml | 2 +- .../declarative/visual/qmlgraphicstext/elide/multilength.qml | 2 +- tests/auto/declarative/visual/qmlspringfollow/follow.qml | 2 +- tests/auto/declarative/visual/webview/embedding/egg.qml | 1 - .../auto/declarative/visual/webview/zooming/renderControl.qml | 1 - tests/auto/declarative/visual/webview/zooming/resolution.qml | 1 - tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml | 1 - 30 files changed, 33 insertions(+), 39 deletions(-) diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animations/color-animation.qml index 54608c7..7171a69 100644 --- a/examples/declarative/animations/color-animation.qml +++ b/examples/declarative/animations/color-animation.qml @@ -11,7 +11,7 @@ Item { GradientStop { position: 0.0 color: SequentialAnimation { - running: true; repeat: true + repeat: true ColorAnimation { from: "DeepSkyBlue"; to: "#0E1533"; duration: 5000 } ColorAnimation { from: "#0E1533"; to: "DeepSkyBlue"; duration: 5000 } } @@ -19,7 +19,7 @@ Item { GradientStop { position: 1.0 color: SequentialAnimation { - running: true; repeat: true + repeat: true ColorAnimation { from: "SkyBlue"; to: "#437284"; duration: 5000 } ColorAnimation { from: "#437284"; to: "SkyBlue"; duration: 5000 } } @@ -31,7 +31,7 @@ Item { Item { width: parent.width; height: 2 * parent.height transformOrigin: Item.Center - rotation: NumberAnimation { from: 0; to: 360; duration: 10000; running: true; repeat: true } + rotation: NumberAnimation { from: 0; to: 360; duration: 10000; repeat: true } Image { source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter transformOrigin: Item.Center; rotation: -3 * parent.rotation @@ -45,7 +45,7 @@ Item { source: "images/star.png"; angleDeviation: 360; velocity: 0 velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800 opacity: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { from: 0; to: 1; duration: 5000 } NumberAnimation { from: 1; to: 0; duration: 5000 } } @@ -59,7 +59,7 @@ Item { GradientStop { position: 0.0 color: SequentialAnimation { - running: true; repeat: true + repeat: true ColorAnimation { from: "ForestGreen"; to: "#001600"; duration: 5000 } ColorAnimation { from: "#001600"; to: "ForestGreen"; duration: 5000 } } diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml index 0256137..9f76ee5 100644 --- a/examples/declarative/animations/property-animation.qml +++ b/examples/declarative/animations/property-animation.qml @@ -43,7 +43,7 @@ Item { // Animate the y property. Setting repeat to true makes the // animation repeat indefinitely, otherwise it would only run once. y: SequentialAnimation { - running: true; repeat: true + repeat: true // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function NumberAnimation { diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml index 9eb1270..a57acc7 100644 --- a/examples/declarative/border-image/content/MyBorderImage.qml +++ b/examples/declarative/border-image/content/MyBorderImage.qml @@ -18,13 +18,13 @@ Item { id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2 width: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing: "easeInOutQuad"} NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing: "easeInOutQuad" } } height: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing: "easeInOutQuad"} NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing: "easeInOutQuad" } } diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml index f420a1c..2831b0c 100644 --- a/examples/declarative/dynamic/dynamic.qml +++ b/examples/declarative/dynamic/dynamic.qml @@ -105,7 +105,7 @@ Item { focusOnPress: true font.pixelSize: 16 - text: "import Qt 4.6\nImage { id: smile;\n x: 500*Math.random();\n y: 200*Math.random(); \n source: 'images/face-smile.png';\n opacity: NumberAnimation{ \n running:true; to: 0; duration: 1500;\n }\n Component.onCompleted: smile.destroy(1500);\n}" + text: "import Qt 4.6\nImage { id: smile;\n x: 500*Math.random();\n y: 200*Math.random(); \n source: 'images/face-smile.png';\n opacity: NumberAnimation{ \n to: 0; duration: 1500;\n }\n Component.onCompleted: smile.destroy(1500);\n}" } Button { text: "Create" diff --git a/examples/declarative/effects/effects.qml b/examples/declarative/effects/effects.qml index e6efc75..51658ff 100644 --- a/examples/declarative/effects/effects.qml +++ b/examples/declarative/effects/effects.qml @@ -13,6 +13,7 @@ Rectangle { effect: Blur { blurRadius: NumberAnimation { id: blurEffect + running: false from: 0; to: 10 duration: 1000 repeat: true @@ -32,7 +33,7 @@ Rectangle { effect: DropShadow { blurRadius: 3 offset.x: 3 - offset.y: NumberAnimation { id: dropShadowEffect; from: 0; to: 10; duration: 1000; repeat: true; } + offset.y: NumberAnimation { id: dropShadowEffect; from: 0; to: 10; duration: 1000; running: false; repeat: true; } } MouseRegion { anchors.fill: parent; onClicked: dropShadowEffect.running = !dropShadowEffect.running } diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml index d3a28e2..ec3717f 100644 --- a/examples/declarative/fillmode/fillmode.qml +++ b/examples/declarative/fillmode/fillmode.qml @@ -5,7 +5,6 @@ Image { height: 250 source: "face.png" fillMode: SequentialAnimation { - running: true repeat: true PropertyAction { value: Image.Stretch } PropertyAction { target: label; property: "text"; value: "Stretch" } diff --git a/examples/declarative/fonts/banner.qml b/examples/declarative/fonts/banner.qml index ece481b..00b8660 100644 --- a/examples/declarative/fonts/banner.qml +++ b/examples/declarative/fonts/banner.qml @@ -10,7 +10,7 @@ Rectangle { Row { y: -screen.height / 4.5 - x: NumberAnimation { from: 0; to: -text.width; duration: 6000; running: true; repeat: true } + x: NumberAnimation { from: 0; to: -text.width; duration: 6000; repeat: true } Text { id: text; font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text } Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text } Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text } diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml index 6aef3e6..c682477 100644 --- a/examples/declarative/fonts/hello.qml +++ b/examples/declarative/fonts/hello.qml @@ -10,7 +10,7 @@ Rectangle { text: "Hello world!"; font.pixelSize: 60 font.letterSpacing: SequentialAnimation { - repeat: true; running: true + repeat: true; NumberAnimation { from: 100; to: 300; easing: "easeInQuad"; duration: 3000 } ScriptAction { script: { container.y = (screen.height / 4) + (Math.random() * screen.height / 2) @@ -18,7 +18,7 @@ Rectangle { } } } opacity: SequentialAnimation { - repeat: true; running: true + repeat: true; NumberAnimation { from: 1; to: 0; duration: 2600 } PauseAnimation { duration: 400 } } diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml index e8917f6..fc5b4fe 100644 --- a/examples/declarative/parallax/qml/Smiley.qml +++ b/examples/declarative/parallax/qml/Smiley.qml @@ -25,7 +25,7 @@ Item { // Animate the y property. Setting repeat to true makes the // animation repeat indefinitely, otherwise it would only run once. y: SequentialAnimation { - running: true; repeat: true + repeat: true // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function NumberAnimation { diff --git a/examples/declarative/progressbar/progressbars.qml b/examples/declarative/progressbar/progressbars.qml index 6de8ecf..fdd4ca7 100644 --- a/examples/declarative/progressbar/progressbars.qml +++ b/examples/declarative/progressbar/progressbars.qml @@ -14,9 +14,9 @@ Rectangle { ProgressBar { property int r: Math.floor(Math.random() * 5000 + 1000) width: main.width - 20 - value: NumberAnimation { duration: r; from: 0; to: 100; running: true; repeat: true } - color: ColorAnimation { duration: r; from: "lightsteelblue"; to: "thistle"; running: true; repeat: true } - secondColor: ColorAnimation { duration: r; from: "steelblue"; to: "#CD96CD"; running: true; repeat: true } + value: NumberAnimation { duration: r; from: 0; to: 100; repeat: true } + color: ColorAnimation { duration: r; from: "lightsteelblue"; to: "thistle"; repeat: true } + secondColor: ColorAnimation { duration: r; from: "steelblue"; to: "#CD96CD"; repeat: true } } } } diff --git a/examples/declarative/tvtennis/tvtennis.qml b/examples/declarative/tvtennis/tvtennis.qml index f6a3c97..4bd5319 100644 --- a/examples/declarative/tvtennis/tvtennis.qml +++ b/examples/declarative/tvtennis/tvtennis.qml @@ -17,7 +17,7 @@ Rectangle { // Move the ball to the right and back to the left repeatedly x: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { to: page.width - 40; duration: 2000 } ScriptAction { script: Qt.playSound('paddle.wav') } PropertyAction { target: ball; property: "direction"; value: "left" } diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml index 5ccdeb6..466c99e 100644 --- a/examples/declarative/webview/content/SpinSquare.qml +++ b/examples/declarative/webview/content/SpinSquare.qml @@ -19,7 +19,6 @@ Item { from: 0 to: 360 repeat: true - running: true duration: root.period } } diff --git a/tests/auto/declarative/animations/data/badtype1.qml b/tests/auto/declarative/animations/data/badtype1.qml index 1e689d5..6381df3 100644 --- a/tests/auto/declarative/animations/data/badtype1.qml +++ b/tests/auto/declarative/animations/data/badtype1.qml @@ -7,6 +7,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: PropertyAnimation { from: "blue"; to: "green"; running: true; } + x: PropertyAnimation { from: "blue"; to: "green"; } } } diff --git a/tests/auto/declarative/animations/data/badtype2.qml b/tests/auto/declarative/animations/data/badtype2.qml index e97194d..8d57e41 100644 --- a/tests/auto/declarative/animations/data/badtype2.qml +++ b/tests/auto/declarative/animations/data/badtype2.qml @@ -7,6 +7,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumberAnimation { from: "blue"; to: "green"; running: true; } + x: NumberAnimation { from: "blue"; to: "green"; } } } diff --git a/tests/auto/declarative/animations/data/badtype3.qml b/tests/auto/declarative/animations/data/badtype3.qml index b2d738f..c4867c3 100644 --- a/tests/auto/declarative/animations/data/badtype3.qml +++ b/tests/auto/declarative/animations/data/badtype3.qml @@ -5,7 +5,7 @@ Rectangle { height: 320 Rectangle { color: "red" - color: ColorAnimation { from: 10; to: 15; running: true; } + color: ColorAnimation { from: 10; to: 15; } width: 50; height: 50 x: 100; y: 100 } diff --git a/tests/auto/declarative/animations/data/properties.qml b/tests/auto/declarative/animations/data/properties.qml index a8023b4..7e73f57 100644 --- a/tests/auto/declarative/animations/data/properties.qml +++ b/tests/auto/declarative/animations/data/properties.qml @@ -9,6 +9,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumberAnimation { to: 200; running: true; } + x: NumberAnimation { to: 200 } } } diff --git a/tests/auto/declarative/animations/data/properties2.qml b/tests/auto/declarative/animations/data/properties2.qml index aab7661..86568ca 100644 --- a/tests/auto/declarative/animations/data/properties2.qml +++ b/tests/auto/declarative/animations/data/properties2.qml @@ -9,6 +9,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumberAnimation { matchTargets: theRect; matchProperties: "x"; to: 200; running: true } + x: NumberAnimation { matchTargets: theRect; matchProperties: "x"; to: 200; } } } diff --git a/tests/auto/declarative/animations/data/properties3.qml b/tests/auto/declarative/animations/data/properties3.qml index fd21a85..ff08885 100644 --- a/tests/auto/declarative/animations/data/properties3.qml +++ b/tests/auto/declarative/animations/data/properties3.qml @@ -9,6 +9,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumberAnimation { target: theRect; property: "x"; to: 300; running: true } + x: NumberAnimation { target: theRect; property: "x"; to: 300; } } } diff --git a/tests/auto/declarative/animations/data/properties4.qml b/tests/auto/declarative/animations/data/properties4.qml index e23651c..dab7e5f 100644 --- a/tests/auto/declarative/animations/data/properties4.qml +++ b/tests/auto/declarative/animations/data/properties4.qml @@ -9,6 +9,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumberAnimation { target: theRect; property: "y"; to: 200; running: true } + x: NumberAnimation { target: theRect; property: "y"; to: 200; } } } diff --git a/tests/auto/declarative/animations/data/properties5.qml b/tests/auto/declarative/animations/data/properties5.qml index 25c9866..56e0be8 100644 --- a/tests/auto/declarative/animations/data/properties5.qml +++ b/tests/auto/declarative/animations/data/properties5.qml @@ -9,6 +9,6 @@ Rectangle { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumberAnimation { matchTargets: theRect; matchProperties: "y"; to: 200; running: true } + x: NumberAnimation { matchTargets: theRect; matchProperties: "y"; to: 200; } } } diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml index fba8ae6..f2e065d 100644 --- a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml +++ b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml @@ -11,7 +11,6 @@ Rectangle { x: 60-width/2 y: 200-height y: SequentialAnimation { - running: true repeat: true NumberAnimation { to: 0; duration: 500 diff --git a/tests/auto/declarative/visual/qmleasefollow/easefollow.qml b/tests/auto/declarative/visual/qmleasefollow/easefollow.qml index d0fac42..bd3270f 100644 --- a/tests/auto/declarative/visual/qmleasefollow/easefollow.qml +++ b/tests/auto/declarative/visual/qmleasefollow/easefollow.qml @@ -7,7 +7,7 @@ Rectangle { id: rect width: 50; height: 20; y: 30; color: "black" x: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { from: 50; to: 700; duration: 2000 } NumberAnimation { from: 700; to: 50; duration: 2000 } } diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml index db722ae..eb1ec00 100644 --- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml +++ b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml @@ -19,13 +19,13 @@ Item { id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2 width: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing: "easeInOutQuad"} NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing: "easeInOutQuad" } } height: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing: "easeInOutQuad"} NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing: "easeInOutQuad" } } diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml index 4104fd6..c163e05 100644 --- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml @@ -5,7 +5,7 @@ Rectangle { height: 100 Text { - width: NumberAnimation { from: 500; to: 0; running: true; repeat: true; duration: 5000 } + width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 5000 } elide: Text.ElideRight text: 'Here is some very long text that we should truncate when sizing window' } diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml index 081971c..ca41eab 100644 --- a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml @@ -11,7 +11,7 @@ Rectangle { anchors.centerIn: parent Text { id: myText - width: NumberAnimation { from: 500; to: 0; running: true; repeat: true; duration: 1000 } + width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 1000 } elide: "ElideRight" text: "Brevity is the soul of wit, and tediousness the limbs and outward flourishes.\x9CBrevity is a great charm of eloquence.\x9CBe concise!\x9CSHHHHHHHHHHHHHHHHHHHHHHHHHHHH" } diff --git a/tests/auto/declarative/visual/qmlspringfollow/follow.qml b/tests/auto/declarative/visual/qmlspringfollow/follow.qml index 1cfa750..8a713a2 100644 --- a/tests/auto/declarative/visual/qmlspringfollow/follow.qml +++ b/tests/auto/declarative/visual/qmlspringfollow/follow.qml @@ -8,7 +8,7 @@ Rectangle { color: "#00ff00" y: 200; width: 60; height: 20 y: SequentialAnimation { - running: true; repeat: true + repeat: true NumberAnimation { to: 20; duration: 500 easing: "easeInOutQuad" diff --git a/tests/auto/declarative/visual/webview/embedding/egg.qml b/tests/auto/declarative/visual/webview/embedding/egg.qml index a9019d1..fe1bb70 100644 --- a/tests/auto/declarative/visual/webview/embedding/egg.qml +++ b/tests/auto/declarative/visual/webview/embedding/egg.qml @@ -20,7 +20,6 @@ Item { from: 0 to: 360 repeat: true - running: true duration: root.period } } diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.qml b/tests/auto/declarative/visual/webview/zooming/renderControl.qml index c2f2c02..0c8bb3b 100644 --- a/tests/auto/declarative/visual/webview/zooming/renderControl.qml +++ b/tests/auto/declarative/visual/webview/zooming/renderControl.qml @@ -9,7 +9,6 @@ Rectangle { width: 400 url: "renderControl.html" x: SequentialAnimation { - running: true repeat: true NumberAnimation { from: 100; to: 0; duration: 200 } PropertyAction { target: webview; property: "renderingEnabled"; value: false } diff --git a/tests/auto/declarative/visual/webview/zooming/resolution.qml b/tests/auto/declarative/visual/webview/zooming/resolution.qml index 8336c0f..a9d4e3a 100644 --- a/tests/auto/declarative/visual/webview/zooming/resolution.qml +++ b/tests/auto/declarative/visual/webview/zooming/resolution.qml @@ -7,7 +7,6 @@ WebView { url: "resolution.html" zoomFactor: SequentialAnimation { - running: true repeat: true NumberAnimation { from: 1; to: 0.25; duration: 2000 } NumberAnimation { from: 0.25; to: 1; duration: 2000 } diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml index 55cd9bc..4455b43 100644 --- a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml +++ b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml @@ -7,7 +7,6 @@ WebView { settings.zoomTextOnly: true zoomFactor: SequentialAnimation { - running: true repeat: true NumberAnimation { from: 2; to: 0.25; duration: 1000 } NumberAnimation { from: 0.25; to: 2; duration: 1000 } -- cgit v0.12