summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/QmlChanges.txt1
-rw-r--r--src/declarative/fx/qfxitem.cpp8
2 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index b24f6fe..7dda5cc 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -31,6 +31,7 @@ ParentChangeAction -> ParentAction
VisualModel -> VisualDataModel
Renamed properties:
+Item: contents -> childrenRect
MouseRegion: xmin -> minimumX
MouseRegion: xmax -> maximumX
MouseRegion: ymin -> minimumY
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index d28f531..073d5d9 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -235,10 +235,10 @@ QFxContents::QFxContents() : m_x(0), m_y(0), m_width(0), m_height(0)
}
/*!
- \qmlproperty qreal Item::childrenRect.x
- \qmlproperty qreal Item::childrenRect.y
- \qmlproperty qreal Item::childrenRect.width
- \qmlproperty qreal Item::childrenRect.height
+ \qmlproperty real Item::childrenRect.x
+ \qmlproperty real Item::childrenRect.y
+ \qmlproperty real Item::childrenRect.width
+ \qmlproperty real Item::childrenRect.height
The childrenRect properties allow an item access to the geometry of its
children. This property is useful if you have an item that needs to be