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/clock/display.qml | |
| 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/clock/display.qml')
| -rw-r--r-- | examples/declarative/clock/display.qml | 4 |
1 files changed, 2 insertions, 2 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 } } |