summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-10-01 03:05:34 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-10-01 03:05:34 (GMT)
commit620b0e43d292b8f2af1c906a8634c42aa2cd6cba (patch)
treebf41c3d0c05d2de51a86d0194280af32b6bb8e94
parent7e289c9778600e481783766c6fefb7c06462bd8d (diff)
parent9f9257a219991d68b2340c41ca6edfdcfdd14f33 (diff)
downloadQt-620b0e43d292b8f2af1c906a8634c42aa2cd6cba.zip
Qt-620b0e43d292b8f2af1c906a8634c42aa2cd6cba.tar.gz
Qt-620b0e43d292b8f2af1c906a8634c42aa2cd6cba.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--examples/declarative/layouts/layouts.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml
index 6e22d8b..b54a7f3 100644
--- a/examples/declarative/layouts/layouts.qml
+++ b/examples/declarative/layouts/layouts.qml
@@ -5,7 +5,8 @@ Item { id: resizable
GraphicsObjectContainer{
anchors.fill:parent
QGraphicsWidget{
- geometry:{ "0,0," + parent.width.toString() + "x" + parent.height.toString(); }
+ size.width:parent.width
+ size.height:parent.height
layout: QGraphicsLinearLayout{
LayoutItem{
minimumSize: "100x100"