diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-08 08:01:00 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-08 08:01:00 (GMT) |
commit | e08c4d393cbef8aa526328678ef4d71642b32f84 (patch) | |
tree | 7cdbe6331aa3a2177803b65cd8b35aab4b6b2217 /demos/declarative | |
parent | d265b449325ef60624640f80f9438ac63547c1a8 (diff) | |
download | Qt-e08c4d393cbef8aa526328678ef4d71642b32f84.zip Qt-e08c4d393cbef8aa526328678ef4d71642b32f84.tar.gz Qt-e08c4d393cbef8aa526328678ef4d71642b32f84.tar.bz2 |
Rename label to labeltext
Resolves scope collision between label property and label id
Diffstat (limited to 'demos/declarative')
-rw-r--r-- | demos/declarative/flickr/common/MediaLineEdit.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml index 4b21f66..f959bc5 100644 --- a/demos/declarative/flickr/common/MediaLineEdit.qml +++ b/demos/declarative/flickr/common/MediaLineEdit.qml @@ -6,18 +6,18 @@ Item { property string label property string text - width: Math.max(94,label.width + editor.width + 20) + width: Math.max(94,labeltext.width + editor.width + 20) height: buttonImage.height states: [ State { name: "Edit" PropertyChanges { - target: label + target: labeltext text: container.label + ": " } PropertyChanges { - target: label + target: labeltext x: 10 } PropertyChanges { @@ -78,7 +78,7 @@ Item { } Text { - id: label + id: labeltext font.bold: true color: "white" anchors.verticalCenter: container.verticalCenter @@ -93,7 +93,7 @@ Item { selectionColor: "green" width: 0 clip: true - anchors.left: label.right + anchors.left: labeltext.right anchors.verticalCenter: container.verticalCenter } Keys.forwardTo: [(returnKey), (editor)] |