diff options
Diffstat (limited to 'src/templates/qquickframe.cpp')
-rw-r--r-- | src/templates/qquickframe.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp index 67dfe256..6b0a08ac 100644 --- a/src/templates/qquickframe.cpp +++ b/src/templates/qquickframe.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \instantiates QQuickFrame \inqmlmodule Qt.labs.controls \ingroup qtlabscontrols-containers - \brief A frame control. + \brief A logical group of controls within a visual frame. Frame is used to layout a logical group of controls together, within a visual frame. Frame does not provide a layout of its own, but requires @@ -65,10 +65,6 @@ QT_BEGIN_NAMESPACE \sa {Customizing Frame}, {Container Controls} */ -QQuickFramePrivate::QQuickFramePrivate() : frame(Q_NULLPTR) -{ -} - QQuickFrame::QQuickFrame(QQuickItem *parent) : QQuickPane(*(new QQuickFramePrivate), parent) { @@ -79,29 +75,4 @@ QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) : { } -/*! - \qmlproperty Item Qt.labs.controls::Frame::frame - - This property holds the visual frame item. - - \sa {Customizing Frame} -*/ -QQuickItem *QQuickFrame::frame() const -{ - Q_D(const QQuickFrame); - return d->frame; -} - -void QQuickFrame::setFrame(QQuickItem *frame) -{ - Q_D(QQuickFrame); - if (d->frame != frame) { - delete d->frame; - d->frame = frame; - if (frame && !frame->parentItem()) - frame->setParentItem(this); - emit frameChanged(); - } -} - QT_END_NAMESPACE |