summaryrefslogtreecommitdiffstats
path: root/examples/declarative/workerscript/workerscript.qml
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-04-15 09:10:43 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-04-15 09:10:43 (GMT)
commit06d71fb79ad850c62a1b95fbeec607dfc4220489 (patch)
tree78698d4ab162020c725ed06fa73aa27776f3e5ec /examples/declarative/workerscript/workerscript.qml
parente85223d233c0e1d6beca748332b8fbaba3ebbf2d (diff)
parent2b768dc774a5a957e7806515db3c7976bb9e337c (diff)
downloadQt-06d71fb79ad850c62a1b95fbeec607dfc4220489.zip
Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.tar.gz
Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'examples/declarative/workerscript/workerscript.qml')
-rw-r--r--examples/declarative/workerscript/workerscript.qml12
1 files changed, 4 insertions, 8 deletions
diff --git a/examples/declarative/workerscript/workerscript.qml b/examples/declarative/workerscript/workerscript.qml
index 1c7a920..6c6253b 100644
--- a/examples/declarative/workerscript/workerscript.qml
+++ b/examples/declarative/workerscript/workerscript.qml
@@ -1,7 +1,7 @@
import Qt 4.7
Rectangle {
- width: 480; height: 320;
+ width: 480; height: 320
WorkerScript {
id: myWorker
@@ -16,8 +16,7 @@ Rectangle {
Rectangle {
width: 200; height: 200
- anchors.left: parent.left
- anchors.leftMargin: 20
+ anchors.left: parent.left; anchors.leftMargin: 20
color: "red"
MouseArea {
@@ -28,8 +27,7 @@ Rectangle {
Rectangle {
width: 200; height: 200
- anchors.right: parent.right
- anchors.rightMargin: 20
+ anchors.right: parent.right; anchors.rightMargin: 20
color: "blue"
MouseArea {
@@ -40,8 +38,6 @@ Rectangle {
Text {
text: "Click a Rectangle!"
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 50
+ anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: 50 }
}
}