aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/controls/qquickcontainer.cpp39
-rw-r--r--src/controls/qquickcontainer_p.h10
-rw-r--r--src/controls/qquickcontainer_p_p.h2
3 files changed, 1 insertions, 50 deletions
diff --git a/src/controls/qquickcontainer.cpp b/src/controls/qquickcontainer.cpp
index 732f3feb..f50a5f5a 100644
--- a/src/controls/qquickcontainer.cpp
+++ b/src/controls/qquickcontainer.cpp
@@ -48,8 +48,7 @@ QT_BEGIN_NAMESPACE
\internal
*/
-QQuickContainerPrivate::QQuickContainerPrivate() :
- contentWidth(0), contentHeight(0), contentItem(Q_NULLPTR)
+QQuickContainerPrivate::QQuickContainerPrivate() : contentItem(Q_NULLPTR)
{
}
@@ -73,42 +72,6 @@ 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);
- if (d->contentWidth != width) {
- d->contentWidth = width;
- emit contentWidthChanged();
- }
-}
-
-qreal QQuickContainer::contentHeight() const
-{
- Q_D(const QQuickContainer);
- return d->contentHeight;
-}
-
-void QQuickContainer::setContentHeight(qreal height)
-{
- Q_D(QQuickContainer);
- if (d->contentHeight != height) {
- d->contentHeight = height;
- emit contentHeightChanged();
- }
-}
-
-/*!
\qmlproperty Item QtQuickControls2::Container::contentItem
TODO
diff --git a/src/controls/qquickcontainer_p.h b/src/controls/qquickcontainer_p.h
index f42e4cee..a6f15b1e 100644
--- a/src/controls/qquickcontainer_p.h
+++ b/src/controls/qquickcontainer_p.h
@@ -57,25 +57,15 @@ class QQuickContainerPrivate;
class Q_QUICKCONTROLS_EXPORT QQuickContainer : public QQuickControl
{
Q_OBJECT
- Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL)
- Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL)
Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
public:
explicit QQuickContainer(QQuickItem *parent = Q_NULLPTR);
- qreal contentWidth() const;
- void setContentWidth(qreal width);
-
- qreal contentHeight() const;
- void setContentHeight(qreal height);
-
QQuickItem *contentItem() const;
void setContentItem(QQuickItem *item);
Q_SIGNALS:
- void contentWidthChanged();
- void contentHeightChanged();
void contentItemChanged();
protected:
diff --git a/src/controls/qquickcontainer_p_p.h b/src/controls/qquickcontainer_p_p.h
index 538ecc3c..40cb163a 100644
--- a/src/controls/qquickcontainer_p_p.h
+++ b/src/controls/qquickcontainer_p_p.h
@@ -61,8 +61,6 @@ public:
void resizeContent();
- qreal contentWidth;
- qreal contentHeight;
QQuickItem *contentItem;
};