diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-20 22:00:14 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-20 22:00:14 (GMT) |
| commit | dd97db856bc19d648d7faa3aac4e27576dcb2512 (patch) | |
| tree | 0bb9fde945a0d3883e6fa3291f807c8827bbb48c /examples | |
| parent | e4b0fe70c6435bb860df526d615dfdf53dfb5abd (diff) | |
| parent | 80f031dfca7c161de4461514dfd8d9d664ea2f03 (diff) | |
| download | Qt-dd97db856bc19d648d7faa3aac4e27576dcb2512.zip Qt-dd97db856bc19d648d7faa3aac4e27576dcb2512.tar.gz Qt-dd97db856bc19d648d7faa3aac4e27576dcb2512.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml index 4c1ad51..c60f2df 100644 --- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml +++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml @@ -55,22 +55,6 @@ Rectangle { source: "content/pics/board.png" } - Text { - id: messageDisplay - anchors.centerIn: parent - color: "blue" - style: Text.Outline; styleColor: "white" - font.pixelSize: 50; font.bold: true - visible: false - - Timer { - running: messageDisplay.visible - onTriggered: { - messageDisplay.visible = false; - Logic.restartGame(); - } - } - } Column { id: display @@ -118,4 +102,22 @@ Rectangle { } } } + + + Text { + id: messageDisplay + anchors.centerIn: parent + color: "blue" + style: Text.Outline; styleColor: "white" + font.pixelSize: 50; font.bold: true + visible: false + + Timer { + running: messageDisplay.visible + onTriggered: { + messageDisplay.visible = false; + Logic.restartGame(); + } + } + } } |