diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-06 23:56:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-06 23:56:32 (GMT) |
| commit | 1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2 (patch) | |
| tree | 2b42dee7e29da05ee3c185dae653bdb90b1d834a /examples/declarative/tutorials | |
| parent | 627f9b09896a1933dd55e1157a06bdec84c7d70c (diff) | |
| parent | 15e78b8487ee223eb44acf3d34e1cb71f76234ca (diff) | |
| download | Qt-1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2.zip Qt-1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2.tar.gz Qt-1ae95bbda437d6b4829cc3979b40ceffc5eb2ff2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative/tutorials')
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml index 964975f..3c20462 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml @@ -32,7 +32,7 @@ Rect { anchors.rightMargin: 4 font.bold: true color: "white" - hAlign: AlignHCenter + hAlign: "AlignHCenter" text: "Remove" } } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml index 79aae7a..a359aaf 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml @@ -71,7 +71,7 @@ Rect { anchors.rightMargin: 4 font.bold: true color: "white" - hAlign: AlignHCenter + hAlign: "AlignHCenter" text: "Remove" opacity: 0 } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml index ce8459d..4db49ea 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml @@ -78,7 +78,7 @@ Rect { anchors.rightMargin: 4 font.bold: true color: "white" - hAlign: AlignHCenter + hAlign: "AlignHCenter" text: "Remove" opacity: 0 } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml index 6c9078a..29d464b 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml @@ -67,7 +67,7 @@ Rect { anchors.rightMargin: 4 font.bold: true color: "white" - hAlign: AlignHCenter + hAlign: "AlignHCenter" text: "Remove" opacity: 0 } diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml index a358b21..bf6e82d 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml @@ -69,7 +69,7 @@ Rect { anchors.rightMargin: 4 font.bold: true color: "white" - hAlign: AlignHCenter + hAlign: "AlignHCenter" text: "Remove" opacity: 0 } |