diff options
Diffstat (limited to 'src')
23 files changed, 148 insertions, 147 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index e9027a5d..3c76a202 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -90,7 +90,7 @@ ScrollView { horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff Flickable { - ... + // ... } } \endqml @@ -100,7 +100,7 @@ \qml Flickable { - ... + // ... ScrollBar.vertical: ScrollBar { } } \endqml @@ -162,7 +162,7 @@ Button { style: ButtonStyle { label: Label { - ... + // ... } } } @@ -173,7 +173,7 @@ \qml Button { label: Label { - ... + // ... } } \endqml diff --git a/src/imports/controls/qquickdial.cpp b/src/imports/controls/qquickdial.cpp index c607fba3..4bc62f02 100644 --- a/src/imports/controls/qquickdial.cpp +++ b/src/imports/controls/qquickdial.cpp @@ -168,7 +168,7 @@ QQuickDial::QQuickDial(QQuickItem *parent) : } /*! - \qmlproperty real QtQuickControls2::Dial::from + \qmlproperty real QtQuick.Controls::Dial::from This property holds the starting value for the range. The default value is \c 0.0. @@ -194,7 +194,7 @@ void QQuickDial::setFrom(qreal from) } /*! - \qmlproperty real QtQuickControls2::Dial::to + \qmlproperty real QtQuick.Controls::Dial::to This property holds the end value for the range. The default value is \c 1.0. @@ -221,7 +221,7 @@ void QQuickDial::setTo(qreal to) } /*! - \qmlproperty real QtQuickControls2::Dial::value + \qmlproperty real QtQuick.Controls::Dial::value This property holds the value in the range \c from - \c to. The default value is \c 0.0. @@ -252,7 +252,7 @@ void QQuickDial::setValue(qreal value) } /*! - \qmlproperty real QtQuickControls2::Dial::position + \qmlproperty real QtQuick.Controls::Dial::position This property holds the logical position of the handle. @@ -270,7 +270,7 @@ qreal QQuickDial::position() const } /*! - \qmlproperty real QtQuickControls2::Dial::angle \readonly + \qmlproperty real QtQuick.Controls::Dial::angle \readonly This property holds the angle of the handle. @@ -286,7 +286,7 @@ qreal QQuickDial::angle() const } /*! - \qmlproperty real QtQuickControls2::Dial::stepSize + \qmlproperty real QtQuick.Controls::Dial::stepSize This property holds the step size. The default value is \c 0.0. @@ -308,7 +308,7 @@ void QQuickDial::setStepSize(qreal step) } /*! - \qmlproperty enumeration QtQuickControls2::Dial::snapMode + \qmlproperty enumeration QtQuick.Controls::Dial::snapMode This property holds the snap mode. @@ -340,7 +340,7 @@ void QQuickDial::setSnapMode(SnapMode mode) } /*! - \qmlproperty bool QtQuickControls2::Dial::pressed + \qmlproperty bool QtQuick.Controls::Dial::pressed This property holds whether the dial is pressed. @@ -374,7 +374,7 @@ void QQuickDial::setPressed(bool pressed) } /*! - \qmlmethod void QtQuickControls2::Dial::increase() + \qmlmethod void QtQuick.Controls::Dial::increase() Increases the value by \l stepSize, or \c 0.1 if stepSize is not defined. @@ -388,7 +388,7 @@ void QQuickDial::increase() } /*! - \qmlmethod void QtQuickControls2::Dial::decrease() + \qmlmethod void QtQuick.Controls::Dial::decrease() Decreases the value by \l stepSize, or \c 0.1 if stepSize is not defined. @@ -402,7 +402,7 @@ void QQuickDial::decrease() } /*! - \qmlproperty component QtQuickControls2::Dial::handle + \qmlproperty component QtQuick.Controls::Dial::handle This property holds the handle of the dial. diff --git a/src/imports/controls/qquickswipeview.cpp b/src/imports/controls/qquickswipeview.cpp index f86e8c8c..c0def1c8 100644 --- a/src/imports/controls/qquickswipeview.cpp +++ b/src/imports/controls/qquickswipeview.cpp @@ -149,7 +149,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem } /*! - \qmlattachedproperty int QtQuickControls2::SwipeView::index + \qmlattachedproperty int QtQuick.Controls::SwipeView::index This attached property holds the index of each child item in the SwipeView. @@ -157,7 +157,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem */ /*! - \qmlattachedproperty bool QtQuickControls2::SwipeView::isCurrentItem + \qmlattachedproperty bool QtQuick.Controls::SwipeView::isCurrentItem This attached property is \c true if this child is the current item. @@ -165,7 +165,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem */ /*! - \qmlattachedproperty SwipeView QtQuickControls2::SwipeView::view + \qmlattachedproperty SwipeView QtQuick.Controls::SwipeView::view This attached property holds the view that manages this child item. diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp index c404dac8..3cfbc689 100644 --- a/src/imports/controls/qquicktheme.cpp +++ b/src/imports/controls/qquicktheme.cpp @@ -59,43 +59,43 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::accentColor + \qmlattachedproperty color QtQuick.Controls::Theme::accentColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::backgroundColor + \qmlattachedproperty color QtQuick.Controls::Theme::backgroundColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::disabledColor + \qmlattachedproperty color QtQuick.Controls::Theme::disabledColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::focusColor + \qmlattachedproperty color QtQuick.Controls::Theme::focusColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::frameColor + \qmlattachedproperty color QtQuick.Controls::Theme::frameColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::pressColor + \qmlattachedproperty color QtQuick.Controls::Theme::pressColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::selectedTextColor + \qmlattachedproperty color QtQuick.Controls::Theme::selectedTextColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::selectionColor + \qmlattachedproperty color QtQuick.Controls::Theme::selectionColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::shadowColor + \qmlattachedproperty color QtQuick.Controls::Theme::shadowColor */ /*! - \qmlattachedproperty color QtQuickControls2::Theme::textColor + \qmlattachedproperty color QtQuick.Controls::Theme::textColor */ Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtquickcontrols/theme.json"))) diff --git a/src/imports/controls/qquicktumbler.cpp b/src/imports/controls/qquicktumbler.cpp index 9f53f92e..73358b75 100644 --- a/src/imports/controls/qquicktumbler.cpp +++ b/src/imports/controls/qquicktumbler.cpp @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE \code Tumbler { model: 5 + // ... } \endcode @@ -193,7 +194,7 @@ QQuickTumbler::~QQuickTumbler() } /*! - \qmlproperty variant QtQuickControls2::Tumbler::model + \qmlproperty variant QtQuick.Controls::Tumbler::model This property holds the model that provides data for this tumbler. */ @@ -213,7 +214,7 @@ void QQuickTumbler::setModel(const QVariant &model) } /*! - \qmlproperty int QtQuickControls2::Tumbler::count + \qmlproperty int QtQuick.Controls::Tumbler::count This property holds the number of items in the model. */ @@ -224,7 +225,7 @@ int QQuickTumbler::count() const } /*! - \qmlproperty int QtQuickControls2::Tumbler::currentIndex + \qmlproperty int QtQuick.Controls::Tumbler::currentIndex This property holds the index of the current item. */ @@ -241,7 +242,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex) } /*! - \qmlproperty Item QtQuickControls2::Tumbler::currentItem + \qmlproperty Item QtQuick.Controls::Tumbler::currentItem This property holds the item at the current index. */ @@ -252,7 +253,7 @@ QQuickItem *QQuickTumbler::currentItem() const } /*! - \qmlproperty component QtQuickControls2::Tumbler::delegate + \qmlproperty component QtQuick.Controls::Tumbler::delegate This property holds the delegate used to display each item. */ @@ -272,7 +273,7 @@ void QQuickTumbler::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty int QtQuickControls2::Tumbler::visibleItemCount + \qmlproperty int QtQuick.Controls::Tumbler::visibleItemCount This property holds the number of items visible in the tumbler. It must be an odd number, as the current item is always vertically centered. diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 964b97c4..26a397d6 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -49,19 +49,19 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal QtQuickControls2::AbstractButton::pressed() + \qmlsignal QtQuick.Controls::AbstractButton::pressed() This signal is emitted when the button is interactively pressed by the user. */ /*! - \qmlsignal QtQuickControls2::AbstractButton::released() + \qmlsignal QtQuick.Controls::AbstractButton::released() This signal is emitted when the button is interactively released by the user. */ /*! - \qmlsignal QtQuickControls2::AbstractButton::canceled() + \qmlsignal QtQuick.Controls::AbstractButton::canceled() This signal is emitted when the button loses mouse grab while being pressed, or when it would emit the \l released @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal QtQuickControls2::AbstractButton::clicked() + \qmlsignal QtQuick.Controls::AbstractButton::clicked() This signal is emitted when the button is clicked. */ @@ -95,7 +95,7 @@ QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQui } /*! - \qmlproperty string QtQuickControls2::AbstractButton::text + \qmlproperty string QtQuick.Controls::AbstractButton::text This property holds a textual description of the button. @@ -121,7 +121,7 @@ void QQuickAbstractButton::setText(const QString &text) } /*! - \qmlproperty bool QtQuickControls2::AbstractButton::pressed + \qmlproperty bool QtQuick.Controls::AbstractButton::pressed This property holds whether the button is pressed. */ @@ -142,7 +142,7 @@ void QQuickAbstractButton::setPressed(bool isPressed) } /*! - \qmlproperty Item QtQuickControls2::AbstractButton::label + \qmlproperty Item QtQuick.Controls::AbstractButton::label This property holds the label item. diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index a750ec01..facb325d 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -130,7 +130,7 @@ QQuickApplicationWindow::~QQuickApplicationWindow() } /*! - \qmlproperty Item QtQuickControls2::ApplicationWindow::header + \qmlproperty Item QtQuick.Controls::ApplicationWindow::header A header item for the window, for example a title bar, menu or tool-bar. By default this property is empty, no header will be shown. @@ -163,7 +163,7 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) } /*! - \qmlproperty Item QtQuickControls2::ApplicationWindow::footer + \qmlproperty Item QtQuick.Controls::ApplicationWindow::footer A footer item for the window, for example a status bar or menu. By default this property is empty, no footer will be shown. diff --git a/src/templates/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp index 836fd78f..3c7eb9e6 100644 --- a/src/templates/qquickbusyindicator.cpp +++ b/src/templates/qquickbusyindicator.cpp @@ -83,7 +83,7 @@ QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) : } /*! - \qmlproperty bool QtQuickControls2::BusyIndicator::running + \qmlproperty bool QtQuick.Controls::BusyIndicator::running This property holds whether the busy indicator is currently indicating activity. @@ -109,7 +109,7 @@ void QQuickBusyIndicator::setRunning(bool running) } /*! - \qmlproperty Item QtQuickControls2::BusyIndicator::indicator + \qmlproperty Item QtQuick.Controls::BusyIndicator::indicator This property holds the \l[QML]{Item}, which graphically implements the busy indicator. */ diff --git a/src/templates/qquickcheckable.cpp b/src/templates/qquickcheckable.cpp index 0130308e..9f37906b 100644 --- a/src/templates/qquickcheckable.cpp +++ b/src/templates/qquickcheckable.cpp @@ -64,7 +64,7 @@ QQuickCheckable::QQuickCheckable(QQuickCheckablePrivate &dd, QQuickItem *parent) } /*! - \qmlproperty bool QtQuickControls2::Checkable::checked + \qmlproperty bool QtQuick.Controls::Checkable::checked This property holds whether the control is checked. */ @@ -97,7 +97,7 @@ void QQuickCheckable::setExclusive(bool exclusive) } /*! - \qmlproperty Item QtQuickControls2::Checkable::indicator + \qmlproperty Item QtQuick.Controls::Checkable::indicator This property holds the indicator item. */ @@ -123,7 +123,7 @@ void QQuickCheckable::setIndicator(QQuickItem *indicator) } /*! - \qmlmethod void QtQuickControls2::Checkable::toggle() + \qmlmethod void QtQuick.Controls::Checkable::toggle() Toggles the checked state of the control. */ diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp index ce417c57..cc415eab 100644 --- a/src/templates/qquickcontainer.cpp +++ b/src/templates/qquickcontainer.cpp @@ -247,7 +247,7 @@ QQuickContainer::~QQuickContainer() } /*! - \qmlproperty int QtQuickControls2::Container::count + \qmlproperty int QtQuick.Controls::Container::count \readonly This property holds the number of items. @@ -259,7 +259,7 @@ int QQuickContainer::count() const } /*! - \qmlmethod Item QtQuickControls2::Container::itemAt(int index) + \qmlmethod Item QtQuick.Controls::Container::itemAt(int index) Returns the item at \a index, or \c null if it does not exist. */ @@ -270,7 +270,7 @@ QQuickItem *QQuickContainer::itemAt(int index) const } /*! - \qmlmethod void QtQuickControls2::Container::addItem(Item item) + \qmlmethod void QtQuick.Controls::Container::addItem(Item item) Adds an \a item. */ @@ -281,7 +281,7 @@ void QQuickContainer::addItem(QQuickItem *item) } /*! - \qmlmethod void QtQuickControls2::Container::insertItem(int index, Item item) + \qmlmethod void QtQuick.Controls::Container::insertItem(int index, Item item) Inserts an \a item at \a index. */ @@ -306,7 +306,7 @@ void QQuickContainer::insertItem(int index, QQuickItem *item) } /*! - \qmlmethod void QtQuickControls2::Container::moveItem(int from, int to) + \qmlmethod void QtQuick.Controls::Container::moveItem(int from, int to) Moves an item \a from one index \a to another. */ @@ -324,7 +324,7 @@ void QQuickContainer::moveItem(int from, int to) } /*! - \qmlmethod void QtQuickControls2::Container::removeItem(int index) + \qmlmethod void QtQuick.Controls::Container::removeItem(int index) Removes an item at \a index. @@ -343,7 +343,7 @@ void QQuickContainer::removeItem(int index) } /*! - \qmlproperty model QtQuickControls2::Container::contentModel + \qmlproperty model QtQuick.Controls::Container::contentModel \readonly This property holds the content model of items. @@ -355,7 +355,7 @@ QVariant QQuickContainer::contentModel() const } /*! - \qmlproperty list<Object> QtQuickControls2::Container::contentData + \qmlproperty list<Object> QtQuick.Controls::Container::contentData \default This property holds the list of content data. @@ -373,7 +373,7 @@ QQmlListProperty<QObject> QQuickContainer::contentData() } /*! - \qmlproperty list<Item> QtQuickControls2::Container::contentChildren + \qmlproperty list<Item> QtQuick.Controls::Container::contentChildren This property holds the list of content children. @@ -390,7 +390,7 @@ QQmlListProperty<QQuickItem> QQuickContainer::contentChildren() } /*! - \qmlproperty int QtQuickControls2::Container::currentIndex + \qmlproperty int QtQuick.Controls::Container::currentIndex TODO */ @@ -411,7 +411,7 @@ void QQuickContainer::setCurrentIndex(int index) } /*! - \qmlproperty Item QtQuickControls2::Container::currentItem + \qmlproperty Item QtQuick.Controls::Container::currentItem TODO */ diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index eefd2bd4..a132e83e 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -335,7 +335,7 @@ void QQuickControl::resetFont() } /*! - \qmlproperty real QtQuickControls2::Control::availableWidth + \qmlproperty real QtQuick.Controls::Control::availableWidth This property holds the width available after deducting horizontal padding. @@ -347,7 +347,7 @@ qreal QQuickControl::availableWidth() const } /*! - \qmlproperty real QtQuickControls2::Control::availableHeight + \qmlproperty real QtQuick.Controls::Control::availableHeight This property holds the height available after deducting vertical padding. @@ -359,7 +359,7 @@ qreal QQuickControl::availableHeight() const } /*! - \qmlproperty real QtQuickControls2::Control::padding + \qmlproperty real QtQuick.Controls::Control::padding This property holds the default padding. @@ -401,7 +401,7 @@ void QQuickControl::resetPadding() } /*! - \qmlproperty real QtQuickControls2::Control::topPadding + \qmlproperty real QtQuick.Controls::Control::topPadding This property holds the top padding. @@ -428,7 +428,7 @@ void QQuickControl::resetTopPadding() } /*! - \qmlproperty real QtQuickControls2::Control::leftPadding + \qmlproperty real QtQuick.Controls::Control::leftPadding This property holds the left padding. @@ -455,7 +455,7 @@ void QQuickControl::resetLeftPadding() } /*! - \qmlproperty real QtQuickControls2::Control::rightPadding + \qmlproperty real QtQuick.Controls::Control::rightPadding This property holds the right padding. @@ -482,7 +482,7 @@ void QQuickControl::resetRightPadding() } /*! - \qmlproperty real QtQuickControls2::Control::bottomPadding + \qmlproperty real QtQuick.Controls::Control::bottomPadding This property holds the bottom padding. @@ -509,7 +509,7 @@ void QQuickControl::resetBottomPadding() } /*! - \qmlproperty real QtQuickControls2::Control::spacing + \qmlproperty real QtQuick.Controls::Control::spacing This property holds the spacing. */ @@ -534,7 +534,7 @@ void QQuickControl::resetSpacing() } /*! - \qmlproperty enumeration QtQuickControls2::Control::layoutDirection + \qmlproperty enumeration QtQuick.Controls::Control::layoutDirection This property holds the layout direction of the control. @@ -555,7 +555,7 @@ Qt::LayoutDirection QQuickControl::layoutDirection() const } /*! - \qmlproperty enumeration QtQuickControls2::Control::effectiveLayoutDirection + \qmlproperty enumeration QtQuick.Controls::Control::effectiveLayoutDirection \readonly This property holds the effective layout direction of the control. @@ -585,7 +585,7 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction) } /*! - \qmlproperty bool QtQuickControls2::Control::mirrored + \qmlproperty bool QtQuick.Controls::Control::mirrored \readonly This property holds whether the control is mirrored. @@ -601,7 +601,7 @@ bool QQuickControl::isMirrored() const } /*! - \qmlproperty Item QtQuickControls2::Control::background + \qmlproperty Item QtQuick.Controls::Control::background This property holds the background item. @@ -633,7 +633,7 @@ void QQuickControl::setBackground(QQuickItem *background) } /*! - \qmlproperty Item QtQuickControls2::Control::contentItem + \qmlproperty Item QtQuick.Controls::Control::contentItem TODO */ diff --git a/src/templates/qquickexclusivegroup.cpp b/src/templates/qquickexclusivegroup.cpp index 20a863cc..967d3288 100644 --- a/src/templates/qquickexclusivegroup.cpp +++ b/src/templates/qquickexclusivegroup.cpp @@ -221,7 +221,7 @@ QQuickExclusiveGroupAttached *QQuickExclusiveGroup::qmlAttachedProperties(QObjec } /*! - \qmlproperty QtObject QtQuickControls2::ExclusiveGroup::current + \qmlproperty QtObject QtQuick.Controls::ExclusiveGroup::current This property holds the currently selected object or \c null if there is none. @@ -247,7 +247,7 @@ void QQuickExclusiveGroup::setCurrent(QObject *current) } /*! - \qmlproperty list<Object> QtQuickControls2::ExclusiveGroup::checkables + \qmlproperty list<Object> QtQuick.Controls::ExclusiveGroup::checkables \default This property holds the list of checkables. @@ -284,7 +284,7 @@ QQmlListProperty<QObject> QQuickExclusiveGroup::checkables() } /*! - \qmlmethod void QtQuickControls2::ExclusiveGroup::addCheckable(QtObject object) + \qmlmethod void QtQuick.Controls::ExclusiveGroup::addCheckable(QtObject object) Adds an \a object to the exclusive group. @@ -316,7 +316,7 @@ void QQuickExclusiveGroup::addCheckable(QObject *object) } /*! - \qmlmethod void QtQuickControls2::ExclusiveGroup::removeCheckable(QtObject object) + \qmlmethod void QtQuick.Controls::ExclusiveGroup::removeCheckable(QtObject object) Removes an \a object from the exclusive group. @@ -359,7 +359,7 @@ QQuickExclusiveGroupAttached::QQuickExclusiveGroupAttached(QObject *parent) : } /*! - \qmlattachedproperty ExclusiveGroup QtQuickControls2::ExclusiveGroup::group + \qmlattachedproperty ExclusiveGroup QtQuick.Controls::ExclusiveGroup::group This property attaches a checkable control or object to an exclusive group. diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp index 7a0aec70..9281e087 100644 --- a/src/templates/qquickframe.cpp +++ b/src/templates/qquickframe.cpp @@ -87,7 +87,7 @@ QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) : } /*! - \qmlproperty real QtQuickControls2::Frame::contentWidth + \qmlproperty real QtQuick.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 QtQuickControls2::Frame::contentHeight + \qmlproperty real QtQuick.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 QtQuickControls2::Frame::frame + \qmlproperty Item QtQuick.Controls::Frame::frame This property holds the visual frame item. @@ -160,7 +160,7 @@ void QQuickFrame::setFrame(QQuickItem *frame) } /*! - \qmlproperty list<Object> QtQuickControls2::Frame::contentData + \qmlproperty list<Object> QtQuick.Controls::Frame::contentData \default This property holds the list of content data. @@ -178,7 +178,7 @@ QQmlListProperty<QObject> QQuickFrame::contentData() } /*! - \qmlproperty list<Item> QtQuickControls2::Frame::contentChildren + \qmlproperty list<Item> QtQuick.Controls::Frame::contentChildren This property holds the list of content children. diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp index df5024aa..e421fce3 100644 --- a/src/templates/qquickgroupbox.cpp +++ b/src/templates/qquickgroupbox.cpp @@ -88,7 +88,7 @@ QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) : } /*! - \qmlproperty string QtQuickControls2::GroupBox::title + \qmlproperty string QtQuick.Controls::GroupBox::title This property holds the title. */ @@ -108,7 +108,7 @@ void QQuickGroupBox::setTitle(const QString &title) } /*! - \qmlproperty Item QtQuickControls2::GroupBox::label + \qmlproperty Item QtQuick.Controls::GroupBox::label This property holds the label item that visualizes \l title. diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp index 37a52fe0..d7cb40cc 100644 --- a/src/templates/qquickpageindicator.cpp +++ b/src/templates/qquickpageindicator.cpp @@ -83,7 +83,7 @@ QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) : } /*! - \qmlproperty int QtQuickControls2::PageIndicator::count + \qmlproperty int QtQuick.Controls::PageIndicator::count This property holds the number of pages. */ @@ -103,7 +103,7 @@ void QQuickPageIndicator::setCount(int count) } /*! - \qmlproperty int QtQuickControls2::PageIndicator::currentIndex + \qmlproperty int QtQuick.Controls::PageIndicator::currentIndex This property holds the index of the current page. */ @@ -123,7 +123,7 @@ void QQuickPageIndicator::setCurrentIndex(int index) } /*! - \qmlproperty Component QtQuickControls2::PageIndicator::delegate + \qmlproperty Component QtQuick.Controls::PageIndicator::delegate This property holds a delegate that presents a page. @@ -145,7 +145,7 @@ void QQuickPageIndicator::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty color QtQuickControls2::PageIndicator::color + \qmlproperty color QtQuick.Controls::PageIndicator::color This property holds the color of the indicator. diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp index 9607bcff..aa0ed017 100644 --- a/src/templates/qquickprogressbar.cpp +++ b/src/templates/qquickprogressbar.cpp @@ -84,7 +84,7 @@ QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) : } /*! - \qmlproperty real QtQuickControls2::ProgressBar::from + \qmlproperty real QtQuick.Controls::ProgressBar::from This property holds the starting value for the progress. The default value is \c 0.0. @@ -110,7 +110,7 @@ void QQuickProgressBar::setFrom(qreal from) } /*! - \qmlproperty real QtQuickControls2::ProgressBar::to + \qmlproperty real QtQuick.Controls::ProgressBar::to This property holds the end value for the progress. The default value is \c 1.0. @@ -136,7 +136,7 @@ void QQuickProgressBar::setTo(qreal to) } /*! - \qmlproperty real QtQuickControls2::ProgressBar::value + \qmlproperty real QtQuick.Controls::ProgressBar::value This property holds the progress value. The default value is \c 0.0. @@ -163,7 +163,7 @@ void QQuickProgressBar::setValue(qreal value) } /*! - \qmlproperty real QtQuickControls2::ProgressBar::position + \qmlproperty real QtQuick.Controls::ProgressBar::position \readonly This property holds the logical position of the progress. @@ -183,7 +183,7 @@ qreal QQuickProgressBar::position() const } /*! - \qmlproperty real QtQuickControls2::ProgressBar::visualPosition + \qmlproperty real QtQuick.Controls::ProgressBar::visualPosition \readonly This property holds the visual position of the progress. @@ -203,7 +203,7 @@ qreal QQuickProgressBar::visualPosition() const } /*! - \qmlproperty bool QtQuickControls2::ProgressBar::indeterminate + \qmlproperty bool QtQuick.Controls::ProgressBar::indeterminate This property holds whether the progress bar is in an indeterminate mode. */ @@ -223,7 +223,7 @@ void QQuickProgressBar::setIndeterminate(bool indeterminate) } /*! - \qmlproperty Item QtQuickControls2::ProgressBar::indicator + \qmlproperty Item QtQuick.Controls::ProgressBar::indicator This property holds the indicator item. diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index 085900ba..3af734a5 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -119,7 +119,7 @@ QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object) } /*! - \qmlproperty real QtQuickControls2::ScrollBar::size + \qmlproperty real QtQuick.Controls::ScrollBar::size This property holds the size of the scroll bar, scaled to \c {0.0 - 1.0}. @@ -141,7 +141,7 @@ void QQuickScrollBar::setSize(qreal size) } /*! - \qmlproperty real QtQuickControls2::ScrollBar::position + \qmlproperty real QtQuick.Controls::ScrollBar::position This property holds the position of the scroll bar, scaled to \c {0.0 - 1.0}. @@ -163,7 +163,7 @@ void QQuickScrollBar::setPosition(qreal position) } /*! - \qmlproperty bool QtQuickControls2::ScrollBar::active + \qmlproperty bool QtQuick.Controls::ScrollBar::active This property holds whether the scroll bar is active ie. when its \l pressed or the attached Flickable is \l {Flickable::moving}{moving}. @@ -184,7 +184,7 @@ void QQuickScrollBar::setActive(bool active) } /*! - \qmlproperty bool QtQuickControls2::ScrollBar::pressed + \qmlproperty bool QtQuick.Controls::ScrollBar::pressed This property holds whether the scroll bar is pressed. */ @@ -206,7 +206,7 @@ void QQuickScrollBar::setPressed(bool pressed) } /*! - \qmlproperty enumeration QtQuickControls2::ScrollBar::orientation + \qmlproperty enumeration QtQuick.Controls::ScrollBar::orientation This property holds the orientation of the scroll bar. @@ -232,7 +232,7 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item QtQuickControls2::ScrollBar::handle + \qmlproperty Item QtQuick.Controls::ScrollBar::handle This property holds the handle item. @@ -383,7 +383,7 @@ QQuickScrollBarAttached::QQuickScrollBarAttached(QQuickFlickable *flickable) : } /*! - \qmlattachedproperty ScrollBar QtQuickControls2::ScrollBar::horizontal + \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::horizontal This property attaches a horizontal scroll bar to a \l Flickable. @@ -437,7 +437,7 @@ void QQuickScrollBarAttached::setHorizontal(QQuickScrollBar *horizontal) } /*! - \qmlattachedproperty ScrollBar QtQuickControls2::ScrollBar::vertical + \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::vertical This property attaches a vertical scroll bar to a \l Flickable. diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp index b935b0e8..aec0b1c0 100644 --- a/src/templates/qquickscrollindicator.cpp +++ b/src/templates/qquickscrollindicator.cpp @@ -107,7 +107,7 @@ QQuickScrollIndicatorAttached *QQuickScrollIndicator::qmlAttachedProperties(QObj } /*! - \qmlproperty real QtQuickControls2::ScrollIndicator::size + \qmlproperty real QtQuick.Controls::ScrollIndicator::size This property holds the size of the indicator, scaled to \c {0.0 - 1.0}. @@ -129,7 +129,7 @@ void QQuickScrollIndicator::setSize(qreal size) } /*! - \qmlproperty real QtQuickControls2::ScrollIndicator::position + \qmlproperty real QtQuick.Controls::ScrollIndicator::position This property holds the position of the indicator, scaled to \c {0.0 - 1.0}. @@ -151,7 +151,7 @@ void QQuickScrollIndicator::setPosition(qreal position) } /*! - \qmlproperty bool QtQuickControls2::ScrollIndicator::active + \qmlproperty bool QtQuick.Controls::ScrollIndicator::active This property holds whether the indicator is active, that is, when the attached Flickable is \l {Flickable::moving}{moving}. @@ -172,7 +172,7 @@ void QQuickScrollIndicator::setActive(bool active) } /*! - \qmlproperty enumeration QtQuickControls2::ScrollIndicator::orientation + \qmlproperty enumeration QtQuick.Controls::ScrollIndicator::orientation This property holds the orientation of the indicator. @@ -198,7 +198,7 @@ void QQuickScrollIndicator::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item QtQuickControls2::ScrollIndicator::indicator + \qmlproperty Item QtQuick.Controls::ScrollIndicator::indicator This property holds the indicator item. @@ -280,7 +280,7 @@ QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *fl } /*! - \qmlattachedproperty ScrollIndicator QtQuickControls2::ScrollIndicator::horizontal + \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::horizontal This property attaches a horizontal scroll indicator to a \l Flickable. @@ -332,7 +332,7 @@ void QQuickScrollIndicatorAttached::setHorizontal(QQuickScrollIndicator *horizon } /*! - \qmlattachedproperty ScrollIndicator QtQuickControls2::ScrollIndicator::vertical + \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::vertical This property attaches a vertical scroll indicator to a \l Flickable. diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index 581f85da..417bc1a1 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -162,7 +162,7 @@ QQuickSlider::QQuickSlider(QQuickItem *parent) : } /*! - \qmlproperty real QtQuickControls2::Slider::from + \qmlproperty real QtQuick.Controls::Slider::from This property holds the starting value for the range. The default value is \c 0.0. @@ -188,7 +188,7 @@ void QQuickSlider::setFrom(qreal from) } /*! - \qmlproperty real QtQuickControls2::Slider::to + \qmlproperty real QtQuick.Controls::Slider::to This property holds the end value for the range. The default value is \c 1.0. @@ -214,7 +214,7 @@ void QQuickSlider::setTo(qreal to) } /*! - \qmlproperty real QtQuickControls2::Slider::value + \qmlproperty real QtQuick.Controls::Slider::value This property holds the value in the range \c from - \c to. The default value is \c 0.0. @@ -244,7 +244,7 @@ void QQuickSlider::setValue(qreal value) } /*! - \qmlproperty real QtQuickControls2::Slider::position + \qmlproperty real QtQuick.Controls::Slider::position This property holds the logical position of the handle. @@ -262,7 +262,7 @@ qreal QQuickSlider::position() const } /*! - \qmlproperty real QtQuickControls2::Slider::visualPosition + \qmlproperty real QtQuick.Controls::Slider::visualPosition \readonly This property holds the visual position of the handle. @@ -283,7 +283,7 @@ qreal QQuickSlider::visualPosition() const } /*! - \qmlproperty real QtQuickControls2::Slider::stepSize + \qmlproperty real QtQuick.Controls::Slider::stepSize This property holds the step size. The default value is \c 0.0. @@ -305,7 +305,7 @@ void QQuickSlider::setStepSize(qreal step) } /*! - \qmlproperty enumeration QtQuickControls2::Slider::snapMode + \qmlproperty enumeration QtQuick.Controls::Slider::snapMode This property holds the snap mode. @@ -334,7 +334,7 @@ void QQuickSlider::setSnapMode(SnapMode mode) } /*! - \qmlproperty bool QtQuickControls2::Slider::pressed + \qmlproperty bool QtQuick.Controls::Slider::pressed This property holds whether the slider is pressed. */ @@ -355,7 +355,7 @@ void QQuickSlider::setPressed(bool pressed) } /*! - \qmlproperty enumeration QtQuickControls2::Slider::orientation + \qmlproperty enumeration QtQuick.Controls::Slider::orientation This property holds the orientation. @@ -381,7 +381,7 @@ void QQuickSlider::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item QtQuickControls2::Slider::handle + \qmlproperty Item QtQuick.Controls::Slider::handle This property holds the handle item. @@ -406,7 +406,7 @@ void QQuickSlider::setHandle(QQuickItem *handle) } /*! - \qmlproperty Item QtQuickControls2::Slider::track + \qmlproperty Item QtQuick.Controls::Slider::track This property holds the track item. @@ -431,7 +431,7 @@ void QQuickSlider::setTrack(QQuickItem *track) } /*! - \qmlmethod void QtQuickControls2::Slider::increase() + \qmlmethod void QtQuick.Controls::Slider::increase() Increases the value by \l stepSize or \c 0.1 if stepSize is not defined. @@ -445,7 +445,7 @@ void QQuickSlider::increase() } /*! - \qmlmethod void QtQuickControls2::Slider::decrease() + \qmlmethod void QtQuick.Controls::Slider::decrease() Decreases the value by \l stepSize or \c 0.1 if stepSize is not defined. diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index 1c09b6e8..13b08707 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -284,7 +284,7 @@ QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object) } /*! - \qmlproperty bool QtQuickControls2::StackView::busy + \qmlproperty bool QtQuick.Controls::StackView::busy \readonly This property holds whether a transition is running. */ @@ -295,7 +295,7 @@ bool QQuickStackView::busy() const } /*! - \qmlproperty int QtQuickControls2::StackView::depth + \qmlproperty int QtQuick.Controls::StackView::depth \readonly This property holds the number of items currently pushed onto the stack. */ @@ -306,7 +306,7 @@ int QQuickStackView::depth() const } /*! - \qmlproperty Item QtQuickControls2::StackView::currentItem + \qmlproperty Item QtQuick.Controls::StackView::currentItem \readonly This property holds the current top-most item in the stack. */ @@ -317,7 +317,7 @@ QQuickItem *QQuickStackView::currentItem() const } /*! - \qmlmethod Item QtQuickControls2::StackView::get(index, behavior = DontLoad) + \qmlmethod Item QtQuick.Controls::StackView::get(index, behavior = DontLoad) Supported behavior values: \list @@ -340,7 +340,7 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior) } /*! - \qmlmethod Item QtQuickControls2::StackView::find(callback, behavior = DontLoad) + \qmlmethod Item QtQuick.Controls::StackView::find(callback, behavior = DontLoad) Supported behavior values: \list @@ -373,7 +373,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio } /*! - \qmlmethod Item QtQuickControls2::StackView::push(item, properties, operation) + \qmlmethod Item QtQuick.Controls::StackView::push(item, properties, operation) TODO */ @@ -421,7 +421,7 @@ void QQuickStackView::push(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuickControls2::StackView::pop(item = null, operation = Transition) + \qmlmethod Item QtQuick.Controls::StackView::pop(item = null, operation = Transition) TODO */ @@ -483,7 +483,7 @@ void QQuickStackView::pop(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuickControls2::StackView::push(item, properties, operation = Transition) + \qmlmethod Item QtQuick.Controls::StackView::push(item, properties, operation = Transition) TODO */ @@ -540,7 +540,7 @@ void QQuickStackView::replace(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuickControls2::StackView::clear() + \qmlmethod Item QtQuick.Controls::StackView::clear() TODO */ @@ -554,7 +554,7 @@ void QQuickStackView::clear() } /*! - \qmlproperty var QtQuickControls2::StackView::initialItem + \qmlproperty var QtQuick.Controls::StackView::initialItem This property holds the initial item. @@ -573,7 +573,7 @@ void QQuickStackView::setInitialItem(const QVariant &item) } /*! - \qmlproperty Transition QtQuickControls2::StackView::popEnter + \qmlproperty Transition QtQuick.Controls::StackView::popEnter TODO */ @@ -596,7 +596,7 @@ void QQuickStackView::setPopEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition QtQuickControls2::StackView::popExit + \qmlproperty Transition QtQuick.Controls::StackView::popExit TODO */ @@ -619,7 +619,7 @@ void QQuickStackView::setPopExit(QQuickTransition *exit) } /*! - \qmlproperty Transition QtQuickControls2::StackView::pushEnter + \qmlproperty Transition QtQuick.Controls::StackView::pushEnter TODO */ @@ -642,7 +642,7 @@ void QQuickStackView::setPushEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition QtQuickControls2::StackView::pushExit + \qmlproperty Transition QtQuick.Controls::StackView::pushExit TODO */ @@ -742,7 +742,7 @@ QQuickStackAttached::QQuickStackAttached(QQuickItem *parent) : } /*! - \qmlattachedproperty int QtQuickControls2::StackView::index + \qmlattachedproperty int QtQuick.Controls::StackView::index TODO */ @@ -755,7 +755,7 @@ int QQuickStackAttached::index() const } /*! - \qmlattachedproperty StackView QtQuickControls2::StackView::view + \qmlattachedproperty StackView QtQuick.Controls::StackView::view TODO */ @@ -768,7 +768,7 @@ QQuickStackView *QQuickStackAttached::view() const } /*! - \qmlattachedproperty enumeration QtQuickControls2::StackView::status + \qmlattachedproperty enumeration QtQuick.Controls::StackView::status TODO */ diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp index b4619318..8d77b3df 100644 --- a/src/templates/qquickswitch.cpp +++ b/src/templates/qquickswitch.cpp @@ -107,7 +107,7 @@ QQuickSwitch::QQuickSwitch(QQuickItem *parent) : } /*! - \qmlproperty real QtQuickControls2::Switch::position + \qmlproperty real QtQuick.Controls::Switch::position This property holds the logical position of the thumb indicator. @@ -136,7 +136,7 @@ void QQuickSwitch::setPosition(qreal position) } /*! - \qmlproperty real QtQuickControls2::Switch::visualPosition + \qmlproperty real QtQuick.Controls::Switch::visualPosition This property holds the visual position of the thumb indicator. diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index 58c40226..3bcb0080 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -168,7 +168,7 @@ void QQuickTextArea::setFont(const QFont &font) } /*! - \qmlproperty Item QtQuickControls2::TextArea::background + \qmlproperty Item QtQuick.Controls::TextArea::background This property holds the background item. @@ -202,7 +202,7 @@ void QQuickTextArea::setBackground(QQuickItem *background) } /*! - \qmlproperty Text QtQuickControls2::TextArea::placeholder + \qmlproperty Text QtQuick.Controls::TextArea::placeholder This property holds the placeholder text item. diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp index cb61a7a5..02ebfc25 100644 --- a/src/templates/qquicktextfield.cpp +++ b/src/templates/qquicktextfield.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal QtQuickControls2::TextField::pressAndHold(MouseEvent mouse) + \qmlsignal QtQuick.Controls::TextField::pressAndHold(MouseEvent mouse) This signal is emitted when there is a long press (the delay depends on the platform plugin). The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y @@ -200,7 +200,7 @@ void QQuickTextField::setFont(const QFont &font) } /*! - \qmlproperty Item QtQuickControls2::TextField::background + \qmlproperty Item QtQuick.Controls::TextField::background This property holds the background item. @@ -234,7 +234,7 @@ void QQuickTextField::setBackground(QQuickItem *background) } /*! - \qmlproperty Text QtQuickControls2::TextField::placeholder + \qmlproperty Text QtQuick.Controls::TextField::placeholder This property holds the placeholder text item. |