summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-04-09 03:19:23 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-04-09 03:23:55 (GMT)
commit25f17fb8e566fca0838545941d3e0281698ec355 (patch)
tree6055ea9d916dfc22cb9ace72722b6427b667c677 /examples
parent60af93993f3465781d894b01d48d31bebfb29708 (diff)
downloadQt-25f17fb8e566fca0838545941d3e0281698ec355.zip
Qt-25f17fb8e566fca0838545941d3e0281698ec355.tar.gz
Qt-25f17fb8e566fca0838545941d3e0281698ec355.tar.bz2
Some cleanup in widgets module. Deletion of GraphicsObjectContainer.
This commit deletes the uneeded classes/declarations since we have now an inline support for QGraphicsObject based classes. QGraphicsLayout bindings works the same way because the layout property has been added to QGraphicsWidget. The only feature that is missing for now (because of the deletion of GraphicsObjectContainer) is the anchoring support. We will probably take a look on how to support this feature properly with no wrapper. Task-number:QTBUG-9456 Reviewed-by:Michael Brasser
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/layouts/layouts.qml35
1 files changed, 15 insertions, 20 deletions
diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml
index 231605e..1d34afd 100644
--- a/examples/declarative/layouts/layouts.qml
+++ b/examples/declarative/layouts/layouts.qml
@@ -4,27 +4,22 @@ Item {
id: resizable
width:400
height:400
+ QGraphicsWidget {
+ size.width:parent.width
+ size.height:parent.height
- GraphicsObjectContainer {
- anchors.fill:parent
-
- QGraphicsWidget {
- size.width:parent.width
- size.height:parent.height
-
- layout: QGraphicsLinearLayout {
- LayoutItem {
- minimumSize: "100x100"
- maximumSize: "300x300"
- preferredSize: "100x100"
- Rectangle { color: "yellow"; anchors.fill: parent }
- }
- LayoutItem {
- minimumSize: "100x100"
- maximumSize: "400x400"
- preferredSize: "200x200"
- Rectangle { color: "green"; anchors.fill: parent }
- }
+ layout: QGraphicsLinearLayout {
+ LayoutItem {
+ minimumSize: "100x100"
+ maximumSize: "300x300"
+ preferredSize: "100x100"
+ Rectangle { color: "yellow"; anchors.fill: parent }
+ }
+ LayoutItem {
+ minimumSize: "100x100"
+ maximumSize: "400x400"
+ preferredSize: "200x200"
+ Rectangle { color: "green"; anchors.fill: parent }
}
}
}