diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-05 03:39:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-05 03:39:21 (GMT) |
| commit | b4b34a9a50c28cb65f81a12d94b61cc6f9a19051 (patch) | |
| tree | 61a7c23ba2960ef1102ecde9d0a0e3d4eea98ea7 | |
| parent | d02cc90ec24fd30d1440e06eb443eafb221cdbe7 (diff) | |
| parent | eb80cce5bb3d5360fa30e7bacad4210f6ce86e10 (diff) | |
| download | Qt-b4b34a9a50c28cb65f81a12d94b61cc6f9a19051.zip Qt-b4b34a9a50c28cb65f81a12d94b61cc6f9a19051.tar.gz Qt-b4b34a9a50c28cb65f81a12d94b61cc6f9a19051.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | examples/declarative/minehunt/minehunt.qml | 6 | ||||
| -rw-r--r-- | examples/declarative/minehunt/pics/face-sad.png | bin | 0 -> 14844 bytes | |||
| -rw-r--r-- | examples/declarative/minehunt/pics/face-smile-big.png | bin | 0 -> 13810 bytes | |||
| -rw-r--r-- | examples/declarative/minehunt/pics/face-smile.png | bin | 0 -> 15408 bytes | |||
| -rw-r--r-- | examples/declarative/minehunt/pics/frown.png | bin | 1036 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/minehunt/pics/glee.png | bin | 1082 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/minehunt/pics/smile.png | bin | 1028 -> 0 bytes |
7 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 58397b0..bf31c3d 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -148,9 +148,9 @@ Item { text: numFlags } Image { - x: 240 - y: 0 - source: if(isPlaying==true){'pics/smile.png'}else{if(hasWon==true){'pics/glee.png'}else{'pics/frown.png'}} + x: 280 + y: 10 + source: if(isPlaying==true){'pics/face-smile.png'}else{if(hasWon==true){'pics/face-smile-big.png'}else{'pics/face-sad.png'}} MouseRegion { anchors.fill: parent onClicked: { reset() } diff --git a/examples/declarative/minehunt/pics/face-sad.png b/examples/declarative/minehunt/pics/face-sad.png Binary files differnew file mode 100644 index 0000000..cf00aaf --- /dev/null +++ b/examples/declarative/minehunt/pics/face-sad.png diff --git a/examples/declarative/minehunt/pics/face-smile-big.png b/examples/declarative/minehunt/pics/face-smile-big.png Binary files differnew file mode 100644 index 0000000..f9c2335 --- /dev/null +++ b/examples/declarative/minehunt/pics/face-smile-big.png diff --git a/examples/declarative/minehunt/pics/face-smile.png b/examples/declarative/minehunt/pics/face-smile.png Binary files differnew file mode 100644 index 0000000..3d66d72 --- /dev/null +++ b/examples/declarative/minehunt/pics/face-smile.png diff --git a/examples/declarative/minehunt/pics/frown.png b/examples/declarative/minehunt/pics/frown.png Binary files differdeleted file mode 100644 index 52684b3..0000000 --- a/examples/declarative/minehunt/pics/frown.png +++ /dev/null diff --git a/examples/declarative/minehunt/pics/glee.png b/examples/declarative/minehunt/pics/glee.png Binary files differdeleted file mode 100644 index 59ea583..0000000 --- a/examples/declarative/minehunt/pics/glee.png +++ /dev/null diff --git a/examples/declarative/minehunt/pics/smile.png b/examples/declarative/minehunt/pics/smile.png Binary files differdeleted file mode 100644 index ccd52cd..0000000 --- a/examples/declarative/minehunt/pics/smile.png +++ /dev/null |
