diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-19 08:45:52 (GMT) |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-19 08:45:52 (GMT) |
commit | 9547ade2b9cd7c792d98bf06ca8de89c9e560396 (patch) | |
tree | aa43069092eaaa2078c21c86347c28e3ac41c574 /examples/declarative/tutorials/helloworld/tutorial2.qml | |
parent | fa608f9094591c146f9170ba485ea2e4d7827dca (diff) | |
parent | cbb28a77cb295b74d47a5a1923357dd6557bea84 (diff) | |
download | Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.zip Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.tar.gz Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'examples/declarative/tutorials/helloworld/tutorial2.qml')
-rw-r--r-- | examples/declarative/tutorials/helloworld/tutorial2.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/declarative/tutorials/helloworld/tutorial2.qml index 085efa4..66be509 100644 --- a/examples/declarative/tutorials/helloworld/tutorial2.qml +++ b/examples/declarative/tutorials/helloworld/tutorial2.qml @@ -9,8 +9,9 @@ Rectangle { Text { id: helloText text: "Hello world!" + y: 30 + anchors.horizontalCenter: page.horizontalCenter font.pointSize: 24; font.bold: true - y: 30; anchors.horizontalCenter: page.horizontalCenter } Grid { |