aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-01-25 20:48:04 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-27 06:18:00 +0100
commita838eea33313967e501a5a045d2a68d2a35e7533 (patch)
tree70bda2ec792b4ea2999a13fe95bb461edfc63953 /examples
parent16ca1d7d65e66969724d4b490fa9a614b88f4bc3 (diff)
Update Sprite using examples to frameDuration
While it's good to test the interim compatibility code, examples are not supposed to print any warnings. Change-Id: Ie6560213fd89b0ca4162c5b48dbaf86dee63cb48 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/particles/affectors/age.qml4
-rw-r--r--examples/declarative/particles/affectors/attractor.qml3
-rw-r--r--examples/declarative/particles/affectors/customaffector.qml10
-rw-r--r--examples/declarative/particles/affectors/friction.qml10
-rw-r--r--examples/declarative/particles/affectors/spritegoal.qml6
-rw-r--r--examples/declarative/particles/affectors/wander.qml4
-rw-r--r--examples/declarative/particles/imageparticle/allatonce.qml2
-rw-r--r--examples/declarative/particles/imageparticle/sprites.qml10
-rw-r--r--examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml6
9 files changed, 27 insertions, 28 deletions
diff --git a/examples/declarative/particles/affectors/age.qml b/examples/declarative/particles/affectors/age.qml
index f3a48232e5..4b93f89034 100644
--- a/examples/declarative/particles/affectors/age.qml
+++ b/examples/declarative/particles/affectors/age.qml
@@ -55,8 +55,8 @@ Rectangle {
name: "snow"
source: "../images/snowflake.png"
frames: 51
- duration: 40
- durationVariation: 8
+ frameDuration: 40
+ frameDurationVariation: 8
}
}
diff --git a/examples/declarative/particles/affectors/attractor.qml b/examples/declarative/particles/affectors/attractor.qml
index 72f0513e6e..1bcbf33566 100644
--- a/examples/declarative/particles/affectors/attractor.qml
+++ b/examples/declarative/particles/affectors/attractor.qml
@@ -109,8 +109,7 @@ Rectangle {
name: "spinning"
source: "../images/meteor.png"
frames: 35
- duration: 60
- speedModifiesDuration: -0.1
+ frameDuration: 60
}
}
ImageParticle {
diff --git a/examples/declarative/particles/affectors/customaffector.qml b/examples/declarative/particles/affectors/customaffector.qml
index 0702ef28c8..6ff324f680 100644
--- a/examples/declarative/particles/affectors/customaffector.qml
+++ b/examples/declarative/particles/affectors/customaffector.qml
@@ -136,31 +136,31 @@ Item {
sprites: [Sprite {
source: "../images/realLeaf1.png"
frames: 1
- duration: 1
+ frameDuration: 1
to: {"a":1, "b":1, "c":1, "d":1}
}, Sprite {
name: "a"
source: "../images/realLeaf1.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
},
Sprite {
name: "b"
source: "../images/realLeaf2.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
},
Sprite {
name: "c"
source: "../images/realLeaf3.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
},
Sprite {
name: "d"
source: "../images/realLeaf4.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
}
]
diff --git a/examples/declarative/particles/affectors/friction.qml b/examples/declarative/particles/affectors/friction.qml
index 5092b1c3f8..ef990fa3c9 100644
--- a/examples/declarative/particles/affectors/friction.qml
+++ b/examples/declarative/particles/affectors/friction.qml
@@ -66,31 +66,31 @@ Item {
sprites: [Sprite {
source: "../images/realLeaf1.png"
frames: 1
- duration: 1
+ frameDuration: 1
to: {"a":1, "b":1, "c":1, "d":1}
}, Sprite {
name: "a"
source: "../images/realLeaf1.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
},
Sprite {
name: "b"
source: "../images/realLeaf2.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
},
Sprite {
name: "c"
source: "../images/realLeaf3.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
},
Sprite {
name: "d"
source: "../images/realLeaf4.png"
frames: 1
- duration: 10000
+ frameDuration: 10000
}
]
diff --git a/examples/declarative/particles/affectors/spritegoal.qml b/examples/declarative/particles/affectors/spritegoal.qml
index ac4f3c757a..06cacea116 100644
--- a/examples/declarative/particles/affectors/spritegoal.qml
+++ b/examples/declarative/particles/affectors/spritegoal.qml
@@ -106,20 +106,20 @@ Item {
name: "spinning"
source: "../images/meteor.png"
frames: 35
- duration: 40
+ frameDuration: 40
randomStart: true
to: {"explode":0, "spinning":1}
},Sprite {
name: "explode"
source: "../images/_explo.png"
frames: 22
- duration: 40
+ frameDuration: 40
to: {"nullFrame":1}
},Sprite {//Not sure if this is needed, but seemed easiest
name: "nullFrame"
source: "../images/nullRock.png"
frames: 1
- duration: 1000
+ frameDuration: 1000
}
]
}
diff --git a/examples/declarative/particles/affectors/wander.qml b/examples/declarative/particles/affectors/wander.qml
index 19dff7ec42..40f4e87d5b 100644
--- a/examples/declarative/particles/affectors/wander.qml
+++ b/examples/declarative/particles/affectors/wander.qml
@@ -52,8 +52,8 @@ Rectangle {
name: "snow"
source: "../images/snowflake.png"
frames: 51
- duration: 40
- durationVariation: 8
+ frameDuration: 40
+ frameDurationVariation: 8
}
}
diff --git a/examples/declarative/particles/imageparticle/allatonce.qml b/examples/declarative/particles/imageparticle/allatonce.qml
index 78b18e51fd..c0f877ad5d 100644
--- a/examples/declarative/particles/imageparticle/allatonce.qml
+++ b/examples/declarative/particles/imageparticle/allatonce.qml
@@ -55,7 +55,7 @@ Rectangle {
name: "bear"
source: "../images/bear_tiles.png"
frames: 13
- duration: 120
+ frameDuration: 120
}
]
colorVariation: 0.5
diff --git a/examples/declarative/particles/imageparticle/sprites.qml b/examples/declarative/particles/imageparticle/sprites.qml
index e05276151d..61a3ce5d89 100644
--- a/examples/declarative/particles/imageparticle/sprites.qml
+++ b/examples/declarative/particles/imageparticle/sprites.qml
@@ -52,7 +52,7 @@ Rectangle {
name: "bear"
source: "../images/bear_tiles.png"
frames: 13
- duration: 120
+ frameDuration: 120
}
width: 250
height: 250
@@ -72,25 +72,25 @@ Rectangle {
name: "happy"
source: "../images/starfish_1.png"
frames: 1
- duration: 260
+ frameDuration: 260
to: {"happy": 1, "silly": 1, "angry": 1}
}, Sprite {
name: "angry"
source: "../images/starfish_0.png"
frames: 1
- duration: 260
+ frameDuration: 260
to: {"happy": 1, "silly": 1, "angry": 1}
}, Sprite {
name: "silly"
source: "../images/starfish_2.png"
frames: 1
- duration: 260
+ frameDuration: 260
to: {"happy": 1, "silly": 1, "noticedbear": 0}
}, Sprite {
name: "noticedbear"
source: "../images/starfish_3.png"
frames: 1
- duration: 2600
+ frameDuration: 2600
}]
}
diff --git a/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
index 724cb34a2e..1ca5ff54ce 100644
--- a/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
+++ b/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
@@ -128,19 +128,19 @@ Item {
name: "spinning"
source: "pics/meteor.png"
frames: 35
- duration: 40
+ frameDuration: 40
to: {"death":0, "spinning":1}
},Sprite {
name: "death"
source: "pics/meteor_explo.png"
frames: 22
- duration: 40
+ frameDuration: 40
to: {"null":1}
}, Sprite {
name: "null"
source: "pics/nullRock.png"
frames: 1
- duration: 1000
+ frameDuration: 1000
}
]
}