diff options
Diffstat (limited to 'examples/declarative/cppextensions/qgraphicslayouts')
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml index 205a19b1..6f8d15b4 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml +++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml @@ -49,7 +49,7 @@ LayoutItem { //Sized by the layout Rectangle { color: "yellow"; anchors.fill: parent } - Rectangle { + Rectangle { width: 100; height: 100 anchors.top: parent.top; anchors.right: parent.right color: "green" diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp index 1061bb35..85187a94 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp @@ -156,7 +156,7 @@ qreal GraphicsGridLayoutObject::spacing() const { if (verticalSpacing() == horizontalSpacing()) return verticalSpacing(); - return -1; + return -1; } qreal GraphicsGridLayoutObject::contentsMargin() const diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml index 2319f637..0ac4af8b 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml @@ -50,11 +50,11 @@ Item { size.height: parent.height /* - Below we create a grid layout using the GraphicsGridLayout item - (defined by the GraphicsGridLayoutObject class in gridlayout.h). + Below we create a grid layout using the GraphicsGridLayout item + (defined by the GraphicsGridLayoutObject class in gridlayout.h). The row, column etc. are set through attached properties on - GraphicsGridLayout, using the properties defined in the + GraphicsGridLayout, using the properties defined in the GridLayoutAttached class (also defined in gridlayout.h). */ diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml index 6e97152d..329d682c 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml @@ -50,11 +50,11 @@ Item { size.height: parent.height /* - Below we create a linear layout using the GraphicsLinearLayout item - (defined by the GraphicsLinearLayoutObject class in linearlayout.h). + Below we create a linear layout using the GraphicsLinearLayout item + (defined by the GraphicsLinearLayoutObject class in linearlayout.h). The first LayoutItem uses 'GraphicsLinearLayout.spacing' to set the - item's spacing: this is an attached property, set using the + item's spacing: this is an attached property, set using the properties defined in the LinearLayoutAttached class (also defined in linearlayout.h). */ |