diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-20 07:37:59 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-20 07:37:59 (GMT) |
commit | fd7dca696e09f3f57c54406fe1393fccdc298a36 (patch) | |
tree | 6d7e79254555ee1c2950572fac9644ac358bdd07 /demos/declarative/samegame | |
parent | 50fd8253b534d657d7ab6e2dd88c14d3943f869c (diff) | |
download | Qt-fd7dca696e09f3f57c54406fe1393fccdc298a36.zip Qt-fd7dca696e09f3f57c54406fe1393fccdc298a36.tar.gz Qt-fd7dca696e09f3f57c54406fe1393fccdc298a36.tar.bz2 |
Renaming Palette -> SystemPalette
Diffstat (limited to 'demos/declarative/samegame')
-rw-r--r-- | demos/declarative/samegame/SameGame.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml index 00853ad..d476e8b 100644 --- a/demos/declarative/samegame/SameGame.qml +++ b/demos/declarative/samegame/SameGame.qml @@ -5,13 +5,13 @@ import "content" Rectangle { id: page; width: 460; height: 700; color: activePalette.window Script { source: "content/samegame.js" } - Palette { id: activePalette; colorGroup: "Active" } + SystemPalette { id: activePalette; colorGroup: Qt.Active } Rectangle { id: gameCanvas property int score: 0 z:20; y:20; color: "white"; border.width: 1 - width:parent.width - tileSize - (parent.width % tileSize); - height:parent.height - tileSize - (parent.height % tileSize); + width:parent.width - tileSize - (parent.width % tileSize); + height:parent.height - tileSize - (parent.height % tileSize); anchors.horizontalCenter: parent.horizontalCenter Image { id:background; source: "content/pics/background.png" @@ -23,12 +23,12 @@ Rectangle { } Dialog { id: dialog; anchors.centerIn: parent; z: 21} - Button { - id: btnA; text: "New Game"; onClicked: {initBoard();} + Button { + id: btnA; text: "New Game"; onClicked: {initBoard();} anchors.top: gameCanvas.bottom; anchors.topMargin: 4; anchors.left: gameCanvas.left; } - Text { - text: "Score: " + gameCanvas.score; width:100; font.pointSize:14 + Text { + text: "Score: " + gameCanvas.score; width:100; font.pointSize:14 anchors.top: gameCanvas.bottom; anchors.topMargin: 4; anchors.right: gameCanvas.right; } } |