diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 16:06:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 16:06:30 (GMT) |
| commit | 4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11 (patch) | |
| tree | f19b0091967ea0211f45ffe23838fff40dbc9ea6 /demos/declarative | |
| parent | 967afc717ffd411e22ce94de77cf54284815b27e (diff) | |
| parent | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (diff) | |
| download | Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.zip Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.tar.gz Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/samegame/SamegameCore/Button.qml | 4 | ||||
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml index 7fb7b65..140b196 100644 --- a/demos/declarative/samegame/SamegameCore/Button.qml +++ b/demos/declarative/samegame/SamegameCore/Button.qml @@ -48,7 +48,7 @@ Rectangle { signal clicked - width: buttonLabel.width + 20; height: buttonLabel.height + 6 + width: buttonLabel.width + 20; height: buttonLabel.height + 20 smooth: true border { width: 1; color: Qt.darker(activePalette.button) } radius: 8 @@ -70,6 +70,6 @@ Rectangle { MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() } Text { - id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText + id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText; font.pixelSize: 24 } } diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index f66c40e..b66c5a6 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -133,7 +133,7 @@ Rectangle { Rectangle { id: toolBar - width: parent.width; height: 32 + width: parent.width; height: 58 color: activePalette.window anchors.bottom: screen.bottom @@ -156,6 +156,7 @@ Rectangle { anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter } text: "Score: " + gameCanvas.score font.bold: true + font.pixelSize: 24 color: activePalette.windowText } } |