summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-26 15:02:22 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-26 15:02:22 (GMT)
commit39fc05d99cb86897560db4cb96d7669b0c543c63 (patch)
tree81ec35a007fa44982961df942c1af8732a023008
parent6d9e42793f912dbaf742c8f941bbdb9041d08a7f (diff)
parentaa54284a9793b980097053297affee8ca197297d (diff)
downloadQt-39fc05d99cb86897560db4cb96d7669b0c543c63.zip
Qt-39fc05d99cb86897560db4cb96d7669b0c543c63.tar.gz
Qt-39fc05d99cb86897560db4cb96d7669b0c543c63.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--demos/declarative/snake/Cookie.qml2
-rw-r--r--demos/declarative/snake/pics/yellowStar.pngbin0 -> 276 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/snake/Cookie.qml b/demos/declarative/snake/Cookie.qml
index d1577ca..7f0aadf 100644
--- a/demos/declarative/snake/Cookie.qml
+++ b/demos/declarative/snake/Cookie.qml
@@ -33,7 +33,7 @@ Item {
lifeSpan: 700; lifeSpanDeviation: 600;
angle: 0; angleDeviation: 360;
velocity: 100; velocityDeviation:30;
- source: "pics/greenStar.png";
+ source: "pics/yellowStar.png";
}
states: [
diff --git a/demos/declarative/snake/pics/yellowStar.png b/demos/declarative/snake/pics/yellowStar.png
new file mode 100644
index 0000000..52fb9c4
--- /dev/null
+++ b/demos/declarative/snake/pics/yellowStar.png
Binary files differ