diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
| commit | cb50699b39e016a64a2a06088042622546c428a2 (patch) | |
| tree | 77d269a3103a6c140098b9caaafd17a29a81addd /demos/declarative/snake/content | |
| parent | 89807f70656b95c1568ef183dd7f28c527fc3eaa (diff) | |
| parent | 890c1110ec5e39bb6e63e99fe09c296c1ea824be (diff) | |
| download | Qt-cb50699b39e016a64a2a06088042622546c428a2.zip Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.gz Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'demos/declarative/snake/content')
| -rw-r--r-- | demos/declarative/snake/content/pics/pause.png | bin | 0 -> 4327 bytes | |||
| -rw-r--r-- | demos/declarative/snake/content/snake.js | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/snake/content/pics/pause.png b/demos/declarative/snake/content/pics/pause.png Binary files differnew file mode 100644 index 0000000..056d97d --- /dev/null +++ b/demos/declarative/snake/content/pics/pause.png diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js index 2a99aa8..837b82a 100644 --- a/demos/declarative/snake/content/snake.js +++ b/demos/declarative/snake/content/snake.js @@ -39,7 +39,7 @@ function startNewGame() return; } - if (heartbeat.running) { + if (activeGame) { endGame(); startNewGameTimer.running = true; return; @@ -93,7 +93,7 @@ function startNewGame() function endGame() { - heartbeat.running = false; + activeGame = false; for(var i in snake) snake[i].dying = true; if (cookie) { |
