diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
commit | 82913414623f36acb3d2c07d6c124af9f61fcdb4 (patch) | |
tree | 610f66dd1fcb487e20bbf18587e8cfad38a40826 /examples/quick | |
parent | d34098d8981d9103626ff7264e7b5ec084bfb63e (diff) | |
parent | f95fdacb3a12e4f0d37d3c32b34326f2bd1536de (diff) |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/qml/qml/qqmlcompiler.cpp
Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/demos/maroon/maroon.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/quick/demos/maroon/maroon.qml b/examples/quick/demos/maroon/maroon.qml index 34f345f0e7..c6150a5b95 100644 --- a/examples/quick/demos/maroon/maroon.qml +++ b/examples/quick/demos/maroon/maroon.qml @@ -47,7 +47,7 @@ Item { id: root width: 320 height: 480 - property var gameState: Logic.newGameState(canvas); + property var gameState property bool passedSplash: false Image { @@ -230,4 +230,6 @@ Item { transitions: Transition { NumberAnimation { properties: "x,y"; duration: 1200; easing.type: Easing.OutQuad } } + + Component.onCompleted: gameState = Logic.newGameState(canvas); } |