From dd773d99d2e7ce94e2cef503e80caafc079b1acd Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 3 Feb 2017 12:35:35 +0100 Subject: Doc: move Control::contentItem snippet to match background Change-Id: I46ff0f20bbdde131d4206a970ce60c76d491f24b Reviewed-by: J-P Nurmi --- src/quicktemplates2/qquickcontrol.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index bc549b78..2f327e34 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1136,15 +1136,6 @@ void QQuickControl::setBackground(QQuickItem *background) This property holds the visual content item. - \note The content item is automatically resized to fit within the - \l padding of the control. - - \note Most controls use the implicit size of the content item to calculate - the implicit size of the control itself. If you replace the content item - with a custom one, you should also consider providing a sensible implicit - size for it (unless it is an item like \l Text which has its own implicit - size). - \code Button { id: control @@ -1157,6 +1148,15 @@ void QQuickControl::setBackground(QQuickItem *background) } \endcode + \note The content item is automatically resized to fit within the + \l padding of the control. + + \note Most controls use the implicit size of the content item to calculate + the implicit size of the control itself. If you replace the content item + with a custom one, you should also consider providing a sensible implicit + size for it (unless it is an item like \l Text which has its own implicit + size). + \sa {Control Layout}, padding */ QQuickItem *QQuickControl::contentItem() const -- cgit v1.2.3