summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-11-17 14:50:20 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-17 15:00:07 (GMT)
commitdb0940090853f316ed968a8220be32c59757225c (patch)
tree604552ed1154213a10ecc068027a95ca13b89ecd /demos
parent967ab2bf41070dee942227988439875698f1e731 (diff)
downloadQt-db0940090853f316ed968a8220be32c59757225c.zip
Qt-db0940090853f316ed968a8220be32c59757225c.tar.gz
Qt-db0940090853f316ed968a8220be32c59757225c.tar.bz2
demos/declarative/snake example corrections
Removed empty lines from snake.qml and Cookie.qml Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/declarative/snake/qml/snake/content/Cookie.qml2
-rw-r--r--demos/declarative/snake/qml/snake/snake.qml2
2 files changed, 1 insertions, 3 deletions
diff --git a/demos/declarative/snake/qml/snake/content/Cookie.qml b/demos/declarative/snake/qml/snake/content/Cookie.qml
index cef195a..72af41f 100644
--- a/demos/declarative/snake/qml/snake/content/Cookie.qml
+++ b/demos/declarative/snake/qml/snake/content/Cookie.qml
@@ -67,7 +67,6 @@ Item {
}
}
-
Particles { id: particles
width:1; height:1; anchors.centerIn: parent;
emissionRate: 0;
@@ -91,5 +90,4 @@ Item {
NumberAnimation { target: img; property: "opacity"; duration: 100 }
}
]
-
}
diff --git a/demos/declarative/snake/qml/snake/snake.qml b/demos/declarative/snake/qml/snake/snake.qml
index 3d6b772..edccd4c 100644
--- a/demos/declarative/snake/qml/snake/snake.qml
+++ b/demos/declarative/snake/qml/snake/snake.qml
@@ -76,7 +76,7 @@ Rectangle {
Timer {
id: heartbeat;
interval: heartbeatInterval;
- running: activeGame //&& runtime.isActiveWindow
+ running: activeGame && runtime.isActiveWindow
repeat: true
onTriggered: { Logic.move() }
}