diff options
author | Bea Lam <bea.lam@nokia.com> | 2009-10-05 05:51:00 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2009-10-05 05:51:00 (GMT) |
commit | a3349d20dca10d32fc8ab95591108f1ec49dc034 (patch) | |
tree | 08cf99fffff3cd39fc787439b4e760c77dd32b3d /examples | |
parent | e090374657b98b92b040bb0de11e2ce6c085077d (diff) | |
download | Qt-a3349d20dca10d32fc8ab95591108f1ec49dc034.zip Qt-a3349d20dca10d32fc8ab95591108f1ec49dc034.tar.gz Qt-a3349d20dca10d32fc8ab95591108f1ec49dc034.tar.bz2 |
Fix example following API changes and fix window size for example 2.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/RemoveButton.qml (renamed from examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml | 2 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml | 2 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml | 2 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml | 5 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml | 5 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml | 2 | ||||
-rw-r--r-- | examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml | 1 |
8 files changed, 10 insertions, 9 deletions
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/RemoveButton.qml index a8ac7fe..a8ac7fe 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/Removebutton.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1/RemoveButton.qml diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml index 162452f..9508018 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml @@ -21,7 +21,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.bold: true color: "black" - text: 123123 + text: "123123" } Image { source: "../../shared/pics/phone.png" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml index cf50fb0..e50dcc5 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml @@ -24,7 +24,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.bold: true color: "black" - text: 123123 + text: "123123" } Image { source: "../../shared/pics/phone.png" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml index 2e1a488..ce6a289 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml @@ -23,7 +23,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.bold: true color: "black" - text: 123123 + text: "123123" } Image { source: "../../shared/pics/phone.png" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml index 3516cee..f253763 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml @@ -16,9 +16,10 @@ Item { Column { id: layout - anchors.fill: parent + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right spacing: 5 - margin: 5 ContactField { id: labelField anchors.left: layout.left diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml index 83988ab..db85d2a 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml @@ -19,9 +19,10 @@ Item { Column { id: layout - anchors.fill: parent + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right spacing: 5 - margin: 5 ContactField { id: labelField anchors.left: layout.left diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml index a7764ed..cd14a08 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml @@ -5,7 +5,7 @@ Rectangle { width: layout.width height: layout.height color: "white" - Bind { + Binding { id: currentItem value: true } diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml index d00bf05..58a542b 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml @@ -17,7 +17,6 @@ Item { id: layout anchors.fill: parent spacing: 5 - margin: 5 ContactField { id: labelField anchors.left: layout.left |