summaryrefslogtreecommitdiffstats
path: root/demos/declarative/samegame
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-07-20 05:01:32 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-07-20 05:01:32 (GMT)
commit2e4684e1004c3e5be16fb4ef21d8b2400063b241 (patch)
treea661267ce4fb7dad7f54cf39e8f04b55feff1ca9 /demos/declarative/samegame
parentc8b42c5851377c075c2c4147a625f23f2f6f6173 (diff)
downloadQt-2e4684e1004c3e5be16fb4ef21d8b2400063b241.zip
Qt-2e4684e1004c3e5be16fb4ef21d8b2400063b241.tar.gz
Qt-2e4684e1004c3e5be16fb4ef21d8b2400063b241.tar.bz2
Bug fixes for SameGame demo
pngs are now 40x40, swapping between themes works again.
Diffstat (limited to 'demos/declarative/samegame')
-rw-r--r--demos/declarative/samegame/content/pics/blueStone.pngbin4823 -> 2691 bytes
-rw-r--r--demos/declarative/samegame/content/pics/greenStone.pngbin4724 -> 2662 bytes
-rw-r--r--demos/declarative/samegame/content/pics/redStone.pngbin4585 -> 2604 bytes
-rw-r--r--demos/declarative/samegame/content/pics/yellowStone.pngbin4818 -> 2667 bytes
-rw-r--r--demos/declarative/samegame/content/samegame.js3
5 files changed, 0 insertions, 3 deletions
diff --git a/demos/declarative/samegame/content/pics/blueStone.png b/demos/declarative/samegame/content/pics/blueStone.png
index 673f1ce..bf342e0 100644
--- a/demos/declarative/samegame/content/pics/blueStone.png
+++ b/demos/declarative/samegame/content/pics/blueStone.png
Binary files differ
diff --git a/demos/declarative/samegame/content/pics/greenStone.png b/demos/declarative/samegame/content/pics/greenStone.png
index 0c087d0..5ac14a5 100644
--- a/demos/declarative/samegame/content/pics/greenStone.png
+++ b/demos/declarative/samegame/content/pics/greenStone.png
Binary files differ
diff --git a/demos/declarative/samegame/content/pics/redStone.png b/demos/declarative/samegame/content/pics/redStone.png
index 80c2e2e..b099f60 100644
--- a/demos/declarative/samegame/content/pics/redStone.png
+++ b/demos/declarative/samegame/content/pics/redStone.png
Binary files differ
diff --git a/demos/declarative/samegame/content/pics/yellowStone.png b/demos/declarative/samegame/content/pics/yellowStone.png
index 5349eff..c56124a 100644
--- a/demos/declarative/samegame/content/pics/yellowStone.png
+++ b/demos/declarative/samegame/content/pics/yellowStone.png
Binary files differ
diff --git a/demos/declarative/samegame/content/samegame.js b/demos/declarative/samegame/content/samegame.js
index 925a5b8..1f76b9f 100644
--- a/demos/declarative/samegame/content/samegame.js
+++ b/demos/declarative/samegame/content/samegame.js
@@ -12,14 +12,11 @@ var compSrc;
var component;
function swapTileSrc(){
- if(swapped)
- return;
if(tileSrc == "content/SpinBlock.qml"){
tileSrc = "content/BoomBlock.qml";
}else{
tileSrc = "content/SpinBlock.qml";
}
- swapped = true;
}
function index(xIdx,yIdx){