diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-30 17:47:36 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-01 09:03:42 +0000 |
commit | 3f2ac678971694fe6144a4e15197aff2ca38639b (patch) | |
tree | 06440cbf63932fb008f3aab29835b07d0310bada /src/templates/qquickframe.cpp | |
parent | b948c83255239a6fe49fca58a98f90e796ce9047 (diff) |
Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0
Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickframe.cpp')
-rw-r--r-- | src/templates/qquickframe.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp index 824b7b56..743514c1 100644 --- a/src/templates/qquickframe.cpp +++ b/src/templates/qquickframe.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype Frame \inherits Control \instantiates QQuickFrame - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup containers \brief A frame control. @@ -87,7 +87,7 @@ QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) : } /*! - \qmlproperty real QtQuick.Controls::Frame::contentWidth + \qmlproperty real Qt.labs.controls::Frame::contentWidth This property holds the content width. It is used for calculating the total implicit width of the frame. @@ -111,7 +111,7 @@ void QQuickFrame::setContentWidth(qreal width) } /*! - \qmlproperty real QtQuick.Controls::Frame::contentHeight + \qmlproperty real Qt.labs.controls::Frame::contentHeight This property holds the content height. It is used for calculating the total implicit height of the frame. @@ -135,7 +135,7 @@ void QQuickFrame::setContentHeight(qreal height) } /*! - \qmlproperty Item QtQuick.Controls::Frame::frame + \qmlproperty Item Qt.labs.controls::Frame::frame This property holds the visual frame item. @@ -160,7 +160,7 @@ void QQuickFrame::setFrame(QQuickItem *frame) } /*! - \qmlproperty list<Object> QtQuick.Controls::Frame::contentData + \qmlproperty list<Object> Qt.labs.controls::Frame::contentData \default This property holds the list of content data. @@ -178,7 +178,7 @@ QQmlListProperty<QObject> QQuickFrame::contentData() } /*! - \qmlproperty list<Item> QtQuick.Controls::Frame::contentChildren + \qmlproperty list<Item> Qt.labs.controls::Frame::contentChildren This property holds the list of content children. |