Add read-only Control::contentWidth and contentHeight

This is the control width and height without padding.

Change-Id: Iebee2a0d3fd6b5475fef1dad507c72efba12d903
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 11 insertions, 17 deletions

diff --git a/src/controls/qquickcontainer.cpp b/src/controls/qquickcontainer.cpp
index 302a588e..b78e1104 100644
--- a/src/controls/qquickcontainer.cpp
+++ b/src/controls/qquickcontainer.cpp
@@ -53,6 +53,16 @@ QQuickContainerPrivate::QQuickContainerPrivate() :
 {
 }
 
+qreal QQuickContainerPrivate::getContentWidth() const
+{
+    return contentWidth;
+}
+
+qreal QQuickContainerPrivate::getContentHeight() const
+{
+    return contentHeight;
+}
+
 QQuickContainer::QQuickContainer(QQuickItem *parent) :
     QQuickControl(*(new QQuickContainerPrivate), parent)
 {
@@ -65,15 +75,10 @@ QQuickContainer::QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent)
 
 /*!
     \qmlproperty real QtQuickControls2::Container::contentWidth
+    \qmlproperty real QtQuickControls2::Container::contentHeight
 
     TODO
 */
-qreal QQuickContainer::contentWidth() const
-{
-    Q_D(const QQuickContainer);
-    return d->contentWidth;
-}
-
 void QQuickContainer::setContentWidth(qreal width)
 {
     Q_D(QQuickContainer);
@@ -83,17 +88,6 @@ void QQuickContainer::setContentWidth(qreal width)
     }
 }
 
-/*!
-    \qmlproperty real QtQuickControls2::Container::contentHeight
-
-    TODO
-*/
-qreal QQuickContainer::contentHeight() const
-{
-    Q_D(const QQuickContainer);
-    return d->contentHeight;
-}
-
 void QQuickContainer::setContentHeight(qreal height)
 {
     Q_D(QQuickContainer);