diff options
author | Cristiano di Flora <cristiano.di-flora@nokia.com> | 2012-04-03 14:57:52 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 14:03:00 +0200 |
commit | d6c2d5fff6e2f8e2c3697613a3de783e0079590a (patch) | |
tree | 15573dafec162bea186fb9377cc9a13d10f7f585 /examples | |
parent | e844cce6ca0f7cd2223ce577797ba696e2a4ec89 (diff) |
Remove obsoleted references to customLabel.
Remove customLabel usage from examples/qmlcontacts
Cleanup qdeclarativecontactdetail documentation.
Change-Id: I528813c2a3aade378db1443e778b9e39f5058bc3
Reviewed-by: Kranthi Kuntala <kranthi.kumar-kuntala@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qmlcontacts/contents/ContactListView.qml | 2 | ||||
-rw-r--r-- | examples/qmlcontacts/contents/ContactView.qml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/qmlcontacts/contents/ContactListView.qml b/examples/qmlcontacts/contents/ContactListView.qml index a3c30539e..9fc830756 100644 --- a/examples/qmlcontacts/contents/ContactListView.qml +++ b/examples/qmlcontacts/contents/ContactListView.qml @@ -114,7 +114,7 @@ Item { Column { Text { - text: model.contact.displayLabel + text: model.contact.displayLabel ? model.contact.displayLabel.label : "" color: details.textColor; } Text { diff --git a/examples/qmlcontacts/contents/ContactView.qml b/examples/qmlcontacts/contents/ContactView.qml index 31c484fab..0b2a5c7ec 100644 --- a/examples/qmlcontacts/contents/ContactView.qml +++ b/examples/qmlcontacts/contents/ContactView.qml @@ -74,10 +74,10 @@ Item { font.weight: Font.Bold } FieldRow { - id: customLabelRow + id: displayLabelRow width: normalView.width label: "Display" - value: contact ? contact.name.customLabel : "" + value: (contact && contact.displayLabel) ? contact.displayLabel.label : "" } FieldRow { id: firstNameRow @@ -275,7 +275,7 @@ Item { onButtonClicked: { // force the focus away from any TextInputs, to ensure they save toolBar.focus = true - contact.name.customLabel = customLabelRow.newValue + contact.displayLabel.label = displayLabelRow.newValue contact.name.firstName = firstNameRow.newValue contact.name.lastName = lastNameRow.newValue switch (index) { |