diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-02 00:52:12 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-02 00:52:12 (GMT) |
| commit | b88740e48ce82bc118a598358a8d8aff79d2a279 (patch) | |
| tree | 4274091038e0b375d377acb3f4d5b515e1ab62cb /examples/declarative/tutorials/samegame/samegame3 | |
| parent | 2790cb59f6877c1027c833578b72e168c912758a (diff) | |
| parent | 172df566d0ff512012afbc5039535e532868a1e5 (diff) | |
| download | Qt-b88740e48ce82bc118a598358a8d8aff79d2a279.zip Qt-b88740e48ce82bc118a598358a8d8aff79d2a279.tar.gz Qt-b88740e48ce82bc118a598358a8d8aff79d2a279.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
demos/declarative/minehunt/main.cpp
demos/declarative/minehunt/minehunt.qml
Diffstat (limited to 'examples/declarative/tutorials/samegame/samegame3')
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/Block.qml | 6 | ||||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/pics/background.png | bin | 313930 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/pics/blueStone.png | bin | 3054 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/pics/greenStone.png | bin | 2932 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/pics/redStone.png | bin | 2902 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/samegame.qml | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/tutorials/samegame/samegame3/Block.qml b/examples/declarative/tutorials/samegame/samegame3/Block.qml index 30a8d3a..7620104 100644 --- a/examples/declarative/tutorials/samegame/samegame3/Block.qml +++ b/examples/declarative/tutorials/samegame/samegame3/Block.qml @@ -8,11 +8,11 @@ Item { Image { id: img source: { if(type == 0){ - "pics/redStone.png"; + "../shared/pics/redStone.png"; } else if(type == 1) { - "pics/blueStone.png"; + "../shared/pics/blueStone.png"; } else { - "pics/greenStone.png"; + "../shared/pics/greenStone.png"; } } anchors.fill: parent diff --git a/examples/declarative/tutorials/samegame/samegame3/pics/background.png b/examples/declarative/tutorials/samegame/samegame3/pics/background.png Binary files differdeleted file mode 100644 index 3734a27..0000000 --- a/examples/declarative/tutorials/samegame/samegame3/pics/background.png +++ /dev/null diff --git a/examples/declarative/tutorials/samegame/samegame3/pics/blueStone.png b/examples/declarative/tutorials/samegame/samegame3/pics/blueStone.png Binary files differdeleted file mode 100644 index 20e43c7..0000000 --- a/examples/declarative/tutorials/samegame/samegame3/pics/blueStone.png +++ /dev/null diff --git a/examples/declarative/tutorials/samegame/samegame3/pics/greenStone.png b/examples/declarative/tutorials/samegame/samegame3/pics/greenStone.png Binary files differdeleted file mode 100644 index b568a19..0000000 --- a/examples/declarative/tutorials/samegame/samegame3/pics/greenStone.png +++ /dev/null diff --git a/examples/declarative/tutorials/samegame/samegame3/pics/redStone.png b/examples/declarative/tutorials/samegame/samegame3/pics/redStone.png Binary files differdeleted file mode 100644 index 36b09a2..0000000 --- a/examples/declarative/tutorials/samegame/samegame3/pics/redStone.png +++ /dev/null diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml index c616397..168bf9b 100644 --- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml +++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml @@ -13,7 +13,7 @@ Rectangle { Image { id: background - anchors.fill: parent; source: "pics/background.png" + anchors.fill: parent; source: "../shared/pics/background.jpg" fillMode: Image.PreserveAspectCrop } |
