diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-08 10:00:18 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-08 10:00:18 (GMT) |
| commit | 136daef2ff117698c6788655bcd75e046ec84753 (patch) | |
| tree | 99305b44b9820278e14ed9edcb513c2616ff9d2c /examples/declarative | |
| parent | 0fcc46e34c7feedfa1758ead64b09be59813f7d1 (diff) | |
| parent | db531c30eb73ff7aeac9cf07b06d6a108b2c13ec (diff) | |
| download | Qt-136daef2ff117698c6788655bcd75e046ec84753.zip Qt-136daef2ff117698c6788655bcd75e046ec84753.tar.gz Qt-136daef2ff117698c6788655bcd75e046ec84753.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame2/samegame.qml | 8 | ||||
| -rw-r--r-- | examples/declarative/tutorials/samegame/samegame3/samegame.qml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml index 78a3d83..63431b1 100644 --- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml +++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml @@ -5,9 +5,9 @@ Rectangle { width: 490; height: 720 SystemPalette { id: activePalette; colorGroup: Qt.Active } - //![2] +//![2] Script { source: "samegame.js" } - //![2] +//![2] Item { width: parent.width; anchors.top: parent.top; anchors.bottom: ToolBar.top @@ -25,13 +25,13 @@ Rectangle { height: 32; width: parent.width anchors.bottom: Screen.bottom - //![1] +//![1] Button { id: btnA; text: "New Game"; onClicked: initBoard(); anchors.left: parent.left; anchors.leftMargin: 3 anchors.verticalCenter: parent.verticalCenter } - //![1] +//![1] Text { id: Score diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml index a0883da..5b98f48 100644 --- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml +++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml @@ -17,7 +17,7 @@ Rectangle { fillMode: "PreserveAspectCrop" } - //![1] +//![1] Item { id: gameCanvas property int score: 0 @@ -32,12 +32,12 @@ Rectangle { anchors.fill: parent; onClicked: handleClick(mouse.x,mouse.y); } } - //![1] +//![1] } - //![2] +//![2] Dialog { id: dialog; anchors.centerIn: parent; z: 21 } - //![2] +//![2] Rectangle { id: ToolBar |