diff options
50 files changed, 360 insertions, 360 deletions
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index c781ae28..8f059281 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -60,7 +60,7 @@ navigation.cppclassespage = "Qt Quick Controls 2 C++ Classes" tagfile = qtquickcontrols2.tags -# \styleimport {Qt.labs.controls.universal 1.0} +# \styleimport {QtQuick.Controls.Universal 2.0} macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr></tbody></table>" # \styleproperty {Universal.accent} {enumeration} {html-target-id} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc index 3d944485..51a9b613 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc @@ -50,8 +50,8 @@ +android/qtquickcontrols2.conf \endcode - In the project above, \c main.qml would import \c Qt.labs.controls, for - example, but shouldn't import, say, \c Qt.labs.controls.material. Any code + In the project above, \c main.qml would import \c QtQuick.Controls, for + example, but shouldn't import, say, \c QtQuick.Controls.Material. Any code that is style-specific is moved out into separate files; just as we've done for \c MyPage.qml. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 785c70de..00e16679 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -64,8 +64,8 @@ \section1 QML Types - \section2 Qt.labs.controls Module - \generatelist {qmltypesbymodule Qt.labs.controls} + \section2 QtQuick.Controls Module + \generatelist {qmltypesbymodule QtQuick.Controls} \section1 Important Concepts in Qt Quick Controls 2 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index 5b425741..7c9e27ab 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -32,7 +32,7 @@ The Material Style is based on the Google Material Design Guidelines. \l {detailed-description}{More...} - \styleimport {Qt.labs.controls.material 1.0} + \styleimport {QtQuick.Controls.Material 2.0} \section1 Attached Properties diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index 507c3a0f..deff846d 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule Qt.labs.controls 1.0 + \qmlmodule QtQuick.Controls 2.0 \title Qt Quick Controls 2 QML Types \ingroup qmlmodules \brief Provides QML types for user interfaces (Qt Quick Controls 2). @@ -53,8 +53,8 @@ \section1 QML Types - \section2 Qt.labs.controls Module - \generatelist {qmltypesbymodule Qt.labs.controls} + \section2 QtQuick.Controls Module + \generatelist {qmltypesbymodule QtQuick.Controls} \noautolist For more information on the Qt Quick Controls 2 module, see the diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 4ed13d75..a1803409 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -32,7 +32,7 @@ The Universal Style is based on the Microsoft Universal Design Guidelines. \l {detailed-description}{More...} - \styleimport {Qt.labs.controls.universal 1.0} + \styleimport {QtQuick.Controls.Universal 2.0} \section1 Attached Properties diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc b/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc index 335b4705..0c1dd008 100644 --- a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc +++ b/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc @@ -44,16 +44,16 @@ \labs For the sake of clarity, there is a one-to-one mapping between the types - provided by the \c Qt.labs.templates and \c Qt.labs.controls imports. For - every type available in the \c Qt.labs.controls import, a non-visual template + provided by the \c Qt.labs.templates and \c QtQuick.Controls imports. For + every type available in the \c QtQuick.Controls import, a non-visual template type by the same name exists in the \c Qt.labs.templates import. \note It is recommended to use a namespace for the templates import to avoid - overlap with the types provided by the \c Qt.labs.controls import. + overlap with the types provided by the \c QtQuick.Controls import. \section1 QML Types - \generatelist {qmltypesbymodule Qt.labs.controls} + \generatelist {qmltypesbymodule QtQuick.Controls} \section1 Related Information diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index ec6b3d63..085281b7 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -53,7 +53,7 @@ static const int AUTO_REPEAT_INTERVAL = 100; \qmltype AbstractButton \inherits Control \instantiates QQuickAbstractButton - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-buttons \brief Base type of all button controls. @@ -68,19 +68,19 @@ static const int AUTO_REPEAT_INTERVAL = 100; */ /*! - \qmlsignal Qt.labs.controls::AbstractButton::pressed() + \qmlsignal QtQuick.Controls::AbstractButton::pressed() This signal is emitted when the button is interactively pressed by the user. */ /*! - \qmlsignal Qt.labs.controls::AbstractButton::released() + \qmlsignal QtQuick.Controls::AbstractButton::released() This signal is emitted when the button is interactively released by the user. */ /*! - \qmlsignal Qt.labs.controls::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 @@ -88,19 +88,19 @@ static const int AUTO_REPEAT_INTERVAL = 100; */ /*! - \qmlsignal Qt.labs.controls::AbstractButton::clicked() + \qmlsignal QtQuick.Controls::AbstractButton::clicked() This signal is emitted when the button is interactively clicked by the user. */ /*! - \qmlsignal Qt.labs.controls::AbstractButton::pressAndHold() + \qmlsignal QtQuick.Controls::AbstractButton::pressAndHold() This signal is emitted when the button is interactively perssed and held down by the user. */ /*! - \qmlsignal Qt.labs.controls::AbstractButton::doubleClicked() + \qmlsignal QtQuick.Controls::AbstractButton::doubleClicked() This signal is emitted when the button is interactively double clicked by the user. */ @@ -230,7 +230,7 @@ QQuickAbstractButton::~QQuickAbstractButton() } /*! - \qmlproperty string Qt.labs.controls::AbstractButton::text + \qmlproperty string QtQuick.Controls::AbstractButton::text This property holds a textual description of the button. @@ -257,7 +257,7 @@ void QQuickAbstractButton::setText(const QString &text) } /*! - \qmlproperty bool Qt.labs.controls::AbstractButton::down + \qmlproperty bool QtQuick.Controls::AbstractButton::down This property holds whether the button is visually down. @@ -295,7 +295,7 @@ void QQuickAbstractButton::resetDown() } /*! - \qmlproperty bool Qt.labs.controls::AbstractButton::pressed + \qmlproperty bool QtQuick.Controls::AbstractButton::pressed \readonly This property holds whether the button is physically pressed. A button can @@ -326,7 +326,7 @@ void QQuickAbstractButton::setPressed(bool isPressed) } /*! - \qmlproperty bool Qt.labs.controls::AbstractButton::checked + \qmlproperty bool QtQuick.Controls::AbstractButton::checked This property holds whether the button is checked. */ @@ -374,7 +374,7 @@ void QQuickAbstractButton::setCheckable(bool checkable) } /*! - \qmlproperty bool Qt.labs.controls::AbstractButton::highlighted + \qmlproperty bool QtQuick.Controls::AbstractButton::highlighted This property holds whether the button is highlighted. @@ -400,7 +400,7 @@ void QQuickAbstractButton::setHighlighted(bool highlighted) } /*! - \qmlproperty bool Qt.labs.controls::AbstractButton::autoExclusive + \qmlproperty bool QtQuick.Controls::AbstractButton::autoExclusive This property holds whether auto-exclusivity is enabled. @@ -430,7 +430,7 @@ void QQuickAbstractButton::setAutoExclusive(bool exclusive) } /*! - \qmlproperty bool Qt.labs.controls::AbstractButton::autoRepeat + \qmlproperty bool QtQuick.Controls::AbstractButton::autoRepeat This property holds whether the button repeats pressed(), released() and clicked() signals while the button is pressed and held down. @@ -455,7 +455,7 @@ void QQuickAbstractButton::setAutoRepeat(bool repeat) } /*! - \qmlproperty Item Qt.labs.controls::AbstractButton::indicator + \qmlproperty Item QtQuick.Controls::AbstractButton::indicator This property holds the indicator item. */ @@ -482,7 +482,7 @@ void QQuickAbstractButton::setIndicator(QQuickItem *indicator) } /*! - \qmlmethod void Qt.labs.controls::Button::toggle() + \qmlmethod void QtQuick.Controls::Button::toggle() Toggles the checked state of the button. */ diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 85fd0c69..7cb54a9c 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE \qmltype ApplicationWindow \inherits Window \instantiates QQuickApplicationWindow - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief Provides a top-level application window. @@ -268,7 +268,7 @@ QQuickApplicationWindow::~QQuickApplicationWindow() } /*! - \qmlproperty Item Qt.labs.controls::ApplicationWindow::background + \qmlproperty Item QtQuick.Controls::ApplicationWindow::background This property holds the background item. @@ -304,7 +304,7 @@ void QQuickApplicationWindow::setBackground(QQuickItem *background) } /*! - \qmlproperty Item Qt.labs.controls::ApplicationWindow::header + \qmlproperty Item QtQuick.Controls::ApplicationWindow::header This property holds the window header item. The header item is positioned to the top, and resized to the width of the window. The default value is \c null. @@ -350,7 +350,7 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) } /*! - \qmlproperty Item Qt.labs.controls::ApplicationWindow::footer + \qmlproperty Item QtQuick.Controls::ApplicationWindow::footer This property holds the window footer item. The footer item is positioned to the bottom, and resized to the width of the window. The default value is \c null. @@ -396,7 +396,7 @@ void QQuickApplicationWindow::setFooter(QQuickItem *footer) } /*! - \qmlproperty list<Object> Qt.labs.controls::ApplicationWindow::contentData + \qmlproperty list<Object> QtQuick.Controls::ApplicationWindow::contentData \default This default property holds the list of all objects declared as children of @@ -410,7 +410,7 @@ QQmlListProperty<QObject> QQuickApplicationWindow::contentData() } /*! - \qmlproperty Item Qt.labs.controls::ApplicationWindow::contentItem + \qmlproperty Item QtQuick.Controls::ApplicationWindow::contentItem \readonly This property holds the window content item. @@ -426,7 +426,7 @@ QQuickItem *QQuickApplicationWindow::contentItem() const } /*! - \qmlproperty Control Qt.labs.controls::ApplicationWindow::activeFocusControl + \qmlproperty Control QtQuick.Controls::ApplicationWindow::activeFocusControl \readonly This property holds the control that currently has active focus, or \c null if there is @@ -446,9 +446,9 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const } /*! - \qmlpropertygroup Qt.labs.controls::ApplicationWindow::overlay - \qmlproperty Item Qt.labs.controls::ApplicationWindow::overlay - \qmlproperty Item Qt.labs.controls::ApplicationWindow::overlay.background + \qmlpropertygroup QtQuick.Controls::ApplicationWindow::overlay + \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay + \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay.background This property holds the window overlay item and its background that implements the background dimming when any modal popups are open. Popups are automatically @@ -467,7 +467,7 @@ QQuickOverlay *QQuickApplicationWindow::overlay() const } /*! - \qmlproperty font Qt.labs.controls::ApplicationWindow::font + \qmlproperty font QtQuick.Controls::ApplicationWindow::font This property holds the font currently set for the window. @@ -659,7 +659,7 @@ QQuickApplicationWindowAttached::QQuickApplicationWindowAttached(QObject *parent } /*! - \qmlattachedproperty ApplicationWindow Qt.labs.controls::ApplicationWindow::window + \qmlattachedproperty ApplicationWindow QtQuick.Controls::ApplicationWindow::window \readonly This attached property holds the application window. The property can be attached @@ -672,7 +672,7 @@ QQuickApplicationWindow *QQuickApplicationWindowAttached::window() const } /*! - \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::contentItem + \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::contentItem \readonly This attached property holds the window content item. The property can be attached @@ -685,7 +685,7 @@ QQuickItem *QQuickApplicationWindowAttached::contentItem() const } /*! - \qmlattachedproperty Control Qt.labs.controls::ApplicationWindow::activeFocusControl + \qmlattachedproperty Control QtQuick.Controls::ApplicationWindow::activeFocusControl \readonly This attached property holds the control that currently has active focus, or \c null @@ -702,7 +702,7 @@ QQuickItem *QQuickApplicationWindowAttached::activeFocusControl() const } /*! - \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::header + \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::header \readonly This attached property holds the window header item. The property can be attached @@ -716,7 +716,7 @@ QQuickItem *QQuickApplicationWindowAttached::header() const } /*! - \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::footer + \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::footer \readonly This attached property holds the window footer item. The property can be attached @@ -730,7 +730,7 @@ QQuickItem *QQuickApplicationWindowAttached::footer() const } /*! - \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::overlay + \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::overlay \readonly This attached property holds the window overlay item. The property can be attached diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp index 82d1da73..272c31f9 100644 --- a/src/quicktemplates2/qquickbusyindicator.cpp +++ b/src/quicktemplates2/qquickbusyindicator.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype BusyIndicator \inherits Control \instantiates QQuickBusyIndicator - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-indicators \brief Indicates activity while content is being loaded. @@ -79,7 +79,7 @@ QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) : } /*! - \qmlproperty bool Qt.labs.controls::BusyIndicator::running + \qmlproperty bool QtQuick.Controls::BusyIndicator::running This property holds whether the busy indicator is currently indicating activity. diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index b9b9426a..b2a31274 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype Button \inherits AbstractButton \instantiates QQuickButton - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-buttons \brief A push-button control that can be clicked by the user. @@ -97,7 +97,7 @@ QQuickButton::QQuickButton(QQuickItem *parent) : QQuickAbstractButton(parent) } /*! - \qmlproperty bool Qt.labs.controls::Button::checkable + \qmlproperty bool QtQuick.Controls::Button::checkable This property holds whether the button is checkable. */ diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp index 19612865..f912a05f 100644 --- a/src/quicktemplates2/qquickbuttongroup.cpp +++ b/src/quicktemplates2/qquickbuttongroup.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \qmltype ButtonGroup \inherits QtObject \instantiates QQuickButtonGroup - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup utilities \brief A mutually-exclusive group of checkable controls. @@ -209,7 +209,7 @@ QQuickButtonGroupAttached *QQuickButtonGroup::qmlAttachedProperties(QObject *obj } /*! - \qmlproperty AbstractButton Qt.labs.controls::ButtonGroup::checkedButton + \qmlproperty AbstractButton QtQuick.Controls::ButtonGroup::checkedButton This property holds the currently selected button, or \c null if there is none. @@ -236,7 +236,7 @@ void QQuickButtonGroup::setCheckedButton(QQuickAbstractButton *checkedButton) } /*! - \qmlproperty list<AbstractButton> Qt.labs.controls::ButtonGroup::buttons + \qmlproperty list<AbstractButton> QtQuick.Controls::ButtonGroup::buttons \default This property holds the list of buttons. @@ -273,7 +273,7 @@ QQmlListProperty<QQuickAbstractButton> QQuickButtonGroup::buttons() } /*! - \qmlmethod void Qt.labs.controls::ButtonGroup::addButton(AbstractButton button) + \qmlmethod void QtQuick.Controls::ButtonGroup::addButton(AbstractButton button) Adds a \a button to the button group. @@ -300,7 +300,7 @@ void QQuickButtonGroup::addButton(QQuickAbstractButton *button) } /*! - \qmlmethod void Qt.labs.controls::ButtonGroup::removeButton(AbstractButton button) + \qmlmethod void QtQuick.Controls::ButtonGroup::removeButton(AbstractButton button) Removes a \a button from the button group. @@ -340,7 +340,7 @@ QQuickButtonGroupAttached::QQuickButtonGroupAttached(QObject *parent) : } /*! - \qmlattachedproperty ButtonGroup Qt.labs.controls::ButtonGroup::group + \qmlattachedproperty ButtonGroup QtQuick.Controls::ButtonGroup::group This property attaches a button to a button group. diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp index c924f5a6..c5651a29 100644 --- a/src/quicktemplates2/qquickcheckbox.cpp +++ b/src/quicktemplates2/qquickcheckbox.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype CheckBox \inherits AbstractButton \instantiates QQuickCheckBox - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-buttons \brief An option button that can be checked or unchecked. @@ -115,7 +115,7 @@ QQuickCheckBox::QQuickCheckBox(QQuickItem *parent) : } /*! - \qmlproperty bool Qt.labs.controls::CheckBox::tristate + \qmlproperty bool QtQuick.Controls::CheckBox::tristate This property holds whether the checkbox is a tri-state checkbox. @@ -138,7 +138,7 @@ void QQuickCheckBox::setTristate(bool tristate) } /*! - \qmlproperty enumeration Qt.labs.controls::CheckBox::checkState + \qmlproperty enumeration QtQuick.Controls::CheckBox::checkState This property holds the check state of the checkbox. diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp index a6dcd348..883a4df4 100644 --- a/src/quicktemplates2/qquickcheckdelegate.cpp +++ b/src/quicktemplates2/qquickcheckdelegate.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype CheckDelegate \inherits ItemDelegate \instantiates QQuickCheckDelegate - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-delegates \brief An item delegate that can be checked or unchecked. @@ -100,7 +100,7 @@ QQuickCheckDelegate::QQuickCheckDelegate(QQuickItem *parent) : } /*! - \qmlproperty bool Qt.labs.controls::CheckDelegate::tristate + \qmlproperty bool QtQuick.Controls::CheckDelegate::tristate This property determines whether the check delegate has three states. @@ -123,7 +123,7 @@ void QQuickCheckDelegate::setTristate(bool tristate) } /*! - \qmlproperty enumeration Qt.labs.controls::CheckDelegate::checkState + \qmlproperty enumeration QtQuick.Controls::CheckDelegate::checkState This property determines the check state of the check delegate. diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 61ce5ce6..612d6135 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \qmltype ComboBox \inherits Control \instantiates QQuickComboBox - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief A combined button and popup list taking minimal space. @@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal void Qt.labs.controls::ComboBox::activated(int index) + \qmlsignal void QtQuick.Controls::ComboBox::activated(int index) This signal is emitted when the item at \a index is activated by the user. @@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal void Qt.labs.controls::ComboBox::highlighted(int index) + \qmlsignal void QtQuick.Controls::ComboBox::highlighted(int index) This signal is emitted when the item at \a index in the popup list is highlighted by the user. @@ -364,7 +364,7 @@ QQuickComboBox::~QQuickComboBox() /*! \readonly - \qmlproperty int Qt.labs.controls::ComboBox::count + \qmlproperty int QtQuick.Controls::ComboBox::count This property holds the number of items in the combo box. */ @@ -375,7 +375,7 @@ int QQuickComboBox::count() const } /*! - \qmlproperty model Qt.labs.controls::ComboBox::model + \qmlproperty model QtQuick.Controls::ComboBox::model This property holds the model providing data for the combo box. @@ -419,7 +419,7 @@ void QQuickComboBox::setModel(const QVariant& m) /*! \internal - \qmlproperty model Qt.labs.controls::ComboBox::delegateModel + \qmlproperty model QtQuick.Controls::ComboBox::delegateModel This property holds the model providing delegate instances for the combo box. */ @@ -430,7 +430,7 @@ QQmlInstanceModel *QQuickComboBox::delegateModel() const } /*! - \qmlproperty bool Qt.labs.controls::ComboBox::pressed + \qmlproperty bool QtQuick.Controls::ComboBox::pressed This property holds whether the combo box button is pressed. */ @@ -452,7 +452,7 @@ void QQuickComboBox::setPressed(bool pressed) /*! \readonly - \qmlproperty int Qt.labs.controls::ComboBox::highlightedIndex + \qmlproperty int QtQuick.Controls::ComboBox::highlightedIndex This property holds the index of the highlighted item in the combo box popup list. @@ -465,7 +465,7 @@ int QQuickComboBox::highlightedIndex() const } /*! - \qmlproperty int Qt.labs.controls::ComboBox::currentIndex + \qmlproperty int QtQuick.Controls::ComboBox::currentIndex This property holds the index of the current item in the combo box. @@ -492,7 +492,7 @@ void QQuickComboBox::setCurrentIndex(int index) /*! \readonly - \qmlproperty string Qt.labs.controls::ComboBox::currentText + \qmlproperty string QtQuick.Controls::ComboBox::currentText This property holds the text of the current item in the combo box. @@ -505,7 +505,7 @@ QString QQuickComboBox::currentText() const } /*! - \qmlproperty string Qt.labs.controls::ComboBox::displayText + \qmlproperty string QtQuick.Controls::ComboBox::displayText This property holds the text that is displayed on the combo box button. @@ -551,7 +551,7 @@ void QQuickComboBox::resetDisplayText() } /*! - \qmlproperty string Qt.labs.controls::ComboBox::textRole + \qmlproperty string QtQuick.Controls::ComboBox::textRole This property holds the model role used for populating the combo box. @@ -576,7 +576,7 @@ void QQuickComboBox::setTextRole(const QString &role) } /*! - \qmlproperty Component Qt.labs.controls::ComboBox::delegate + \qmlproperty Component QtQuick.Controls::ComboBox::delegate This property holds a delegate that presents an item in the combo box popup. @@ -603,7 +603,7 @@ void QQuickComboBox::setDelegate(QQmlComponent* delegate) } /*! - \qmlproperty Popup Qt.labs.controls::ComboBox::popup + \qmlproperty Popup QtQuick.Controls::ComboBox::popup This property holds the popup. @@ -629,7 +629,7 @@ void QQuickComboBox::setPopup(QQuickPopup *popup) } /*! - \qmlmethod string Qt.labs.controls::ComboBox::textAt(int index) + \qmlmethod string QtQuick.Controls::ComboBox::textAt(int index) Returns the text for the specified \a index, or an empty string if the index is out of bounds. @@ -645,7 +645,7 @@ QString QQuickComboBox::textAt(int index) const } /*! - \qmlmethod int Qt.labs.controls::ComboBox::find(string text, flags = Qt.MatchExactly) + \qmlmethod int QtQuick.Controls::ComboBox::find(string text, flags = Qt.MatchExactly) Returns the index of the specified \a text, or \c -1 if no match is found. @@ -708,7 +708,7 @@ int QQuickComboBox::find(const QString &text, Qt::MatchFlags flags) const } /*! - \qmlmethod void Qt.labs.controls::ComboBox::increase() + \qmlmethod void QtQuick.Controls::ComboBox::increase() Increases the current index of the combo box, or the highlighted index if the popup list when it is visible. @@ -722,7 +722,7 @@ void QQuickComboBox::increase() } /*! - \qmlmethod void Qt.labs.controls::ComboBox::decrease() + \qmlmethod void QtQuick.Controls::ComboBox::decrease() Decreases the current index of the combo box, or the highlighted index if the popup list when it is visible. diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 759e5fef..070fcde3 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype Container \inherits Control \instantiates QQuickContainer - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief A container control base type. @@ -284,7 +284,7 @@ QQuickContainer::~QQuickContainer() } /*! - \qmlproperty int Qt.labs.controls::Container::count + \qmlproperty int QtQuick.Controls::Container::count \readonly This property holds the number of items. @@ -296,7 +296,7 @@ int QQuickContainer::count() const } /*! - \qmlmethod Item Qt.labs.controls::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. */ @@ -307,7 +307,7 @@ QQuickItem *QQuickContainer::itemAt(int index) const } /*! - \qmlmethod void Qt.labs.controls::Container::addItem(Item item) + \qmlmethod void QtQuick.Controls::Container::addItem(Item item) Adds an \a item. */ @@ -318,7 +318,7 @@ void QQuickContainer::addItem(QQuickItem *item) } /*! - \qmlmethod void Qt.labs.controls::Container::insertItem(int index, Item item) + \qmlmethod void QtQuick.Controls::Container::insertItem(int index, Item item) Inserts an \a item at \a index. */ @@ -343,7 +343,7 @@ void QQuickContainer::insertItem(int index, QQuickItem *item) } /*! - \qmlmethod void Qt.labs.controls::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. */ @@ -361,7 +361,7 @@ void QQuickContainer::moveItem(int from, int to) } /*! - \qmlmethod void Qt.labs.controls::Container::removeItem(int index) + \qmlmethod void QtQuick.Controls::Container::removeItem(int index) Removes an item at \a index. @@ -380,7 +380,7 @@ void QQuickContainer::removeItem(int index) } /*! - \qmlproperty model Qt.labs.controls::Container::contentModel + \qmlproperty model QtQuick.Controls::Container::contentModel \readonly This property holds the content model of items. @@ -392,7 +392,7 @@ QVariant QQuickContainer::contentModel() const } /*! - \qmlproperty list<Object> Qt.labs.controls::Container::contentData + \qmlproperty list<Object> QtQuick.Controls::Container::contentData \default This property holds the list of content data. @@ -410,7 +410,7 @@ QQmlListProperty<QObject> QQuickContainer::contentData() } /*! - \qmlproperty list<Item> Qt.labs.controls::Container::contentChildren + \qmlproperty list<Item> QtQuick.Controls::Container::contentChildren This property holds the list of content children. @@ -427,7 +427,7 @@ QQmlListProperty<QQuickItem> QQuickContainer::contentChildren() } /*! - \qmlproperty int Qt.labs.controls::Container::currentIndex + \qmlproperty int QtQuick.Controls::Container::currentIndex This property holds the index of the current item in the container. */ @@ -449,7 +449,7 @@ void QQuickContainer::setCurrentIndex(int index) } /*! - \qmlproperty Item Qt.labs.controls::Container::currentItem + \qmlproperty Item QtQuick.Controls::Container::currentItem This property holds the current item. */ diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 55849aa5..a702f40b 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE \qmltype Control \inherits Item \instantiates QQuickControl - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \brief The base type of user interface controls. Control is the base type of user interface controls. It receives input @@ -406,7 +406,7 @@ void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem:: } /*! - \qmlproperty font Qt.labs.controls::Control::font + \qmlproperty font QtQuick.Controls::Control::font This property holds the font currently set for the control. @@ -447,7 +447,7 @@ void QQuickControl::resetFont() } /*! - \qmlproperty real Qt.labs.controls::Control::availableWidth + \qmlproperty real QtQuick.Controls::Control::availableWidth \readonly This property holds the width available after deducting horizontal padding. @@ -460,7 +460,7 @@ qreal QQuickControl::availableWidth() const } /*! - \qmlproperty real Qt.labs.controls::Control::availableHeight + \qmlproperty real QtQuick.Controls::Control::availableHeight \readonly This property holds the height available after deducting vertical padding. @@ -473,7 +473,7 @@ qreal QQuickControl::availableHeight() const } /*! - \qmlproperty real Qt.labs.controls::Control::padding + \qmlproperty real QtQuick.Controls::Control::padding This property holds the default padding. @@ -515,7 +515,7 @@ void QQuickControl::resetPadding() } /*! - \qmlproperty real Qt.labs.controls::Control::topPadding + \qmlproperty real QtQuick.Controls::Control::topPadding This property holds the top padding. @@ -542,7 +542,7 @@ void QQuickControl::resetTopPadding() } /*! - \qmlproperty real Qt.labs.controls::Control::leftPadding + \qmlproperty real QtQuick.Controls::Control::leftPadding This property holds the left padding. @@ -569,7 +569,7 @@ void QQuickControl::resetLeftPadding() } /*! - \qmlproperty real Qt.labs.controls::Control::rightPadding + \qmlproperty real QtQuick.Controls::Control::rightPadding This property holds the right padding. @@ -596,7 +596,7 @@ void QQuickControl::resetRightPadding() } /*! - \qmlproperty real Qt.labs.controls::Control::bottomPadding + \qmlproperty real QtQuick.Controls::Control::bottomPadding This property holds the bottom padding. @@ -623,7 +623,7 @@ void QQuickControl::resetBottomPadding() } /*! - \qmlproperty real Qt.labs.controls::Control::spacing + \qmlproperty real QtQuick.Controls::Control::spacing This property holds the spacing. */ @@ -648,7 +648,7 @@ void QQuickControl::resetSpacing() } /*! - \qmlproperty Locale Qt.labs.controls::Control::locale + \qmlproperty Locale QtQuick.Controls::Control::locale This property holds the locale of the control. It contains locale specific properties for formatting data and numbers. @@ -740,7 +740,7 @@ void QQuickControlPrivate::updateLocaleRecur(QQuickItem *item, const QLocale &l) } /*! - \qmlproperty bool Qt.labs.controls::Control::mirrored + \qmlproperty bool QtQuick.Controls::Control::mirrored \readonly This property holds whether the control is mirrored. @@ -757,7 +757,7 @@ bool QQuickControl::isMirrored() const } /*! - \qmlproperty enumeration Qt.labs.controls::Control::focusPolicy + \qmlproperty enumeration QtQuick.Controls::Control::focusPolicy This property determines the way the control accepts focus. @@ -788,7 +788,7 @@ void QQuickControl::setFocusPolicy(Qt::FocusPolicy policy) } /*! - \qmlproperty enumeration Qt.labs.controls::Control::focusReason + \qmlproperty enumeration QtQuick.Controls::Control::focusReason \readonly This property holds the reason of the last focus change. @@ -827,7 +827,7 @@ void QQuickControl::setFocusReason(Qt::FocusReason reason) } /*! - \qmlproperty bool Qt.labs.controls::Control::activeKeyFocus + \qmlproperty bool QtQuick.Controls::Control::activeKeyFocus \readonly This property holds whether the control has active focus and the focus @@ -847,7 +847,7 @@ bool QQuickControl::hasActiveKeyFocus() const } /*! - \qmlproperty bool Qt.labs.controls::Control::hovered + \qmlproperty bool QtQuick.Controls::Control::hovered \readonly This property holds whether the control is hovered. @@ -871,7 +871,7 @@ void QQuickControl::setHovered(bool hovered) } /*! - \qmlproperty bool Qt.labs.controls::Control::hoverEnabled + \qmlproperty bool QtQuick.Controls::Control::hoverEnabled This property determines whether the control accepts hover events. The default value is \c false. @@ -894,7 +894,7 @@ void QQuickControl::setHoverEnabled(bool enabled) } /*! - \qmlproperty bool Qt.labs.controls::Control::wheelEnabled + \qmlproperty bool QtQuick.Controls::Control::wheelEnabled This property determines whether the control handles wheel events. The default value is \c false. */ @@ -915,7 +915,7 @@ void QQuickControl::setWheelEnabled(bool enabled) } /*! - \qmlproperty Item Qt.labs.controls::Control::background + \qmlproperty Item QtQuick.Controls::Control::background This property holds the background item. @@ -948,7 +948,7 @@ void QQuickControl::setBackground(QQuickItem *background) } /*! - \qmlproperty Item Qt.labs.controls::Control::contentItem + \qmlproperty Item QtQuick.Controls::Control::contentItem This property holds the visual content item. diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 05773871..1652a604 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype Dial \inherits Control \instantiates QQuickDial - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief A circular dial that is rotated to set a value. @@ -181,7 +181,7 @@ QQuickDial::QQuickDial(QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::Dial::from + \qmlproperty real QtQuick.Controls::Dial::from This property holds the starting value for the range. The default value is \c 0.0. @@ -208,7 +208,7 @@ void QQuickDial::setFrom(qreal from) } /*! - \qmlproperty real Qt.labs.controls::Dial::to + \qmlproperty real QtQuick.Controls::Dial::to This property holds the end value for the range. The default value is \c 1.0. @@ -236,7 +236,7 @@ void QQuickDial::setTo(qreal to) } /*! - \qmlproperty real Qt.labs.controls::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. @@ -268,7 +268,7 @@ void QQuickDial::setValue(qreal value) } /*! - \qmlproperty real Qt.labs.controls::Dial::position + \qmlproperty real QtQuick.Controls::Dial::position \readonly This property holds the logical position of the handle. @@ -287,7 +287,7 @@ qreal QQuickDial::position() const } /*! - \qmlproperty real Qt.labs.controls::Dial::angle + \qmlproperty real QtQuick.Controls::Dial::angle \readonly This property holds the angle of the handle. @@ -304,7 +304,7 @@ qreal QQuickDial::angle() const } /*! - \qmlproperty real Qt.labs.controls::Dial::stepSize + \qmlproperty real QtQuick.Controls::Dial::stepSize This property holds the step size. The default value is \c 0.0. @@ -327,7 +327,7 @@ void QQuickDial::setStepSize(qreal step) } /*! - \qmlproperty enumeration Qt.labs.controls::Dial::snapMode + \qmlproperty enumeration QtQuick.Controls::Dial::snapMode This property holds the snap mode. @@ -358,7 +358,7 @@ void QQuickDial::setSnapMode(SnapMode mode) } /*! - \qmlproperty bool Qt.labs.controls::Dial::wrap + \qmlproperty bool QtQuick.Controls::Dial::wrap This property holds whether the dial wraps when dragged. @@ -392,7 +392,7 @@ void QQuickDial::setWrap(bool wrap) } /*! - \qmlproperty bool Qt.labs.controls::Dial::pressed + \qmlproperty bool QtQuick.Controls::Dial::pressed This property holds whether the dial is pressed. @@ -427,7 +427,7 @@ void QQuickDial::setPressed(bool pressed) } /*! - \qmlmethod void Qt.labs.controls::Dial::increase() + \qmlmethod void QtQuick.Controls::Dial::increase() Increases the value by \l stepSize, or \c 0.1 if stepSize is not defined. @@ -441,7 +441,7 @@ void QQuickDial::increase() } /*! - \qmlmethod void Qt.labs.controls::Dial::decrease() + \qmlmethod void QtQuick.Controls::Dial::decrease() Decreases the value by \l stepSize, or \c 0.1 if stepSize is not defined. @@ -455,7 +455,7 @@ void QQuickDial::decrease() } /*! - \qmlproperty component Qt.labs.controls::Dial::handle + \qmlproperty component QtQuick.Controls::Dial::handle This property holds the handle of the dial. diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 5c21e163..ba211449 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \qmltype Drawer \inherits Popup \instantiates QQuickDrawer - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers \brief Provides a swipe-based side panel. @@ -339,7 +339,7 @@ QQuickDrawer::QQuickDrawer(QObject *parent) : } /*! - \qmlproperty enumeration Qt.labs.controls::Drawer::edge + \qmlproperty enumeration QtQuick.Controls::Drawer::edge This property holds the edge of the content item at which the drawer will open from. The acceptable values are: @@ -368,7 +368,7 @@ void QQuickDrawer::setEdge(Qt::Edge edge) } /*! - \qmlproperty real Qt.labs.controls::Drawer::position + \qmlproperty real QtQuick.Controls::Drawer::position This property holds the position of the drawer relative to its final destination. That is, the position will be \c 0 when the drawer @@ -394,7 +394,7 @@ void QQuickDrawer::setPosition(qreal position) } /*! - \qmlproperty real Qt.labs.controls::Drawer::dragMargin + \qmlproperty real QtQuick.Controls::Drawer::dragMargin This property holds the distance from the screen edge within which drag actions will open the drawer. Setting the value to \c 0 or less diff --git a/src/quicktemplates2/qquickframe.cpp b/src/quicktemplates2/qquickframe.cpp index 16ead43c..5adafa1d 100644 --- a/src/quicktemplates2/qquickframe.cpp +++ b/src/quicktemplates2/qquickframe.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype Frame \inherits Pane \instantiates QQuickFrame - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief A logical group of controls within a visual frame. diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp index 86aaa00f..5c4d4324 100644 --- a/src/quicktemplates2/qquickgroupbox.cpp +++ b/src/quicktemplates2/qquickgroupbox.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype GroupBox \inherits Frame \instantiates QQuickGroupBox - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief A frame with a logical group of controls. @@ -99,7 +99,7 @@ QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) : } /*! - \qmlproperty string Qt.labs.controls::GroupBox::title + \qmlproperty string QtQuick.Controls::GroupBox::title This property holds the title. */ @@ -120,7 +120,7 @@ void QQuickGroupBox::setTitle(const QString &title) } /*! - \qmlproperty Item Qt.labs.controls::GroupBox::label + \qmlproperty Item QtQuick.Controls::GroupBox::label This property holds the label item that visualizes \l title. diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp index e15af2db..980b3e2a 100644 --- a/src/quicktemplates2/qquickitemdelegate.cpp +++ b/src/quicktemplates2/qquickitemdelegate.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype ItemDelegate \inherits AbstractButton \instantiates QQuickItemDelegate - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \brief A standard view item that can be used in various views and controls. \image qtquickcontrols2-itemdelegate.gif diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index 158334d4..865db614 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE \qmltype Label \inherits Text \instantiates QQuickLabel - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup text \brief A text label with inherited styling and font. @@ -184,7 +184,7 @@ void QQuickLabel::setFont(const QFont &font) } /*! - \qmlproperty Item Qt.labs.controls::Label::background + \qmlproperty Item QtQuick.Controls::Label::background This property holds the background item. diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index b3716bf9..92dd3d3d 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \qmltype Menu \inherits Popup \instantiates QQuickMenu - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-menus \brief A menu control that can be used as a context menu or popup menu. @@ -270,7 +270,7 @@ QQuickMenu::QQuickMenu(QObject *parent) : } /*! - \qmlmethod Item Qt.labs.controls::Menu::itemAt(int index) + \qmlmethod Item QtQuick.Controls::Menu::itemAt(int index) Returns the item at \a index, or \c null if it does not exist. */ @@ -281,7 +281,7 @@ QQuickItem *QQuickMenu::itemAt(int index) const } /*! - \qmlmethod void Qt.labs.controls::Menu::addItem(Item item) + \qmlmethod void QtQuick.Controls::Menu::addItem(Item item) Adds \a item to the end of the list of items. */ @@ -292,7 +292,7 @@ void QQuickMenu::addItem(QQuickItem *item) } /*! - \qmlmethod void Qt.labs.controls::Menu::insertItem(int index, Item item) + \qmlmethod void QtQuick.Controls::Menu::insertItem(int index, Item item) Inserts \a item at \a index. */ @@ -317,7 +317,7 @@ void QQuickMenu::insertItem(int index, QQuickItem *item) } /*! - \qmlmethod void Qt.labs.controls::Menu::moveItem(int from, int to) + \qmlmethod void QtQuick.Controls::Menu::moveItem(int from, int to) Moves an item \a from one index \a to another. */ @@ -335,7 +335,7 @@ void QQuickMenu::moveItem(int from, int to) } /*! - \qmlmethod void Qt.labs.controls::Menu::removeItem(int index) + \qmlmethod void QtQuick.Controls::Menu::removeItem(int index) Removes an item at \a index. @@ -354,7 +354,7 @@ void QQuickMenu::removeItem(int index) } /*! - \qmlproperty model Qt.labs.controls::Menu::contentModel + \qmlproperty model QtQuick.Controls::Menu::contentModel \readonly This property holds the model used to display menu items. @@ -369,7 +369,7 @@ QVariant QQuickMenu::contentModel() const } /*! - \qmlproperty list<Object> Qt.labs.controls::Menu::contentData + \qmlproperty list<Object> QtQuick.Controls::Menu::contentData \default This property holds the list of content data. @@ -387,7 +387,7 @@ QQmlListProperty<QObject> QQuickMenu::contentData() } /*! - \qmlproperty string Qt.labs.controls::Menu::title + \qmlproperty string QtQuick.Controls::Menu::title Title for the menu as a submenu or in a menubar. diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index b118de30..e22b3548 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype MenuItem \inherits Control \instantiates QQuickMenuItem - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-menus \brief A menu item within a Menu. @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal void Qt.labs.controls::MenuItem::triggered() + \qmlsignal void QtQuick.Controls::MenuItem::triggered() This signal is emitted when the menu item is triggered by the user. */ @@ -93,7 +93,7 @@ QQuickMenuItem::QQuickMenuItem(QQuickItem *parent) : } /*! - \qmlproperty bool Qt.labs.controls::MenuItem::checkable + \qmlproperty bool QtQuick.Controls::MenuItem::checkable This property holds whether the menu item is checkable. */ diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 12ee27e5..d6ef07b7 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \qmltype Page \inherits Control \instantiates QQuickPage - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief A control that makes it convenient to add a header and footer to a page. @@ -161,7 +161,7 @@ QQuickPage::QQuickPage(QQuickItem *parent) : } /*! - \qmlproperty Item Qt.labs.controls::Page::header + \qmlproperty Item QtQuick.Controls::Page::header This property holds the page header item. The header item is positioned to the top, and resized to the width of the page. The default value is \c null. @@ -207,7 +207,7 @@ void QQuickPage::setHeader(QQuickItem *header) } /*! - \qmlproperty Item Qt.labs.controls::Page::footer + \qmlproperty Item QtQuick.Controls::Page::footer This property holds the page footer item. The footer item is positioned to the bottom, and resized to the width of the page. The default value is \c null. @@ -253,7 +253,7 @@ void QQuickPage::setFooter(QQuickItem *footer) } /*! - \qmlproperty list<Object> Qt.labs.controls::Page::contentData + \qmlproperty list<Object> QtQuick.Controls::Page::contentData \default This property holds the list of content data. @@ -271,7 +271,7 @@ QQmlListProperty<QObject> QQuickPage::contentData() } /*! - \qmlproperty list<Item> Qt.labs.controls::Page::contentChildren + \qmlproperty list<Item> QtQuick.Controls::Page::contentChildren This property holds the list of content children. diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp index 50050f84..87afdd1e 100644 --- a/src/quicktemplates2/qquickpageindicator.cpp +++ b/src/quicktemplates2/qquickpageindicator.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \qmltype PageIndicator \inherits Control \instantiates QQuickPageIndicator - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-indicators \brief Indicates the currently active page. @@ -152,7 +152,7 @@ QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) : } /*! - \qmlproperty int Qt.labs.controls::PageIndicator::count + \qmlproperty int QtQuick.Controls::PageIndicator::count This property holds the number of pages. */ @@ -173,7 +173,7 @@ void QQuickPageIndicator::setCount(int count) } /*! - \qmlproperty int Qt.labs.controls::PageIndicator::currentIndex + \qmlproperty int QtQuick.Controls::PageIndicator::currentIndex This property holds the index of the current page. */ @@ -194,7 +194,7 @@ void QQuickPageIndicator::setCurrentIndex(int index) } /*! - \qmlproperty bool Qt.labs.controls::PageIndicator::interactive + \qmlproperty bool QtQuick.Controls::PageIndicator::interactive This property holds whether the control is interactive. An interactive page indicator reacts to presses and automatically changes the \l {currentIndex}{current index} @@ -220,7 +220,7 @@ void QQuickPageIndicator::setInteractive(bool interactive) } /*! - \qmlproperty Component Qt.labs.controls::PageIndicator::delegate + \qmlproperty Component QtQuick.Controls::PageIndicator::delegate This property holds a delegate that presents a page. diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index 5aabfa15..84b5c59e 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype Pane \inherits Control \instantiates QQuickPane - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief Provides a background matching with the application style and theme. @@ -88,7 +88,7 @@ QQuickPane::QQuickPane(QQuickPanePrivate &dd, QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::Pane::contentWidth + \qmlproperty real QtQuick.Controls::Pane::contentWidth This property holds the content width. It is used for calculating the total implicit width of the pane. @@ -113,7 +113,7 @@ void QQuickPane::setContentWidth(qreal width) } /*! - \qmlproperty real Qt.labs.controls::Pane::contentHeight + \qmlproperty real QtQuick.Controls::Pane::contentHeight This property holds the content height. It is used for calculating the total implicit height of the pane. @@ -138,7 +138,7 @@ void QQuickPane::setContentHeight(qreal height) } /*! - \qmlproperty list<Object> Qt.labs.controls::Pane::contentData + \qmlproperty list<Object> QtQuick.Controls::Pane::contentData \default This property holds the list of content data. @@ -156,7 +156,7 @@ QQmlListProperty<QObject> QQuickPane::contentData() } /*! - \qmlproperty list<Item> Qt.labs.controls::Pane::contentChildren + \qmlproperty list<Item> QtQuick.Controls::Pane::contentChildren This property holds the list of content children. diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index fe03a3b0..32cf1606 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \qmltype Popup \inherits QtObject \instantiates QQuickPopup - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-popups \brief The base type of popup-like user interface controls. @@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal void Qt.labs.controls::Popup::opened() + \qmlsignal void QtQuick.Controls::Popup::opened() This signal is emitted when the popup is opened. @@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal void Qt.labs.controls::Popup::closed() + \qmlsignal void QtQuick.Controls::Popup::closed() This signal is emitted when the popup is closed. @@ -680,7 +680,7 @@ QQuickPopup::~QQuickPopup() } /*! - \qmlmethod void Qt.labs.controls::Popup::open() + \qmlmethod void QtQuick.Controls::Popup::open() Opens the popup. */ @@ -695,7 +695,7 @@ void QQuickPopup::open() } /*! - \qmlmethod void Qt.labs.controls::Popup::close() + \qmlmethod void QtQuick.Controls::Popup::close() Closes the popup. */ @@ -710,7 +710,7 @@ void QQuickPopup::close() } /*! - \qmlproperty real Qt.labs.controls::Popup::x + \qmlproperty real QtQuick.Controls::Popup::x This property holds the x-coordinate of the popup. */ @@ -733,7 +733,7 @@ void QQuickPopup::setX(qreal x) } /*! - \qmlproperty real Qt.labs.controls::Popup::y + \qmlproperty real QtQuick.Controls::Popup::y This property holds the y-coordinate of the popup. */ @@ -780,7 +780,7 @@ void QQuickPopup::setPosition(const QPointF &pos) } /*! - \qmlproperty real Qt.labs.controls::Popup::z + \qmlproperty real QtQuick.Controls::Popup::z This property holds the z-value of the popup. Z-value determines the stacking order of popups. The default z-value is \c 0. @@ -801,7 +801,7 @@ void QQuickPopup::setZ(qreal z) } /*! - \qmlproperty real Qt.labs.controls::Popup::width + \qmlproperty real QtQuick.Controls::Popup::width This property holds the width of the popup. */ @@ -824,7 +824,7 @@ void QQuickPopup::resetWidth() } /*! - \qmlproperty real Qt.labs.controls::Popup::height + \qmlproperty real QtQuick.Controls::Popup::height This property holds the height of the popup. */ @@ -847,7 +847,7 @@ void QQuickPopup::resetHeight() } /*! - \qmlproperty real Qt.labs.controls::Popup::implicitWidth + \qmlproperty real QtQuick.Controls::Popup::implicitWidth This property holds the implicit width of the popup. */ @@ -864,7 +864,7 @@ void QQuickPopup::setImplicitWidth(qreal width) } /*! - \qmlproperty real Qt.labs.controls::Popup::implicitHeight + \qmlproperty real QtQuick.Controls::Popup::implicitHeight This property holds the implicit height of the popup. */ @@ -881,7 +881,7 @@ void QQuickPopup::setImplicitHeight(qreal height) } /*! - \qmlproperty real Qt.labs.controls::Popup::contentWidth + \qmlproperty real QtQuick.Controls::Popup::contentWidth This property holds the content width. It is used for calculating the total implicit width of the Popup. @@ -906,7 +906,7 @@ void QQuickPopup::setContentWidth(qreal width) } /*! - \qmlproperty real Qt.labs.controls::Popup::contentHeight + \qmlproperty real QtQuick.Controls::Popup::contentHeight This property holds the content height. It is used for calculating the total implicit height of the Popup. @@ -931,7 +931,7 @@ void QQuickPopup::setContentHeight(qreal height) } /*! - \qmlproperty real Qt.labs.controls::Popup::availableWidth + \qmlproperty real QtQuick.Controls::Popup::availableWidth \readonly This property holds the width available after deducting horizontal padding. @@ -945,7 +945,7 @@ qreal QQuickPopup::availableWidth() const } /*! - \qmlproperty real Qt.labs.controls::Popup::availableHeight + \qmlproperty real QtQuick.Controls::Popup::availableHeight \readonly This property holds the height available after deducting vertical padding. @@ -959,7 +959,7 @@ qreal QQuickPopup::availableHeight() const } /*! - \qmlproperty real Qt.labs.controls::Popup::margins + \qmlproperty real QtQuick.Controls::Popup::margins This property holds the default margins around the popup. @@ -997,7 +997,7 @@ void QQuickPopup::resetMargins() } /*! - \qmlproperty real Qt.labs.controls::Popup::topMargin + \qmlproperty real QtQuick.Controls::Popup::topMargin This property holds the top margin around the popup. @@ -1024,7 +1024,7 @@ void QQuickPopup::resetTopMargin() } /*! - \qmlproperty real Qt.labs.controls::Popup::leftMargin + \qmlproperty real QtQuick.Controls::Popup::leftMargin This property holds the left margin around the popup. @@ -1051,7 +1051,7 @@ void QQuickPopup::resetLeftMargin() } /*! - \qmlproperty real Qt.labs.controls::Popup::rightMargin + \qmlproperty real QtQuick.Controls::Popup::rightMargin This property holds the right margin around the popup. @@ -1078,7 +1078,7 @@ void QQuickPopup::resetRightMargin() } /*! - \qmlproperty real Qt.labs.controls::Popup::bottomMargin + \qmlproperty real QtQuick.Controls::Popup::bottomMargin This property holds the bottom margin around the popup. @@ -1105,7 +1105,7 @@ void QQuickPopup::resetBottomMargin() } /*! - \qmlproperty real Qt.labs.controls::Popup::padding + \qmlproperty real QtQuick.Controls::Popup::padding This property holds the default padding. @@ -1130,7 +1130,7 @@ void QQuickPopup::resetPadding() } /*! - \qmlproperty real Qt.labs.controls::Popup::topPadding + \qmlproperty real QtQuick.Controls::Popup::topPadding This property holds the top padding. @@ -1155,7 +1155,7 @@ void QQuickPopup::resetTopPadding() } /*! - \qmlproperty real Qt.labs.controls::Popup::leftPadding + \qmlproperty real QtQuick.Controls::Popup::leftPadding This property holds the left padding. @@ -1180,7 +1180,7 @@ void QQuickPopup::resetLeftPadding() } /*! - \qmlproperty real Qt.labs.controls::Popup::rightPadding + \qmlproperty real QtQuick.Controls::Popup::rightPadding This property holds the right padding. @@ -1205,7 +1205,7 @@ void QQuickPopup::resetRightPadding() } /*! - \qmlproperty real Qt.labs.controls::Popup::bottomPadding + \qmlproperty real QtQuick.Controls::Popup::bottomPadding This property holds the bottom padding. @@ -1230,7 +1230,7 @@ void QQuickPopup::resetBottomPadding() } /*! - \qmlproperty Locale Qt.labs.controls::Popup::locale + \qmlproperty Locale QtQuick.Controls::Popup::locale This property holds the locale of the popup. @@ -1255,7 +1255,7 @@ void QQuickPopup::resetLocale() } /*! - \qmlproperty font Qt.labs.controls::Popup::font + \qmlproperty font QtQuick.Controls::Popup::font This property holds the font currently set for the popup. */ @@ -1353,7 +1353,7 @@ void QQuickPopup::setBackground(QQuickItem *background) } /*! - \qmlproperty Item Qt.labs.controls::Popup::contentItem + \qmlproperty Item QtQuick.Controls::Popup::contentItem This property holds the content item of the popup. @@ -1375,7 +1375,7 @@ void QQuickPopup::setContentItem(QQuickItem *item) } /*! - \qmlproperty list<Object> Qt.labs.controls::Popup::contentData + \qmlproperty list<Object> QtQuick.Controls::Popup::contentData \default This property holds the list of content data. @@ -1393,7 +1393,7 @@ QQmlListProperty<QObject> QQuickPopup::contentData() } /*! - \qmlproperty list<Item> Qt.labs.controls::Popup::contentChildren + \qmlproperty list<Item> QtQuick.Controls::Popup::contentChildren This property holds the list of content children. @@ -1410,7 +1410,7 @@ QQmlListProperty<QQuickItem> QQuickPopup::contentChildren() } /*! - \qmlproperty bool Qt.labs.controls::Popup::clip + \qmlproperty bool QtQuick.Controls::Popup::clip This property holds whether clipping is enabled. The default value is \c false. */ @@ -1430,7 +1430,7 @@ void QQuickPopup::setClip(bool clip) } /*! - \qmlproperty bool Qt.labs.controls::Popup::focus + \qmlproperty bool QtQuick.Controls::Popup::focus This property holds whether the popup has focus. The default value is \c false. */ @@ -1450,7 +1450,7 @@ void QQuickPopup::setFocus(bool focus) } /*! - \qmlproperty bool Qt.labs.controls::Popup::activeFocus + \qmlproperty bool QtQuick.Controls::Popup::activeFocus \readonly This property holds whether the popup has active focus. @@ -1462,7 +1462,7 @@ bool QQuickPopup::hasActiveFocus() const } /*! - \qmlproperty bool Qt.labs.controls::Popup::modal + \qmlproperty bool QtQuick.Controls::Popup::modal This property holds whether the popup is modal. The default value is \c false. */ @@ -1482,7 +1482,7 @@ void QQuickPopup::setModal(bool modal) } /*! - \qmlproperty bool Qt.labs.controls::Popup::visible + \qmlproperty bool QtQuick.Controls::Popup::visible This property holds whether the popup is visible. The default value is \c false. */ @@ -1508,7 +1508,7 @@ void QQuickPopup::setVisible(bool visible) } /*! - \qmlproperty real Qt.labs.controls::Popup::opacity + \qmlproperty real QtQuick.Controls::Popup::opacity This property holds the opacity of the popup. The default value is \c 1.0. */ @@ -1525,7 +1525,7 @@ void QQuickPopup::setOpacity(qreal opacity) } /*! - \qmlproperty real Qt.labs.controls::Popup::scale + \qmlproperty real QtQuick.Controls::Popup::scale This property holds the scale factor of the popup. The default value is \c 1.0. */ @@ -1545,7 +1545,7 @@ void QQuickPopup::setScale(qreal scale) } /*! - \qmlproperty enumeration Qt.labs.controls::Popup::closePolicy + \qmlproperty enumeration QtQuick.Controls::Popup::closePolicy This property determines the circumstances under which the popup closes. The flags can be combined to allow several ways of closing the popup. @@ -1577,7 +1577,7 @@ void QQuickPopup::setClosePolicy(ClosePolicy policy) } /*! - \qmlproperty enumeration Qt.labs.controls::Popup::transformOrigin + \qmlproperty enumeration QtQuick.Controls::Popup::transformOrigin This property holds the origin point for transformations in enter and exit transitions. @@ -1601,7 +1601,7 @@ void QQuickPopup::setTransformOrigin(TransformOrigin origin) } /*! - \qmlproperty Transition Qt.labs.controls::Popup::enter + \qmlproperty Transition QtQuick.Controls::Popup::enter This property holds the transition that is applied to the content item when the popup is opened and enters the screen. @@ -1622,7 +1622,7 @@ void QQuickPopup::setEnter(QQuickTransition *transition) } /*! - \qmlproperty Transition Qt.labs.controls::Popup::exit + \qmlproperty Transition QtQuick.Controls::Popup::exit This property holds the transition that is applied to the content item when the popup is closed and exits the screen. diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp index 334e9efa..e1ef61b7 100644 --- a/src/quicktemplates2/qquickprogressbar.cpp +++ b/src/quicktemplates2/qquickprogressbar.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype ProgressBar \inherits Control \instantiates QQuickProgressBar - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-indicators \brief Indicates the progress of an operation. @@ -87,7 +87,7 @@ QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::ProgressBar::from + \qmlproperty real QtQuick.Controls::ProgressBar::from This property holds the starting value for the progress. The default value is \c 0.0. @@ -114,7 +114,7 @@ void QQuickProgressBar::setFrom(qreal from) } /*! - \qmlproperty real Qt.labs.controls::ProgressBar::to + \qmlproperty real QtQuick.Controls::ProgressBar::to This property holds the end value for the progress. The default value is \c 1.0. @@ -141,7 +141,7 @@ void QQuickProgressBar::setTo(qreal to) } /*! - \qmlproperty real Qt.labs.controls::ProgressBar::value + \qmlproperty real QtQuick.Controls::ProgressBar::value This property holds the progress value. The default value is \c 0.0. @@ -169,7 +169,7 @@ void QQuickProgressBar::setValue(qreal value) } /*! - \qmlproperty real Qt.labs.controls::ProgressBar::position + \qmlproperty real QtQuick.Controls::ProgressBar::position \readonly This property holds the logical position of the progress. @@ -189,7 +189,7 @@ qreal QQuickProgressBar::position() const } /*! - \qmlproperty real Qt.labs.controls::ProgressBar::visualPosition + \qmlproperty real QtQuick.Controls::ProgressBar::visualPosition \readonly This property holds the visual position of the progress. @@ -209,7 +209,7 @@ qreal QQuickProgressBar::visualPosition() const } /*! - \qmlproperty bool Qt.labs.controls::ProgressBar::indeterminate + \qmlproperty bool QtQuick.Controls::ProgressBar::indeterminate This property holds whether the progress bar is in indeterminate mode. A progress bar in indeterminate mode displays that an operation is in progress, but it diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp index 9f769bef..d5e5b276 100644 --- a/src/quicktemplates2/qquickradiobutton.cpp +++ b/src/quicktemplates2/qquickradiobutton.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype RadioButton \inherits AbstractButton \instantiates QQuickRadioButton - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-buttons \brief An option button that can be toggled on or off. diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp index 6c0a45dd..eb81d3ed 100644 --- a/src/quicktemplates2/qquickradiodelegate.cpp +++ b/src/quicktemplates2/qquickradiodelegate.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype RadioDelegate \inherits ItemDelegate \instantiates QQuickRadioDelegate - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-delegates \brief An item delegate that can be checked or unchecked. diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index eab7009c..10d24a93 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype RangeSlider \inherits Control \instantiates QQuickRangeSlider - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief A slider control used to select a range of values. @@ -367,7 +367,7 @@ QQuickRangeSlider::QQuickRangeSlider(QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::RangeSlider::from + \qmlproperty real QtQuick.Controls::RangeSlider::from This property holds the starting value for the range. The default value is \c 0.0. @@ -395,7 +395,7 @@ void QQuickRangeSlider::setFrom(qreal from) } /*! - \qmlproperty real Qt.labs.controls::RangeSlider::to + \qmlproperty real QtQuick.Controls::RangeSlider::to This property holds the end value for the range. The default value is \c 1.0. @@ -423,12 +423,12 @@ void QQuickRangeSlider::setTo(qreal to) } /*! - \qmlpropertygroup Qt.labs.controls::RangeSlider::first - \qmlproperty real Qt.labs.controls::RangeSlider::first.value - \qmlproperty real Qt.labs.controls::RangeSlider::first.position - \qmlproperty real Qt.labs.controls::RangeSlider::first.visualPosition - \qmlproperty Item Qt.labs.controls::RangeSlider::first.handle - \qmlproperty bool Qt.labs.controls::RangeSlider::first.pressed + \qmlpropertygroup QtQuick.Controls::RangeSlider::first + \qmlproperty real QtQuick.Controls::RangeSlider::first.value + \qmlproperty real QtQuick.Controls::RangeSlider::first.position + \qmlproperty real QtQuick.Controls::RangeSlider::first.visualPosition + \qmlproperty Item QtQuick.Controls::RangeSlider::first.handle + \qmlproperty bool QtQuick.Controls::RangeSlider::first.pressed \table \header @@ -480,12 +480,12 @@ QQuickRangeSliderNode *QQuickRangeSlider::first() const } /*! - \qmlpropertygroup Qt.labs.controls::RangeSlider::second - \qmlproperty real Qt.labs.controls::RangeSlider::second.value - \qmlproperty real Qt.labs.controls::RangeSlider::second.position - \qmlproperty real Qt.labs.controls::RangeSlider::second.visualPosition - \qmlproperty Item Qt.labs.controls::RangeSlider::second.handle - \qmlproperty bool Qt.labs.controls::RangeSlider::second.pressed + \qmlpropertygroup QtQuick.Controls::RangeSlider::second + \qmlproperty real QtQuick.Controls::RangeSlider::second.value + \qmlproperty real QtQuick.Controls::RangeSlider::second.position + \qmlproperty real QtQuick.Controls::RangeSlider::second.visualPosition + \qmlproperty Item QtQuick.Controls::RangeSlider::second.handle + \qmlproperty bool QtQuick.Controls::RangeSlider::second.pressed \table \header @@ -537,7 +537,7 @@ QQuickRangeSliderNode *QQuickRangeSlider::second() const } /*! - \qmlproperty real Qt.labs.controls::RangeSlider::stepSize + \qmlproperty real QtQuick.Controls::RangeSlider::stepSize This property holds the step size. The default value is \c 0.0. @@ -560,7 +560,7 @@ void QQuickRangeSlider::setStepSize(qreal step) } /*! - \qmlproperty enumeration Qt.labs.controls::RangeSlider::snapMode + \qmlproperty enumeration QtQuick.Controls::RangeSlider::snapMode This property holds the snap mode. @@ -588,7 +588,7 @@ void QQuickRangeSlider::setSnapMode(SnapMode mode) } /*! - \qmlproperty enumeration Qt.labs.controls::RangeSlider::orientation + \qmlproperty enumeration QtQuick.Controls::RangeSlider::orientation This property holds the orientation. @@ -613,7 +613,7 @@ void QQuickRangeSlider::setOrientation(Qt::Orientation orientation) } /*! - \qmlmethod void Qt.labs.controls::RangeSlider::setValues(real firstValue, real secondValue) + \qmlmethod void QtQuick.Controls::RangeSlider::setValues(real firstValue, real secondValue) Sets \l first.value and \l second.value with the given arguments. @@ -886,7 +886,7 @@ void QQuickRangeSlider::componentComplete() } /*! - \qmlmethod void Qt.labs.controls::RangeSlider::first.increase() + \qmlmethod void QtQuick.Controls::RangeSlider::first.increase() Increases the value of the handle by stepSize, or \c 0.1 if stepSize is not defined. @@ -894,7 +894,7 @@ void QQuickRangeSlider::componentComplete() */ /*! - \qmlmethod void Qt.labs.controls::RangeSlider::first.decrease() + \qmlmethod void QtQuick.Controls::RangeSlider::first.decrease() Decreases the value of the handle by stepSize, or \c 0.1 if stepSize is not defined. @@ -902,7 +902,7 @@ void QQuickRangeSlider::componentComplete() */ /*! - \qmlmethod void Qt.labs.controls::RangeSlider::second.increase() + \qmlmethod void QtQuick.Controls::RangeSlider::second.increase() Increases the value of the handle by stepSize, or \c 0.1 if stepSize is not defined. @@ -910,7 +910,7 @@ void QQuickRangeSlider::componentComplete() */ /*! - \qmlmethod void Qt.labs.controls::RangeSlider::second.decrease() + \qmlmethod void QtQuick.Controls::RangeSlider::second.decrease() Decreases the value of the handle by stepSize, or \c 0.1 if stepSize is not defined. diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index f948ce5a..080ebf2d 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \qmltype ScrollBar \inherits Control \instantiates QQuickScrollBar - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-indicators \brief An interactive scroll bar control. @@ -172,7 +172,7 @@ QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object) } /*! - \qmlproperty real Qt.labs.controls::ScrollBar::size + \qmlproperty real QtQuick.Controls::ScrollBar::size This property holds the size of the scroll bar, scaled to \c {0.0 - 1.0}. @@ -198,7 +198,7 @@ void QQuickScrollBar::setSize(qreal size) } /*! - \qmlproperty real Qt.labs.controls::ScrollBar::position + \qmlproperty real QtQuick.Controls::ScrollBar::position This property holds the position of the scroll bar, scaled to \c {0.0 - 1.0}. @@ -224,7 +224,7 @@ void QQuickScrollBar::setPosition(qreal position) } /*! - \qmlproperty real Qt.labs.controls::ScrollBar::stepSize + \qmlproperty real QtQuick.Controls::ScrollBar::stepSize This property holds the step size. The default value is \c 0.0. @@ -247,7 +247,7 @@ void QQuickScrollBar::setStepSize(qreal step) } /*! - \qmlproperty bool Qt.labs.controls::ScrollBar::active + \qmlproperty bool QtQuick.Controls::ScrollBar::active This property holds whether the scroll bar is active, i.e. when it's \l pressed or the attached Flickable is \l {Flickable::moving}{moving}. @@ -269,7 +269,7 @@ void QQuickScrollBar::setActive(bool active) } /*! - \qmlproperty bool Qt.labs.controls::ScrollBar::pressed + \qmlproperty bool QtQuick.Controls::ScrollBar::pressed This property holds whether the scroll bar is pressed. */ @@ -292,7 +292,7 @@ void QQuickScrollBar::setPressed(bool pressed) } /*! - \qmlproperty enumeration Qt.labs.controls::ScrollBar::orientation + \qmlproperty enumeration QtQuick.Controls::ScrollBar::orientation This property holds the orientation of the scroll bar. @@ -319,7 +319,7 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation) } /*! - \qmlmethod void Qt.labs.controls::ScrollBar::increase() + \qmlmethod void QtQuick.Controls::ScrollBar::increase() Increases the position by \l stepSize or \c 0.1 if stepSize is \c 0.0. @@ -335,7 +335,7 @@ void QQuickScrollBar::increase() } /*! - \qmlmethod void Qt.labs.controls::ScrollBar::decrease() + \qmlmethod void QtQuick.Controls::ScrollBar::decrease() Decreases the position by \l stepSize or \c 0.1 if stepSize is \c 0.0. @@ -506,7 +506,7 @@ QQuickScrollBarAttached::~QQuickScrollBarAttached() } /*! - \qmlattachedproperty ScrollBar Qt.labs.controls::ScrollBar::horizontal + \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::horizontal This property attaches a horizontal scroll bar to a \l Flickable. @@ -564,7 +564,7 @@ void QQuickScrollBarAttached::setHorizontal(QQuickScrollBar *horizontal) } /*! - \qmlattachedproperty ScrollBar Qt.labs.controls::ScrollBar::vertical + \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::vertical This property attaches a vertical scroll bar to a \l Flickable. diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp index faf61905..f3bd80fd 100644 --- a/src/quicktemplates2/qquickscrollindicator.cpp +++ b/src/quicktemplates2/qquickscrollindicator.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \qmltype ScrollIndicator \inherits Control \instantiates QQuickScrollIndicator - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-indicators \brief A non-interactive scroll indicator control. @@ -134,7 +134,7 @@ QQuickScrollIndicatorAttached *QQuickScrollIndicator::qmlAttachedProperties(QObj } /*! - \qmlproperty real Qt.labs.controls::ScrollIndicator::size + \qmlproperty real QtQuick.Controls::ScrollIndicator::size This property holds the size of the indicator, scaled to \c {0.0 - 1.0}. @@ -159,7 +159,7 @@ void QQuickScrollIndicator::setSize(qreal size) } /*! - \qmlproperty real Qt.labs.controls::ScrollIndicator::position + \qmlproperty real QtQuick.Controls::ScrollIndicator::position This property holds the position of the indicator, scaled to \c {0.0 - 1.0}. @@ -184,7 +184,7 @@ void QQuickScrollIndicator::setPosition(qreal position) } /*! - \qmlproperty bool Qt.labs.controls::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}. @@ -206,7 +206,7 @@ void QQuickScrollIndicator::setActive(bool active) } /*! - \qmlproperty enumeration Qt.labs.controls::ScrollIndicator::orientation + \qmlproperty enumeration QtQuick.Controls::ScrollIndicator::orientation This property holds the orientation of the indicator. @@ -312,7 +312,7 @@ QQuickScrollIndicatorAttached::~QQuickScrollIndicatorAttached() } /*! - \qmlattachedproperty ScrollIndicator Qt.labs.controls::ScrollIndicator::horizontal + \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::horizontal This property attaches a horizontal scroll indicator to a \l Flickable. @@ -368,7 +368,7 @@ void QQuickScrollIndicatorAttached::setHorizontal(QQuickScrollIndicator *horizon } /*! - \qmlattachedproperty ScrollIndicator Qt.labs.controls::ScrollIndicator::vertical + \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::vertical This property attaches a vertical scroll indicator to a \l Flickable. diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index 9d3fda5b..b9e81b63 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype Slider \inherits Control \instantiates QQuickSlider - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief Selects a value by sliding a handle along a track. @@ -170,7 +170,7 @@ QQuickSlider::QQuickSlider(QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::Slider::from + \qmlproperty real QtQuick.Controls::Slider::from This property holds the starting value for the range. The default value is \c 0.0. @@ -197,7 +197,7 @@ void QQuickSlider::setFrom(qreal from) } /*! - \qmlproperty real Qt.labs.controls::Slider::to + \qmlproperty real QtQuick.Controls::Slider::to This property holds the end value for the range. The default value is \c 1.0. @@ -224,7 +224,7 @@ void QQuickSlider::setTo(qreal to) } /*! - \qmlproperty real Qt.labs.controls::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. @@ -255,7 +255,7 @@ void QQuickSlider::setValue(qreal value) } /*! - \qmlproperty real Qt.labs.controls::Slider::position + \qmlproperty real QtQuick.Controls::Slider::position \readonly This property holds the logical position of the handle. @@ -274,7 +274,7 @@ qreal QQuickSlider::position() const } /*! - \qmlproperty real Qt.labs.controls::Slider::visualPosition + \qmlproperty real QtQuick.Controls::Slider::visualPosition \readonly This property holds the visual position of the handle. @@ -295,7 +295,7 @@ qreal QQuickSlider::visualPosition() const } /*! - \qmlproperty real Qt.labs.controls::Slider::stepSize + \qmlproperty real QtQuick.Controls::Slider::stepSize This property holds the step size. The default value is \c 0.0. @@ -318,7 +318,7 @@ void QQuickSlider::setStepSize(qreal step) } /*! - \qmlproperty enumeration Qt.labs.controls::Slider::snapMode + \qmlproperty enumeration QtQuick.Controls::Slider::snapMode This property holds the snap mode. @@ -346,7 +346,7 @@ void QQuickSlider::setSnapMode(SnapMode mode) } /*! - \qmlproperty bool Qt.labs.controls::Slider::pressed + \qmlproperty bool QtQuick.Controls::Slider::pressed This property holds whether the slider is pressed. */ @@ -368,7 +368,7 @@ void QQuickSlider::setPressed(bool pressed) } /*! - \qmlproperty enumeration Qt.labs.controls::Slider::orientation + \qmlproperty enumeration QtQuick.Controls::Slider::orientation This property holds the orientation. @@ -393,7 +393,7 @@ void QQuickSlider::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item Qt.labs.controls::Slider::handle + \qmlproperty Item QtQuick.Controls::Slider::handle This property holds the handle item. @@ -419,7 +419,7 @@ void QQuickSlider::setHandle(QQuickItem *handle) } /*! - \qmlmethod void Qt.labs.controls::Slider::increase() + \qmlmethod void QtQuick.Controls::Slider::increase() Increases the value by \l stepSize or \c 0.1 if stepSize is not defined. @@ -433,7 +433,7 @@ void QQuickSlider::increase() } /*! - \qmlmethod void Qt.labs.controls::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/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 0575ef80..547216db 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -54,7 +54,7 @@ static const int AUTO_REPEAT_INTERVAL = 100; \qmltype SpinBox \inherits Control \instantiates QQuickSpinBox - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup input \brief A spinbox control that allows the user to select from a set of preset values. @@ -250,7 +250,7 @@ QQuickSpinBox::QQuickSpinBox(QQuickItem *parent) : } /*! - \qmlproperty int Qt.labs.controls::SpinBox::from + \qmlproperty int QtQuick.Controls::SpinBox::from This property holds the starting value for the range. The default value is \c 0. @@ -275,7 +275,7 @@ void QQuickSpinBox::setFrom(int from) } /*! - \qmlproperty int Qt.labs.controls::SpinBox::to + \qmlproperty int QtQuick.Controls::SpinBox::to This property holds the end value for the range. The default value is \c 99. @@ -300,7 +300,7 @@ void QQuickSpinBox::setTo(int to) } /*! - \qmlproperty int Qt.labs.controls::SpinBox::value + \qmlproperty int QtQuick.Controls::SpinBox::value This property holds the value in the range \c from - \c to. The default value is \c 0. */ @@ -324,7 +324,7 @@ void QQuickSpinBox::setValue(int value) } /*! - \qmlproperty int Qt.labs.controls::SpinBox::stepSize + \qmlproperty int QtQuick.Controls::SpinBox::stepSize This property holds the step size. The default value is \c 1. @@ -347,7 +347,7 @@ void QQuickSpinBox::setStepSize(int step) } /*! - \qmlproperty bool Qt.labs.controls::SpinBox::editable + \qmlproperty bool QtQuick.Controls::SpinBox::editable This property holds whether the spinbox is editable. The default value is \c false. @@ -370,7 +370,7 @@ void QQuickSpinBox::setEditable(bool editable) } /*! - \qmlproperty Validator Qt.labs.controls::SpinBox::validator + \qmlproperty Validator QtQuick.Controls::SpinBox::validator This property holds the input text validator for editable spinboxes. By default, SpinBox uses \l IntValidator to accept input of integer numbers. @@ -396,7 +396,7 @@ void QQuickSpinBox::setValidator(QValidator *validator) } /*! - \qmlproperty function Qt.labs.controls::SpinBox::textFromValue + \qmlproperty function QtQuick.Controls::SpinBox::textFromValue This property holds a callback function that is called whenever an integer value needs to be converted to display text. @@ -437,7 +437,7 @@ void QQuickSpinBox::setTextFromValue(const QJSValue &callback) } /*! - \qmlproperty function Qt.labs.controls::SpinBox::valueFromText + \qmlproperty function QtQuick.Controls::SpinBox::valueFromText This property holds a callback function that is called whenever input text needs to be converted to an integer value. @@ -478,9 +478,9 @@ void QQuickSpinBox::setValueFromText(const QJSValue &callback) } /*! - \qmlpropertygroup Qt.labs.controls::SpinBox::up - \qmlproperty bool Qt.labs.controls::SpinBox::up.pressed - \qmlproperty Item Qt.labs.controls::SpinBox::up.indicator + \qmlpropertygroup QtQuick.Controls::SpinBox::up + \qmlproperty bool QtQuick.Controls::SpinBox::up.pressed + \qmlproperty Item QtQuick.Controls::SpinBox::up.indicator These properties hold the up indicator item and whether it is pressed. @@ -493,9 +493,9 @@ QQuickSpinButton *QQuickSpinBox::up() const } /*! - \qmlpropertygroup Qt.labs.controls::SpinBox::down - \qmlproperty bool Qt.labs.controls::SpinBox::down.pressed - \qmlproperty Item Qt.labs.controls::SpinBox::down.indicator + \qmlpropertygroup QtQuick.Controls::SpinBox::down + \qmlproperty bool QtQuick.Controls::SpinBox::down.pressed + \qmlproperty Item QtQuick.Controls::SpinBox::down.indicator These properties hold the down indicator item and whether it is pressed. @@ -508,7 +508,7 @@ QQuickSpinButton *QQuickSpinBox::down() const } /*! - \qmlmethod void Qt.labs.controls::SpinBox::increase() + \qmlmethod void QtQuick.Controls::SpinBox::increase() Increases the value by \l stepSize. @@ -521,7 +521,7 @@ void QQuickSpinBox::increase() } /*! - \qmlmethod void Qt.labs.controls::SpinBox::decrease() + \qmlmethod void QtQuick.Controls::SpinBox::decrease() Decreases the value by \l stepSize. diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index d949e3b8..8dfa1ccb 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \qmltype StackView \inherits Control \instantiates QQuickStackView - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers \brief Provides a stack-based navigation model. @@ -296,7 +296,7 @@ QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object) } /*! - \qmlproperty bool Qt.labs.controls::StackView::busy + \qmlproperty bool QtQuick.Controls::StackView::busy \readonly This property holds whether a transition is running. */ @@ -307,7 +307,7 @@ bool QQuickStackView::isBusy() const } /*! - \qmlproperty int Qt.labs.controls::StackView::depth + \qmlproperty int QtQuick.Controls::StackView::depth \readonly This property holds the number of items currently pushed onto the stack. */ @@ -318,7 +318,7 @@ int QQuickStackView::depth() const } /*! - \qmlproperty Item Qt.labs.controls::StackView::currentItem + \qmlproperty Item QtQuick.Controls::StackView::currentItem \readonly This property holds the current top-most item in the stack. */ @@ -329,7 +329,7 @@ QQuickItem *QQuickStackView::currentItem() const } /*! - \qmlmethod Item Qt.labs.controls::StackView::get(index, behavior) + \qmlmethod Item QtQuick.Controls::StackView::get(index, behavior) Returns the item at position \a index in the stack, or \c null if the index is out of bounds. @@ -351,7 +351,7 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior) } /*! - \qmlmethod Item Qt.labs.controls::StackView::find(callback, behavior) + \qmlmethod Item QtQuick.Controls::StackView::find(callback, behavior) Search for a specific item inside the stack. The \a callback function is called for each item in the stack (with the item and index as arguments) until the callback @@ -390,7 +390,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio } /*! - \qmlmethod Item Qt.labs.controls::StackView::push(item, properties, operation) + \qmlmethod Item QtQuick.Controls::StackView::push(item, properties, operation) Pushes an \a item onto the stack using the specified \a operation, and optionally applies a set of \a properties on the item. The item can be @@ -477,7 +477,7 @@ void QQuickStackView::push(QQmlV4Function *args) } /*! - \qmlmethod Item Qt.labs.controls::StackView::pop(item, operation) + \qmlmethod Item QtQuick.Controls::StackView::pop(item, operation) Pops one or more items off the stack. Returns the last item removed from the stack. @@ -560,7 +560,7 @@ void QQuickStackView::pop(QQmlV4Function *args) } /*! - \qmlmethod Item Qt.labs.controls::StackView::replace(target, item, properties, operation) + \qmlmethod Item QtQuick.Controls::StackView::replace(target, item, properties, operation) Replaces one or more items on the stack with the specified \a item and \a operation, and optionally applies a set of \a properties on the @@ -660,7 +660,7 @@ void QQuickStackView::replace(QQmlV4Function *args) } /*! - \qmlmethod void Qt.labs.controls::StackView::clear() + \qmlmethod void QtQuick.Controls::StackView::clear() Removes all items from the stack. No animations are applied. */ @@ -674,7 +674,7 @@ void QQuickStackView::clear() } /*! - \qmlproperty var Qt.labs.controls::StackView::initialItem + \qmlproperty var QtQuick.Controls::StackView::initialItem This property holds the initial item that should be shown when the StackView is created. The initial item can be an \l Item, \l Component, or a \l [QML] url. @@ -698,7 +698,7 @@ void QQuickStackView::setInitialItem(const QVariant &item) } /*! - \qmlproperty Transition Qt.labs.controls::StackView::popEnter + \qmlproperty Transition QtQuick.Controls::StackView::popEnter This property holds the transition that is applied to the item that enters the stack when another item is popped off of it. @@ -725,7 +725,7 @@ void QQuickStackView::setPopEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition Qt.labs.controls::StackView::popExit + \qmlproperty Transition QtQuick.Controls::StackView::popExit This property holds the transition that is applied to the item that exits the stack when the item is popped off of it. @@ -752,7 +752,7 @@ void QQuickStackView::setPopExit(QQuickTransition *exit) } /*! - \qmlproperty Transition Qt.labs.controls::StackView::pushEnter + \qmlproperty Transition QtQuick.Controls::StackView::pushEnter This property holds the transition that is applied to the item that enters the stack when the item is pushed onto it. @@ -779,7 +779,7 @@ void QQuickStackView::setPushEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition Qt.labs.controls::StackView::pushExit + \qmlproperty Transition QtQuick.Controls::StackView::pushExit This property holds the transition that is applied to the item that exits the stack when another item is pushed onto it. @@ -806,7 +806,7 @@ void QQuickStackView::setPushExit(QQuickTransition *exit) } /*! - \qmlproperty Transition Qt.labs.controls::StackView::replaceEnter + \qmlproperty Transition QtQuick.Controls::StackView::replaceEnter This property holds the transition that is applied to the item that enters the stack when another item is replaced by it. @@ -833,7 +833,7 @@ void QQuickStackView::setReplaceEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition Qt.labs.controls::StackView::replaceExit + \qmlproperty Transition QtQuick.Controls::StackView::replaceExit This property holds the transition that is applied to the item that exits the stack when it is replaced by another item. @@ -942,7 +942,7 @@ QQuickStackAttached::~QQuickStackAttached() } /*! - \qmlattachedproperty int Qt.labs.controls::StackView::index + \qmlattachedproperty int QtQuick.Controls::StackView::index \readonly This attached property holds the stack index of the item it's @@ -955,7 +955,7 @@ int QQuickStackAttached::index() const } /*! - \qmlattachedproperty StackView Qt.labs.controls::StackView::view + \qmlattachedproperty StackView QtQuick.Controls::StackView::view \readonly This attached property holds the stack view of the item it's @@ -968,7 +968,7 @@ QQuickStackView *QQuickStackAttached::view() const } /*! - \qmlattachedproperty enumeration Qt.labs.controls::StackView::status + \qmlattachedproperty enumeration QtQuick.Controls::StackView::status \readonly This attached property holds the stack status of the item it's diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index ebc5a5f3..13f64b75 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \qmltype SwipeDelegate \inherits ItemDelegate \instantiates QQuickSwipeDelegate - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \brief A swipable item delegate. SwipeDelegate presents a view item that can be swiped left or right to @@ -703,15 +703,15 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) : } /*! - \qmlpropertygroup Qt.labs.controls::SwipeDelegate::exposure - \qmlproperty real Qt.labs.controls::SwipeDelegate::exposure.position - \qmlproperty bool Qt.labs.controls::SwipeDelegate::exposure.active - \qmlproperty Component Qt.labs.controls::SwipeDelegate::exposure.left - \qmlproperty Component Qt.labs.controls::SwipeDelegate::exposure.behind - \qmlproperty Component Qt.labs.controls::SwipeDelegate::exposure.right - \qmlproperty Item Qt.labs.controls::SwipeDelegate::exposure.leftItem - \qmlproperty Item Qt.labs.controls::SwipeDelegate::exposure.behindItem - \qmlproperty Item Qt.labs.controls::SwipeDelegate::exposure.rightItem + \qmlpropertygroup QtQuick.Controls::SwipeDelegate::exposure + \qmlproperty real QtQuick.Controls::SwipeDelegate::exposure.position + \qmlproperty bool QtQuick.Controls::SwipeDelegate::exposure.active + \qmlproperty Component QtQuick.Controls::SwipeDelegate::exposure.left + \qmlproperty Component QtQuick.Controls::SwipeDelegate::exposure.behind + \qmlproperty Component QtQuick.Controls::SwipeDelegate::exposure.right + \qmlproperty Item QtQuick.Controls::SwipeDelegate::exposure.leftItem + \qmlproperty Item QtQuick.Controls::SwipeDelegate::exposure.behindItem + \qmlproperty Item QtQuick.Controls::SwipeDelegate::exposure.rightItem \table \header diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index 56a6a277..3b0442a9 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype SwipeView \inherits Container \instantiates QQuickSwipeView - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers \brief Enables the user to navigate pages by swiping sideways. @@ -148,7 +148,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item) } /*! - \qmlattachedproperty int Qt.labs.controls::SwipeView::index + \qmlattachedproperty int QtQuick.Controls::SwipeView::index \readonly This attached property holds the index of each child item in the SwipeView. @@ -157,7 +157,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item) */ /*! - \qmlattachedproperty bool Qt.labs.controls::SwipeView::isCurrentItem + \qmlattachedproperty bool QtQuick.Controls::SwipeView::isCurrentItem \readonly This attached property is \c true if this child is the current item. @@ -166,7 +166,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item) */ /*! - \qmlattachedproperty SwipeView Qt.labs.controls::SwipeView::view + \qmlattachedproperty SwipeView QtQuick.Controls::SwipeView::view \readonly This attached property holds the view that manages this child item. diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp index b68f4833..158fe2fa 100644 --- a/src/quicktemplates2/qquickswitch.cpp +++ b/src/quicktemplates2/qquickswitch.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype Switch \inherits AbstractButton \instantiates QQuickSwitch - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-buttons \brief An option button that can be toggled on or off. @@ -176,7 +176,7 @@ QQuickSwitch::QQuickSwitch(QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::Switch::position + \qmlproperty real QtQuick.Controls::Switch::position \readonly \input includes/qquickswitch.qdocinc position @@ -200,7 +200,7 @@ void QQuickSwitch::setPosition(qreal position) } /*! - \qmlproperty real Qt.labs.controls::Switch::visualPosition + \qmlproperty real QtQuick.Controls::Switch::visualPosition \readonly \input includes/qquickswitch.qdocinc visualPosition diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp index 3975fe13..2a5c0f8c 100644 --- a/src/quicktemplates2/qquickswitchdelegate.cpp +++ b/src/quicktemplates2/qquickswitchdelegate.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE \qmltype SwitchDelegate \inherits ItemDelegate \instantiates QQuickSwitchDelegate - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-delegates \brief An item delegate that can be toggled on or off. @@ -111,7 +111,7 @@ QQuickSwitchDelegate::QQuickSwitchDelegate(QQuickItem *parent) : } /*! - \qmlproperty real Qt.labs.controls::SwitchDelegate::position + \qmlproperty real QtQuick.Controls::SwitchDelegate::position \readonly \input includes/qquickswitch.qdocinc position @@ -135,7 +135,7 @@ void QQuickSwitchDelegate::setPosition(qreal position) } /*! - \qmlproperty real Qt.labs.controls::SwitchDelegate::visualPosition + \qmlproperty real QtQuick.Controls::SwitchDelegate::visualPosition \readonly \input includes/qquickswitch.qdocinc visualPosition diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index 031ea1eb..2a1422b5 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE \qmltype TabBar \inherits Container \instantiates QQuickTabBar - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers \brief A bar with icons allowing to switch between different views or subtasks. @@ -126,7 +126,7 @@ QQuickTabBar::QQuickTabBar(QQuickItem *parent) : } /*! - \qmlproperty enumeration Qt.labs.controls::TabBar::position + \qmlproperty enumeration QtQuick.Controls::TabBar::position This property holds the position of the tab bar. diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp index a3f89ab2..0bbf1757 100644 --- a/src/quicktemplates2/qquicktabbutton.cpp +++ b/src/quicktemplates2/qquicktabbutton.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype TabButton \inherits AbstractButton \instantiates QQuickTabButton - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-navigation \brief A tab button control that can be found on a TabBar. diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 9e157d52..35085416 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \qmltype TextArea \inherits TextEdit \instantiates QQuickTextArea - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief A multi line text input control. @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal Qt.labs.controls::TextArea::pressAndHold(MouseEvent mouse) + \qmlsignal QtQuick.Controls::TextArea::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 @@ -228,7 +228,7 @@ void QQuickTextArea::setFont(const QFont &font) } /*! - \qmlproperty Item Qt.labs.controls::TextArea::background + \qmlproperty Item QtQuick.Controls::TextArea::background This property holds the background item. @@ -263,7 +263,7 @@ void QQuickTextArea::setBackground(QQuickItem *background) } /*! - \qmlproperty string Qt.labs.controls::TextArea::placeholderText + \qmlproperty string QtQuick.Controls::TextArea::placeholderText This property holds the short hint that is displayed in the text area before the user enters a value. @@ -289,7 +289,7 @@ void QQuickTextArea::setPlaceholderText(const QString &text) } /*! - \qmlproperty enumeration Qt.labs.controls::TextArea::focusReason + \qmlproperty enumeration QtQuick.Controls::TextArea::focusReason This property holds the reason of the last focus change. diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 48b7b67f..e20c2c60 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \qmltype TextField \inherits TextInput \instantiates QQuickTextField - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief A single line text input control. @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal Qt.labs.controls::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 @@ -253,7 +253,7 @@ void QQuickTextField::setFont(const QFont &font) } /*! - \qmlproperty Item Qt.labs.controls::TextField::background + \qmlproperty Item QtQuick.Controls::TextField::background This property holds the background item. @@ -288,7 +288,7 @@ void QQuickTextField::setBackground(QQuickItem *background) } /*! - \qmlproperty string Qt.labs.controls::TextField::placeholderText + \qmlproperty string QtQuick.Controls::TextField::placeholderText This property holds the hint that is displayed in the TextField before the user enters text. @@ -314,7 +314,7 @@ void QQuickTextField::setPlaceholderText(const QString &text) } /*! - \qmlproperty enumeration Qt.labs.controls::TextField::focusReason + \qmlproperty enumeration QtQuick.Controls::TextField::focusReason This property holds the reason of the last focus change. diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp index 8239b73e..0de0738d 100644 --- a/src/quicktemplates2/qquicktoolbar.cpp +++ b/src/quicktemplates2/qquicktoolbar.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype ToolBar \inherits Frame \instantiates QQuickToolBar - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers \brief A container with context-sensitive controls. @@ -106,7 +106,7 @@ QQuickToolBar::QQuickToolBar(QQuickItem *parent) : } /*! - \qmlproperty enumeration Qt.labs.controls::ToolBar::position + \qmlproperty enumeration QtQuick.Controls::ToolBar::position This property holds the position of the toolbar. diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp index 6b2179fc..692f2370 100644 --- a/src/quicktemplates2/qquicktoolbutton.cpp +++ b/src/quicktemplates2/qquicktoolbutton.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype ToolButton \inherits Button \instantiates QQuickToolButton - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-buttons \brief A button with a layout suitable for a ToolBar. diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index dadbc401..12d2ecc9 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \qmltype ToolTip \inherits Popup \instantiates QQuickToolTip - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-popups \brief Provides tool tips for any control. @@ -250,7 +250,7 @@ QQuickToolTip::QQuickToolTip(QQuickItem *parent) : } /*! - \qmlproperty string Qt.labs.controls::ToolTip::text + \qmlproperty string QtQuick.Controls::ToolTip::text This property holds the text shown on the tool tip. */ @@ -271,7 +271,7 @@ void QQuickToolTip::setText(const QString &text) } /*! - \qmlproperty int Qt.labs.controls::ToolTip::delay + \qmlproperty int QtQuick.Controls::ToolTip::delay This property holds the delay (milliseconds) after which the tool tip is shown. A tooltip with a negative delay is shown immediately. The default @@ -294,7 +294,7 @@ void QQuickToolTip::setDelay(int delay) } /*! - \qmlproperty int Qt.labs.controls::ToolTip::timeout + \qmlproperty int QtQuick.Controls::ToolTip::timeout This property holds the timeout (milliseconds) after which the tool tip is hidden. A tooltip with a negative timeout does not hide automatically. The @@ -420,7 +420,7 @@ QQuickToolTipAttached::QQuickToolTipAttached(QQuickItem *item) : } /*! - \qmlattachedproperty string Qt.labs.controls::ToolTip::text + \qmlattachedproperty string QtQuick.Controls::ToolTip::text This attached property holds the text of the shared tool tip instance. The property can be attached to any item. @@ -445,7 +445,7 @@ void QQuickToolTipAttached::setText(const QString &text) } /*! - \qmlattachedproperty int Qt.labs.controls::ToolTip::delay + \qmlattachedproperty int QtQuick.Controls::ToolTip::delay This attached property holds the delay (milliseconds) of the shared tool tip. The property can be attached to any item. @@ -467,7 +467,7 @@ void QQuickToolTipAttached::setDelay(int delay) } /*! - \qmlattachedproperty int Qt.labs.controls::ToolTip::timeout + \qmlattachedproperty int QtQuick.Controls::ToolTip::timeout This attached property holds the timeout (milliseconds) of the shared tool tip. The property can be attached to any item. @@ -489,7 +489,7 @@ void QQuickToolTipAttached::setTimeout(int timeout) } /*! - \qmlattachedproperty bool Qt.labs.controls::ToolTip::visible + \qmlattachedproperty bool QtQuick.Controls::ToolTip::visible This attached property holds whether the shared tool tip is visible. The property can be attached to any item. @@ -514,7 +514,7 @@ void QQuickToolTipAttached::setVisible(bool visible) } /*! - \qmlattachedproperty ToolTip Qt.labs.controls::ToolTip::toolTip + \qmlattachedproperty ToolTip QtQuick.Controls::ToolTip::toolTip This attached property holds the shared tool tip instance. The property can be attached to any item. @@ -526,7 +526,7 @@ QQuickToolTip *QQuickToolTipAttached::toolTip() const } /*! - \qmlattachedmethod void Qt.labs.controls::ToolTip::show(string text, int timeout = -1) + \qmlattachedmethod void QtQuick.Controls::ToolTip::show(string text, int timeout = -1) This attached method shows the shared tooltip with \a text and \a timeout (milliseconds). The method can be attached to any item. @@ -548,7 +548,7 @@ void QQuickToolTipAttached::show(const QString &text, int ms) } /*! - \qmlattachedmethod void Qt.labs.controls::ToolTip::hide() + \qmlattachedmethod void QtQuick.Controls::ToolTip::hide() This attached method hides the shared tooltip. The method can be attached to any item. */ diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index 0fa1a6d6..d3512188 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype Tumbler \inherits Control \instantiates QQuickTumbler - \inqmlmodule Qt.labs.controls + \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-input \brief A spinnable wheel of items that can be selected. @@ -200,7 +200,7 @@ QQuickTumbler::~QQuickTumbler() } /*! - \qmlproperty variant Qt.labs.controls::Tumbler::model + \qmlproperty variant QtQuick.Controls::Tumbler::model This property holds the model that provides data for this tumbler. */ @@ -221,7 +221,7 @@ void QQuickTumbler::setModel(const QVariant &model) } /*! - \qmlproperty int Qt.labs.controls::Tumbler::count + \qmlproperty int QtQuick.Controls::Tumbler::count \readonly This property holds the number of items in the model. @@ -233,7 +233,7 @@ int QQuickTumbler::count() const } /*! - \qmlproperty int Qt.labs.controls::Tumbler::currentIndex + \qmlproperty int QtQuick.Controls::Tumbler::currentIndex This property holds the index of the current item. */ @@ -250,7 +250,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex) } /*! - \qmlproperty Item Qt.labs.controls::Tumbler::currentItem + \qmlproperty Item QtQuick.Controls::Tumbler::currentItem \readonly This property holds the item at the current index. @@ -262,7 +262,7 @@ QQuickItem *QQuickTumbler::currentItem() const } /*! - \qmlproperty component Qt.labs.controls::Tumbler::delegate + \qmlproperty component QtQuick.Controls::Tumbler::delegate This property holds the delegate used to display each item. */ @@ -283,7 +283,7 @@ void QQuickTumbler::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty int Qt.labs.controls::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. |