diff options
author | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
---|---|---|
committer | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
commit | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (patch) | |
tree | 518c22b7317c5646d2ce0adc5deb5818b2ea0af6 /examples/declarative/tutorials/samegame/samegame3/samegame.qml | |
parent | dcc9a7e72fe4c283df59378d08d75aecfa3b3b05 (diff) | |
parent | ac519ee416e06f4ab471f102da306f94de21c90d (diff) | |
download | Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.zip Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.gz Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
examples/declarative/dial/dial-example.qml
Diffstat (limited to 'examples/declarative/tutorials/samegame/samegame3/samegame.qml')
-rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/samegame.qml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml index 50f9d5d..ac93eb1 100644 --- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml +++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml @@ -30,7 +30,6 @@ Rectangle { width: parent.width - (parent.width % blockSize) height: parent.height - (parent.height % blockSize) anchors.centerIn: parent - z: 20 MouseArea { anchors.fill: parent @@ -41,26 +40,29 @@ Rectangle { } //![2] - Dialog { id: dialog; anchors.centerIn: parent; z: 21 } + Dialog { + id: dialog + anchors.centerIn: parent + z: 100 + } //![2] Rectangle { id: toolBar - width: parent.width; height: 32 + width: parent.width; height: 30 color: activePalette.window anchors.bottom: screen.bottom Button { - anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter } + anchors { left: parent.left; verticalCenter: parent.verticalCenter } text: "New Game" onClicked: SameGame.startNewGame() } Text { id: score - anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter } + anchors { right: parent.right; verticalCenter: parent.verticalCenter } text: "Score: Who knows?" - font.bold: true } } } |