summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-26 04:16:53 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-26 04:16:53 (GMT)
commit2645c00cb0beafcadebdb971ff925ab915f0e9fa (patch)
treece88c20b8d53e801b9412ba706d439cec770a8ab /examples/declarative
parentbacb91e5822ad4a6b1ff5ac6a2cb72ce55e55008 (diff)
parent33a6e1e08b0a542fc631f28ddc269cec2fec97ce (diff)
downloadQt-2645c00cb0beafcadebdb971ff925ab915f0e9fa.zip
Qt-2645c00cb0beafcadebdb971ff925ab915f0e9fa.tar.gz
Qt-2645c00cb0beafcadebdb971ff925ab915f0e9fa.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/slideswitch/slideswitch.qml6
-rw-r--r--examples/declarative/tutorials/helloworld/Cell.qml2
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/slideswitch/slideswitch.qml b/examples/declarative/slideswitch/slideswitch.qml
index 9b46cd1..396749f 100644
--- a/examples/declarative/slideswitch/slideswitch.qml
+++ b/examples/declarative/slideswitch/slideswitch.qml
@@ -5,7 +5,7 @@ Rectangle {
color: "white"
width: 400; height: 250
- Switch {
- anchors.centerIn: parent
- }
+//![0]
+ Switch { anchors.centerIn: parent; on: false }
+//![0]
}
diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/declarative/tutorials/helloworld/Cell.qml
index ab6e565..c38b40e 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/declarative/tutorials/helloworld/Cell.qml
@@ -8,7 +8,7 @@ Item {
property alias color: rectangle.color
//![4]
//![5]
- signal clicked(string color)
+ signal clicked(color color)
//![5]
width: 40; height: 25