diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-06 02:29:32 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-06 02:29:32 (GMT) |
| commit | abf7649fb60a87208a3d915d97f4fee9bee02f26 (patch) | |
| tree | a789b810f5bfb822992b4caf1f14b81fd2b02ee4 /demos | |
| parent | c3abf1a4ae82a57bbc6cc324fa6f9a99615ab066 (diff) | |
| parent | e559d97aa8e37c63b9e0090fe5dfa4b9bdeb079e (diff) | |
| download | Qt-abf7649fb60a87208a3d915d97f4fee9bee02f26.zip Qt-abf7649fb60a87208a3d915d97f4fee9bee02f26.tar.gz Qt-abf7649fb60a87208a3d915d97f4fee9bee02f26.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/contacts/Contact.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/contacts/Contact.qml b/demos/declarative/contacts/Contact.qml index 91510c7..e12cd3b 100644 --- a/demos/declarative/contacts/Contact.qml +++ b/demos/declarative/contacts/Contact.qml @@ -82,8 +82,8 @@ Item { } Column { id: layout - width: contents.width - height:contents.height + width: childrenRect.width + height: childrenRect.height anchors.centerIn: parent spacing: 5 ContactField { |