diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-04-29 05:34:26 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-04-29 05:34:26 (GMT) |
| commit | 1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf (patch) | |
| tree | 58d500cf278a884d69d5a811a0ff0329c1febc1f /examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml | |
| parent | 012bf05b8c5e37bb102406d79023cb5d875deaac (diff) | |
| parent | 94a698046c2c00a4627607db1f7099880643e829 (diff) | |
| download | Qt-1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf.zip Qt-1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf.tar.gz Qt-1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf.tar.bz2 | |
Merge branch 'source' into kinetic-declarativeui
Conflicts:
demos/declarative/mediabrowser/content/PhonesPathView.qml
demos/declarative/mediabrowser/mediabrowser.qml
Diffstat (limited to 'examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml')
| -rw-r--r-- | examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml index d9ff4c5..65dace7 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml @@ -24,7 +24,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -34,7 +34,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -44,7 +44,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" |