summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials/samegame/samegame1/samegame.qml
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-04-13 08:20:16 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-04-13 08:20:16 (GMT)
commitadd41080b9a4e2319007063bd73447f336933e9e (patch)
tree2b5bcbf18d4a0b3dc96043a430830c8212e85749 /examples/declarative/tutorials/samegame/samegame1/samegame.qml
parent1055099e331af3b10d0b81b1a965e7d3db5f272d (diff)
parentfbacd0fb2eb41470b090a3cbca7535f78689a382 (diff)
downloadQt-add41080b9a4e2319007063bd73447f336933e9e.zip
Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.gz
Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'examples/declarative/tutorials/samegame/samegame1/samegame.qml')
-rw-r--r--examples/declarative/tutorials/samegame/samegame1/samegame.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index 006b926..ae881ba 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -1,5 +1,5 @@
//![0]
-import Qt 4.6
+import Qt 4.7
Rectangle {
id: screen
@@ -24,7 +24,7 @@ Rectangle {
anchors.bottom: screen.bottom
Button {
- id: btnA; text: "New Game"; onClicked: console.log("Starting a new game...");
+ text: "New Game"; onClicked: console.log("Starting a new game...");
anchors.left: parent.left; anchors.leftMargin: 3
anchors.verticalCenter: parent.verticalCenter
}