diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-18 00:44:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-18 00:44:15 (GMT) |
| commit | b35582c2c08ffdbba91f83f0cdf775dda47af3a9 (patch) | |
| tree | 80c85d1c8539c656289ede63fc4bbe03342173cd /examples/declarative | |
| parent | 8f5e72298fc4b8a5838bee1291a2cc422750b6b8 (diff) | |
| parent | 39a2e72700aa481fefc7df7fa64d8dc8c1670d2e (diff) | |
| download | Qt-b35582c2c08ffdbba91f83f0cdf775dda47af3a9.zip Qt-b35582c2c08ffdbba91f83f0cdf775dda47af3a9.tar.gz Qt-b35582c2c08ffdbba91f83f0cdf775dda47af3a9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
6 files changed, 8 insertions, 8 deletions
diff --git a/examples/declarative/clock/display.qml b/examples/declarative/clock/display.qml index cd6dcf7..00af9b3 100644 --- a/examples/declarative/clock/display.qml +++ b/examples/declarative/clock/display.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rect { - width: contents.width - height: contents.height + width: childrenRect.width + height: childrenRect.height Clock { id: Clock } } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml index a70ef16..1087d6a 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml @@ -7,7 +7,7 @@ Rect { color: "white" VerticalPositioner { id: layout - width: contents.width + width: childrenRect.width GroupBox { contents: "1/RemoveButton.qml" label: "Rectangle Component" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml index 7ac513e..70b8b95 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml @@ -9,7 +9,7 @@ Rect { id: layout columns: 2 rows: 4 - width: contents.width + width: childrenRect.width GroupBox { contents: "1/ContactField.qml" label: "Loading: simple" diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml index d61705c..5a22b1c 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml @@ -13,8 +13,8 @@ Rect { // component removes focus from any previous element GridPositioner { id: layout - width: contents.width - height: contents.height + width: childrenRect.width + height: childrenRect.height GroupBox { contents: "1/ContactView.qml" label: "list only" diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index 4fb12af..a93483e 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -26,7 +26,7 @@ Rect { Component { id: feedDelegate Item { - height: contents.height + 20 + height: childrenRect.height + 20 Text { x: 10 id: TitleText diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 156eb31..22586b8 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -66,7 +66,7 @@ Rect { states: [ State { name: "Details" - SetProperties { target: Wrapper; height: contents.height + 10 } + SetProperties { target: Wrapper; height: childrenRect.height + 10 } SetProperties { target: Description; opacity: 1 } } ] |