diff options
Diffstat (limited to 'src/quicktemplates')
63 files changed, 241 insertions, 241 deletions
diff --git a/src/quicktemplates/doc/src/qtquicktemplates2-index.qdoc b/src/quicktemplates/doc/src/qtquicktemplates-index.qdoc index 49d4c96b44..49d4c96b44 100644 --- a/src/quicktemplates/doc/src/qtquicktemplates2-index.qdoc +++ b/src/quicktemplates/doc/src/qtquicktemplates-index.qdoc diff --git a/src/quicktemplates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/quicktemplates/doc/src/qtquicktemplates-qmltypes.qdoc index c2c183ae72..c2c183ae72 100644 --- a/src/quicktemplates/doc/src/qtquicktemplates2-qmltypes.qdoc +++ b/src/quicktemplates/doc/src/qtquicktemplates-qmltypes.qdoc diff --git a/src/quicktemplates/qquickabstractbutton.cpp b/src/quicktemplates/qquickabstractbutton.cpp index 5c2ecd2923..1b2bee07c9 100644 --- a/src/quicktemplates/qquickabstractbutton.cpp +++ b/src/quicktemplates/qquickabstractbutton.cpp @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickAbstractButton \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Abstract base type providing functionality common to buttons. AbstractButton provides the interface for controls with button-like @@ -806,10 +806,10 @@ void QQuickAbstractButton::setIcon(const QQuickIcon &icon) \table \header \li Display \li Result - \row \li \c AbstractButton.IconOnly \li \image qtquickcontrols2-button-icononly.png - \row \li \c AbstractButton.TextOnly \li \image qtquickcontrols2-button-textonly.png - \row \li \c AbstractButton.TextBesideIcon \li \image qtquickcontrols2-button-textbesideicon.png - \row \li \c AbstractButton.TextUnderIcon \li \image qtquickcontrols2-button-textundericon.png + \row \li \c AbstractButton.IconOnly \li \image qtquickcontrols-button-icononly.png + \row \li \c AbstractButton.TextOnly \li \image qtquickcontrols-button-textonly.png + \row \li \c AbstractButton.TextBesideIcon \li \image qtquickcontrols-button-textbesideicon.png + \row \li \c AbstractButton.TextUnderIcon \li \image qtquickcontrols-button-textundericon.png \endtable \sa {Control::}{spacing}, {Control::}{padding} diff --git a/src/quicktemplates/qquickaction.cpp b/src/quicktemplates/qquickaction.cpp index 2ff5fd4a48..466501226d 100644 --- a/src/quicktemplates/qquickaction.cpp +++ b/src/quicktemplates/qquickaction.cpp @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE \l triggered by the user via menu items, toolbar buttons, or keyboard shortcuts. A \l checkable Action toggles its \l checked state when triggered. - \snippet qtquickcontrols2-action.qml action + \snippet qtquickcontrols-action.qml action Action is commonly used to implement application commands that can be invoked via menu items, toolbar buttons, and keyboard shortcuts. Since the user expects @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE example, when declaring buttons and menu items in \c .ui.qml files, actions can be declared elsewhere and assigned from the outside. - \snippet qtquickcontrols2-action.qml toolbutton + \snippet qtquickcontrols-action.qml toolbutton When an action is paired with buttons and menu items, the \c enabled, \c checkable, and \c checked states are synced automatically. For example, in a word processor, @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE default. An action-specific \c text or \c icon can be overridden for a specific control by specifying \c text or \c icon directly on the control. - \snippet qtquickcontrols2-action.qml menuitem + \snippet qtquickcontrols-action.qml menuitem Since Action presents a user interface action, it is intended to be assigned to a \l MenuItem, \l ToolButton, or any other control that inherits \l AbstractButton. diff --git a/src/quicktemplates/qquickapplicationwindow.cpp b/src/quicktemplates/qquickapplicationwindow.cpp index b0997aff0b..95dca6561e 100644 --- a/src/quicktemplates/qquickapplicationwindow.cpp +++ b/src/quicktemplates/qquickapplicationwindow.cpp @@ -27,8 +27,8 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickApplicationWindow \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Styled top-level window with support for a header and footer. ApplicationWindow is a \l Window which makes it convenient to add @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE and run it by using \l QQmlApplicationEngine. In this way you can control the window's properties, appearance and layout from QML. - \image qtquickcontrols2-applicationwindow-wireframe.png + \image qtquickcontrols-applicationwindow-wireframe.png \qml import QtQuick.Controls 2.12 diff --git a/src/quicktemplates/qquickbusyindicator.cpp b/src/quicktemplates/qquickbusyindicator.cpp index bd51a33096..f8811a47c5 100644 --- a/src/quicktemplates/qquickbusyindicator.cpp +++ b/src/quicktemplates/qquickbusyindicator.cpp @@ -12,10 +12,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickBusyIndicator \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-indicators + \ingroup qtquickcontrols-indicators \brief Indicates background activity, for example, while content is being loaded. - \image qtquickcontrols2-busyindicator.gif + \image qtquickcontrols-busyindicator.gif The busy indicator should be used to indicate activity while content is being loaded or the UI is blocked waiting for a resource to become available. diff --git a/src/quicktemplates/qquickbutton.cpp b/src/quicktemplates/qquickbutton.cpp index d7f514d1a1..5e9476c039 100644 --- a/src/quicktemplates/qquickbutton.cpp +++ b/src/quicktemplates/qquickbutton.cpp @@ -14,10 +14,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickButton \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Push-button that can be clicked to perform a command or answer a question. - \image qtquickcontrols2-button.gif + \image qtquickcontrols-button.gif Button presents a push-button control that can be pushed or clicked by the user. Buttons are normally used to perform an action, or to answer @@ -71,7 +71,7 @@ QFont QQuickButton::defaultFont() const This property holds whether the button is highlighted. - \image qtquickcontrols2-button-highlighted.gif + \image qtquickcontrols-button-highlighted.gif A button can be highlighted in order to draw the user's attention towards it. It has no effect on keyboard interaction. @@ -99,7 +99,7 @@ void QQuickButton::setHighlighted(bool highlighted) This property holds whether the button is flat. - \image qtquickcontrols2-button-flat.gif + \image qtquickcontrols-button-flat.gif A flat button typically does not draw a background unless it is pressed or checked. diff --git a/src/quicktemplates/qquickcalendarmodel.cpp b/src/quicktemplates/qquickcalendarmodel.cpp index 62d54b296c..0bac0969e0 100644 --- a/src/quicktemplates/qquickcalendarmodel.cpp +++ b/src/quicktemplates/qquickcalendarmodel.cpp @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE instances. It is typically used as a model for a ListView that uses MonthGrid as a delegate. - \snippet qtquickcontrols2-calendarmodel.qml 1 + \snippet qtquickcontrols-calendarmodel.qml 1 In addition to the \c index property, a list of model data roles are available in the context of each delegate: diff --git a/src/quicktemplates/qquickcheckbox.cpp b/src/quicktemplates/qquickcheckbox.cpp index 1c6dc11eea..21038ccdb9 100644 --- a/src/quicktemplates/qquickcheckbox.cpp +++ b/src/quicktemplates/qquickcheckbox.cpp @@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickCheckBox \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Check button that can be toggled on or off. - \image qtquickcontrols2-checkbox.gif + \image qtquickcontrols-checkbox.gif CheckBox presents an option button that can be toggled on (checked) or off (unchecked). Check boxes are typically used to select one or more @@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE Hierarchical checkbox groups can be managed with a non-exclusive \l ButtonGroup. - \image qtquickcontrols2-checkbox-group.png + \image qtquickcontrols-checkbox-group.png The following example illustrates how the combined check state of children can be bound to the check state of the parent checkbox: - \snippet qtquickcontrols2-checkbox-group.qml 1 + \snippet qtquickcontrols-checkbox-group.qml 1 \sa {Customizing CheckBox}, ButtonGroup, {Button Controls} */ @@ -98,7 +98,7 @@ QQuickCheckBox::QQuickCheckBox(QQuickItem *parent) In the animation below, the first checkbox is tri-state: - \image qtquickcontrols2-checkbox-tristate.gif + \image qtquickcontrols-checkbox-tristate.gif The default is \c false, i.e., the checkbox has only two states. */ diff --git a/src/quicktemplates/qquickcheckdelegate.cpp b/src/quicktemplates/qquickcheckdelegate.cpp index 18ed8e747c..a3c4a1b23c 100644 --- a/src/quicktemplates/qquickcheckdelegate.cpp +++ b/src/quicktemplates/qquickcheckdelegate.cpp @@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickCheckDelegate \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-delegates + \ingroup qtquickcontrols-delegates \brief Item delegate with a check indicator that can be toggled on or off. - \image qtquickcontrols2-checkdelegate.gif + \image qtquickcontrols-checkdelegate.gif CheckDelegate presents an item delegate that can be toggled on (checked) or off (unchecked). Check delegates are typically used to select one or more @@ -85,7 +85,7 @@ QQuickCheckDelegate::QQuickCheckDelegate(QQuickItem *parent) In the animation below, the first checkdelegate is tri-state: - \image qtquickcontrols2-checkdelegate-tristate.gif + \image qtquickcontrols-checkdelegate-tristate.gif The default is \c false, i.e., the delegate has only two states. */ diff --git a/src/quicktemplates/qquickcombobox.cpp b/src/quicktemplates/qquickcombobox.cpp index f90cf0254f..d421dd4610 100644 --- a/src/quicktemplates/qquickcombobox.cpp +++ b/src/quicktemplates/qquickcombobox.cpp @@ -35,11 +35,11 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu //! \instantiates QQuickComboBox \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-input + \ingroup qtquickcontrols-focusscopes \brief Combined button and popup list for selecting options. - \image qtquickcontrols2-combobox.gif + \image qtquickcontrols-combobox.gif ComboBox is a combined button and popup list. It provides a means of presenting a list of options to the user in a way that takes up the @@ -63,7 +63,7 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu The following example demonstrates appending content to an editable combo box by reacting to the \l accepted signal. - \snippet qtquickcontrols2-combobox-accepted.qml combobox + \snippet qtquickcontrols-combobox-accepted.qml combobox \section1 ComboBox's Popup @@ -71,12 +71,12 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu event is propagated to items lower in the stacking order. To prevent the popup from closing, set its \l {Popup::}{closePolicy}: - \snippet qtquickcontrols2-combobox-popup.qml closePolicy + \snippet qtquickcontrols-combobox-popup.qml closePolicy To prevent event propagation, set its \l {Popup::}{modal} property to \c true: - \snippet qtquickcontrols2-combobox-popup.qml modal + \snippet qtquickcontrols-combobox-popup.qml modal \section1 ComboBox Model Roles @@ -96,7 +96,7 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu For example: - \snippet qtquickcontrols2-combobox-valuerole.qml file + \snippet qtquickcontrols-combobox-valuerole.qml file \note If ComboBox is assigned a data model that has multiple named roles, but \l textRole is not defined, ComboBox is unable to visualize it and throws a @@ -140,7 +140,7 @@ Q_LOGGING_CATEGORY(lcCalculateWidestTextWidth, "qt.quick.controls.combobox.calcu You can handle this signal in order to add the newly entered item to the model, for example: - \snippet qtquickcontrols2-combobox-accepted.qml combobox + \snippet qtquickcontrols-combobox-accepted.qml combobox Before the signal is emitted, a check is done to see if the string exists in the model. If it does, \l currentIndex will be set to its index, @@ -1805,7 +1805,7 @@ void QQuickComboBox::setImplicitContentWidthPolicy(QQuickComboBox::ImplicitConte \include qquickcombobox.qdocinc functions-after-component-completion For example: - \snippet qtquickcontrols2-combobox-textat.qml textat + \snippet qtquickcontrols-combobox-textat.qml textat \sa textRole */ @@ -1838,7 +1838,7 @@ QString QQuickComboBox::textAt(int index) const \include qquickcombobox.qdocinc functions-after-component-completion For example: - \snippet qtquickcontrols2-combobox-find.qml find + \snippet qtquickcontrols-combobox-find.qml find \sa textRole */ diff --git a/src/quicktemplates/qquickcontainer.cpp b/src/quicktemplates/qquickcontainer.cpp index 45bdfcc5b3..eefc9161e9 100644 --- a/src/quicktemplates/qquickcontainer.cpp +++ b/src/quicktemplates/qquickcontainer.cpp @@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickContainer \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols-containers \brief Abstract base type providing functionality common to containers. Container is the base type of container-like user interface controls that diff --git a/src/quicktemplates/qquickcontrol.cpp b/src/quicktemplates/qquickcontrol.cpp index 0f6d02ccbd..cff2a3781e 100644 --- a/src/quicktemplates/qquickcontrol.cpp +++ b/src/quicktemplates/qquickcontrol.cpp @@ -42,7 +42,7 @@ Q_LOGGING_CATEGORY(lcItemManagement, "qt.quick.controls.control.itemmanagement") The following diagram illustrates the layout of a typical control: - \image qtquickcontrols2-control.png + \image qtquickcontrols-control.png The \l {Item::}{implicitWidth} and \l {Item::}{implicitHeight} of a control are typically based on the implicit sizes of the background and the content diff --git a/src/quicktemplates/qquickdayofweekrow.cpp b/src/quicktemplates/qquickdayofweekrow.cpp index 032ea4a069..e14f9962c8 100644 --- a/src/quicktemplates/qquickdayofweekrow.cpp +++ b/src/quicktemplates/qquickdayofweekrow.cpp @@ -18,15 +18,15 @@ QT_BEGIN_NAMESPACE DayOfWeekRow presents day of week names in a row. The names of the days are ordered and formatted using the specified \l {Control::locale}{locale}. - \image qtquickcontrols2-dayofweekrow.png - \snippet qtquickcontrols2-dayofweekrow.qml 1 + \image qtquickcontrols-dayofweekrow.png + \snippet qtquickcontrols-dayofweekrow.qml 1 DayOfWeekRow can be used as a standalone control, but it is most often used in conjunction with MonthGrid. Regardless of the use case, positioning of the row is left to the user. - \image qtquickcontrols2-dayofweekrow-layout.png - \snippet qtquickcontrols2-dayofweekrow-layout.qml 1 + \image qtquickcontrols-dayofweekrow-layout.png + \snippet qtquickcontrols-dayofweekrow-layout.qml 1 The visual appearance of DayOfWeekRow can be changed by implementing a \l {delegate}{custom delegate}. diff --git a/src/quicktemplates/qquickdelaybutton.cpp b/src/quicktemplates/qquickdelaybutton.cpp index ad83313fed..07ba127bac 100644 --- a/src/quicktemplates/qquickdelaybutton.cpp +++ b/src/quicktemplates/qquickdelaybutton.cpp @@ -16,10 +16,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickDelayButton \inqmlmodule QtQuick.Controls \since 5.9 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Check button that triggers when held down long enough. - \image qtquickcontrols2-delaybutton.gif + \image qtquickcontrols-delaybutton.gif DelayButton is a checkable button that incorporates a delay before the button becomes \l {AbstractButton::}{checked} and the \l activated() diff --git a/src/quicktemplates/qquickdial.cpp b/src/quicktemplates/qquickdial.cpp index dd1e6b5bfe..1e3698de9f 100644 --- a/src/quicktemplates/qquickdial.cpp +++ b/src/quicktemplates/qquickdial.cpp @@ -18,14 +18,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickDial \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input + \ingroup qtquickcontrols-input \brief Circular dial that is rotated to set a value. The Dial is similar to a traditional dial knob that is found on devices such as stereos or industrial equipment. It allows the user to specify a value within a range. - \image qtquickcontrols2-dial-no-wrap.gif + \image qtquickcontrols-dial-no-wrap.gif The value of the dial is set with the \l value property. The range is set with the \l from and \l to properties. To enable or disable wrapping, @@ -535,12 +535,12 @@ void QQuickDial::setInputMode(QQuickDial::InputMode mode) the \l to position will result in the handle being positioned at the \l from position, and vice versa: - \image qtquickcontrols2-dial-wrap.gif + \image qtquickcontrols-dial-wrap.gif When this property is \c false, it's not possible to drag the dial across the from and to values. - \image qtquickcontrols2-dial-no-wrap.gif + \image qtquickcontrols-dial-no-wrap.gif The default value is \c false. */ diff --git a/src/quicktemplates/qquickdialog.cpp b/src/quicktemplates/qquickdialog.cpp index 94e35d2fb1..8bf180989e 100644 --- a/src/quicktemplates/qquickdialog.cpp +++ b/src/quicktemplates/qquickdialog.cpp @@ -14,8 +14,8 @@ QT_BEGIN_NAMESPACE \inherits Popup //! \instantiates QQuickDialog \inqmlmodule QtQuick.Controls - \ingroup qtquickcontrols2-dialogs - \ingroup qtquickcontrols2-popups + \ingroup qtquickcontrols-dialogs + \ingroup qtquickcontrols-popups \brief Popup dialog with standard buttons and a title, used for short-term interaction with the user. \since 5.8 @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE with the user. Similarly to \l ApplicationWindow and \l Page, Dialog is organized into three sections: \l header, \l {Popup::}{contentItem}, and \l footer. - \image qtquickcontrols2-page-wireframe.png + \image qtquickcontrols-page-wireframe.png By default, Dialogs have \l {QQuickItem::}{focus}. @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE \l {DialogButtonBox::}{accepted()} and \l {DialogButtonBox::}{rejected()} signals of the button box are connected to the respective signals in Dialog. - \snippet qtquickcontrols2-dialog.qml 1 + \snippet qtquickcontrols-dialog.qml 1 \section1 Modal Dialogs @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE interacting with the dialog and close it before they can access any other content in the same window. - \snippet qtquickcontrols2-dialog-modal.qml 1 + \snippet qtquickcontrols-dialog-modal.qml 1 \section1 Modeless Dialogs @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE is allowed to interact with both the dialog and the other content in the same window. - \snippet qtquickcontrols2-dialog-modeless.qml 1 + \snippet qtquickcontrols-dialog-modeless.qml 1 \sa DialogButtonBox, {Popup Controls} */ @@ -323,7 +323,7 @@ void QQuickDialog::setFooter(QQuickItem *footer) This property holds a combination of standard buttons that are used by the dialog. - \snippet qtquickcontrols2-dialog.qml 1 + \snippet qtquickcontrols-dialog.qml 1 The buttons will be positioned in the appropriate order for the user's platform. diff --git a/src/quicktemplates/qquickdialogbuttonbox.cpp b/src/quicktemplates/qquickdialogbuttonbox.cpp index 9b39f9e1ab..989c9b4506 100644 --- a/src/quicktemplates/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates/qquickdialogbuttonbox.cpp @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE \inherits Container //! \instantiates QQuickDialogButtonBox \inqmlmodule QtQuick.Controls - \ingroup qtquickcontrols2-dialogs + \ingroup qtquickcontrols-dialogs \brief A button box used in dialogs. \since 5.8 @@ -53,13 +53,13 @@ QT_BEGIN_NAMESPACE the standard buttons (e.g. \uicontrol OK, \uicontrol Cancel, \uicontrol Save) and let the button box setup the buttons. - \image qtquickcontrols2-dialogbuttonbox.png + \image qtquickcontrols-dialogbuttonbox.png - \snippet qtquickcontrols2-dialogbuttonbox.qml 1 + \snippet qtquickcontrols-dialogbuttonbox.qml 1 Alternatively, buttons and their roles can be specified by hand: - \snippet qtquickcontrols2-dialogbuttonbox-attached.qml 1 + \snippet qtquickcontrols-dialogbuttonbox-attached.qml 1 You can also mix and match normal buttons and standard buttons. @@ -546,7 +546,7 @@ void QQuickDialogButtonBox::resetAlignment() This property holds a combination of standard buttons that are used by the button box. - \snippet qtquickcontrols2-dialogbuttonbox.qml 1 + \snippet qtquickcontrols-dialogbuttonbox.qml 1 The buttons will be positioned in the appropriate order for the user's platform. @@ -808,7 +808,7 @@ QQuickDialogButtonBox *QQuickDialogButtonBoxAttached::buttonBox() const This attached property holds the role of each button in a button box. - \snippet qtquickcontrols2-dialogbuttonbox-attached.qml 1 + \snippet qtquickcontrols-dialogbuttonbox-attached.qml 1 Available values: \value DialogButtonBox.InvalidRole The button is invalid. diff --git a/src/quicktemplates/qquickdrawer.cpp b/src/quicktemplates/qquickdrawer.cpp index caef208545..122af0b379 100644 --- a/src/quicktemplates/qquickdrawer.cpp +++ b/src/quicktemplates/qquickdrawer.cpp @@ -21,14 +21,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickDrawer \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-navigation - \ingroup qtquickcontrols2-popups + \ingroup qtquickcontrols-navigation + \ingroup qtquickcontrols-popups \brief Side panel that can be opened and closed using a swipe gesture. Drawer provides a swipe-based side panel, similar to those often used in touch interfaces to provide a central location for navigation. - \image qtquickcontrols2-drawer.gif + \image qtquickcontrols-drawer.gif Drawer can be positioned at any of the four edges of the content item. The drawer above is positioned against the left edge of the window. The diff --git a/src/quicktemplates/qquickframe.cpp b/src/quicktemplates/qquickframe.cpp index 8fb516a283..8b7a766eff 100644 --- a/src/quicktemplates/qquickframe.cpp +++ b/src/quicktemplates/qquickframe.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickFrame \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols-containers \brief Visual frame for a logical group of controls. Frame is used to layout a logical group of controls together within a @@ -28,9 +28,9 @@ QT_BEGIN_NAMESPACE implicit size of its contained item. This makes it particularly suitable for use together with layouts. - \image qtquickcontrols2-frame.png + \image qtquickcontrols-frame.png - \snippet qtquickcontrols2-frame.qml 1 + \snippet qtquickcontrols-frame.qml 1 \sa {Customizing Frame}, {Container Controls} */ diff --git a/src/quicktemplates/qquickgroupbox.cpp b/src/quicktemplates/qquickgroupbox.cpp index db319b9bab..0a19d2ed43 100644 --- a/src/quicktemplates/qquickgroupbox.cpp +++ b/src/quicktemplates/qquickgroupbox.cpp @@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickGroupBox \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols-containers \brief Visual frame and title for a logical group of controls. GroupBox is used to layout a logical group of controls together, within @@ -31,22 +31,22 @@ QT_BEGIN_NAMESPACE implicit size of its contained item. This makes it particularly suitable for use together with layouts. - \image qtquickcontrols2-groupbox.png + \image qtquickcontrols-groupbox.png - \snippet qtquickcontrols2-groupbox.qml 1 + \snippet qtquickcontrols-groupbox.qml 1 \section2 Checkable GroupBox Even though GroupBox has no built-in check box, it is straightforward to create a checkable GroupBox by pairing it with a CheckBox. - \image qtquickcontrols2-groupbox-checkable.png + \image qtquickcontrols-groupbox-checkable.png It is a common pattern to enable or disable the groupbox's children when its checkbox is toggled on or off, but it is up to the application to decide on the behavior of the checkbox. - \snippet qtquickcontrols2-groupbox-checkable.qml 1 + \snippet qtquickcontrols-groupbox-checkable.qml 1 \sa CheckBox, {Customizing GroupBox}, {Container Controls} */ diff --git a/src/quicktemplates/qquickheaderview.cpp b/src/quicktemplates/qquickheaderview.cpp index 69587c6485..7f04da8577 100644 --- a/src/quicktemplates/qquickheaderview.cpp +++ b/src/quicktemplates/qquickheaderview.cpp @@ -7,7 +7,7 @@ /*! \qmltype HorizontalHeaderView \inqmlmodule QtQuick.Controls - \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols-containers \inherits TableView \brief Provides a horizontal header view to accompany a \l TableView. @@ -15,7 +15,7 @@ To add a horizontal header to a TableView, bind the \l {HorizontalHeaderView::syncView} {syncView} property to the TableView: - \snippet qtquickcontrols2-headerview-simple.qml horizontal + \snippet qtquickcontrols-headerview-simple.qml horizontal The header displays data from the {syncView}'s model by default, but can also have its own model. If the model is a QAbstractTableModel, then @@ -26,7 +26,7 @@ /*! \qmltype VerticalHeaderView \inqmlmodule QtQuick.Controls - \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols-containers \inherits TableView \brief Provides a vertical header view to accompany a \l TableView. @@ -34,7 +34,7 @@ To add a vertical header to a TableView, bind the \l {VerticalHeaderView::syncView} {syncView} property to the TableView: - \snippet qtquickcontrols2-headerview-simple.qml vertical + \snippet qtquickcontrols-headerview-simple.qml vertical The header displays data from the {syncView}'s model by default, but can also have its own model. If the model is a QAbstractTableModel, then diff --git a/src/quicktemplates/qquickitemdelegate.cpp b/src/quicktemplates/qquickitemdelegate.cpp index d6b639d46c..7b0a1c12ad 100644 --- a/src/quicktemplates/qquickitemdelegate.cpp +++ b/src/quicktemplates/qquickitemdelegate.cpp @@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickItemDelegate \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-delegates + \ingroup qtquickcontrols-delegates \brief Basic item delegate that can be used in various views and controls. - \image qtquickcontrols2-itemdelegate.gif + \image qtquickcontrols-itemdelegate.gif ItemDelegate presents a standard view item. It can be used as a delegate in various views and controls, such as \l ListView and \l ComboBox. @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon}, and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. - \snippet qtquickcontrols2-itemdelegate.qml 1 + \snippet qtquickcontrols-itemdelegate.qml 1 \sa {Customizing ItemDelegate}, {Delegate Controls} */ diff --git a/src/quicktemplates/qquicklabel.cpp b/src/quicktemplates/qquicklabel.cpp index 088207af6a..116884a46f 100644 --- a/src/quicktemplates/qquicklabel.cpp +++ b/src/quicktemplates/qquicklabel.cpp @@ -29,9 +29,9 @@ QT_BEGIN_NAMESPACE inheritance. The default colors and font are style specific. Label can also have a visual \l background item. - \image qtquickcontrols2-label.png + \image qtquickcontrols-label.png - \snippet qtquickcontrols2-label.qml 1 + \snippet qtquickcontrols-label.qml 1 You can use the properties of \l Text to change the appearance of the text as desired: diff --git a/src/quicktemplates/qquickmenu.cpp b/src/quicktemplates/qquickmenu.cpp index cc0cc36675..0324490a1b 100644 --- a/src/quicktemplates/qquickmenu.cpp +++ b/src/quicktemplates/qquickmenu.cpp @@ -41,11 +41,11 @@ static const int SUBMENU_DELAY = 225; //! \instantiates QQuickMenu \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-menus - \ingroup qtquickcontrols2-popups + \ingroup qtquickcontrols-menus + \ingroup qtquickcontrols-popups \brief Menu popup that can be used as a context menu or popup menu. - \image qtquickcontrols2-menu.png + \image qtquickcontrols-menu.png Menu has two main use cases: \list @@ -154,7 +154,7 @@ static const int SUBMENU_DELAY = 225; code shows how you can implement a "Recent Files" submenu, where the items come from a list of files stored in settings: - \snippet qtquickcontrols2-menu-instantiator.qml menu + \snippet qtquickcontrols-menu-instantiator.qml menu \sa {Customizing Menu}, MenuItem, {Menu Controls}, {Popup Controls} */ diff --git a/src/quicktemplates/qquickmenubar.cpp b/src/quicktemplates/qquickmenubar.cpp index 624347822c..3af5bdd6d3 100644 --- a/src/quicktemplates/qquickmenubar.cpp +++ b/src/quicktemplates/qquickmenubar.cpp @@ -22,16 +22,16 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickMenuBar \inqmlmodule QtQuick.Controls \since 5.10 - \ingroup qtquickcontrols2-menus - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-menus + \ingroup qtquickcontrols-focusscopes \brief Provides a window menu bar. - \image qtquickcontrols2-menubar.png + \image qtquickcontrols-menubar.png MenuBar consists of drop-down menus, and is normally located at the top edge of the window. - \quotefromfile qtquickcontrols2-menubar.qml + \quotefromfile qtquickcontrols-menubar.qml \skipuntil begin \printto skipfrom \skipuntil skipto diff --git a/src/quicktemplates/qquickmenubaritem.cpp b/src/quicktemplates/qquickmenubaritem.cpp index 6e78b74913..03e8c60f03 100644 --- a/src/quicktemplates/qquickmenubaritem.cpp +++ b/src/quicktemplates/qquickmenubaritem.cpp @@ -14,13 +14,13 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickMenuBarItem \inqmlmodule QtQuick.Controls \since 5.10 - \ingroup qtquickcontrols2-menus + \ingroup qtquickcontrols-menus \brief Presents a drop-down menu within a MenuBar. MenuBarItem presents a Menu within a MenuBar. The respective drop-down menu is shown when a MenuBarItem is \l triggered via keyboard, mouse, or touch. - \image qtquickcontrols2-menubar.png + \image qtquickcontrols-menubar.png MenuBarItem is used as a default \l {MenuBar::}{delegate} type for MenuBar. Notice that it is not necessary to declare MenuBarItem instances by hand when diff --git a/src/quicktemplates/qquickmenuitem.cpp b/src/quicktemplates/qquickmenuitem.cpp index 2632affe9b..c5b0ea2753 100644 --- a/src/quicktemplates/qquickmenuitem.cpp +++ b/src/quicktemplates/qquickmenuitem.cpp @@ -17,7 +17,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickMenuItem \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-menus + \ingroup qtquickcontrols-menus \brief Presents an item within a Menu. MenuItem is a convenience type that implements the AbstractButton API, diff --git a/src/quicktemplates/qquickmenuseparator.cpp b/src/quicktemplates/qquickmenuseparator.cpp index 12b985b744..d9aa770ca5 100644 --- a/src/quicktemplates/qquickmenuseparator.cpp +++ b/src/quicktemplates/qquickmenuseparator.cpp @@ -12,15 +12,15 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickMenuSeparator \inqmlmodule QtQuick.Controls \since 5.8 - \ingroup qtquickcontrols2-separators + \ingroup qtquickcontrols-separators \brief Separates a group of items in a menu from adjacent items. MenuSeparator is used to visually distinguish between groups of items in a menu by separating them with a line. - \image qtquickcontrols2-menuseparator.png + \image qtquickcontrols-menuseparator.png - \quotefromfile qtquickcontrols2-menuseparator-custom.qml + \quotefromfile qtquickcontrols-menuseparator-custom.qml \skipto import QtQuick \printuntil import QtQuick.Controls \skipto Menu diff --git a/src/quicktemplates/qquickmonthgrid.cpp b/src/quicktemplates/qquickmonthgrid.cpp index c7edc583bd..a470017676 100644 --- a/src/quicktemplates/qquickmonthgrid.cpp +++ b/src/quicktemplates/qquickmonthgrid.cpp @@ -21,15 +21,15 @@ QT_BEGIN_NAMESPACE calculated for a given \l month and \l year, using the specified \l {Control::locale}{locale}. - \image qtquickcontrols2-monthgrid.png - \snippet qtquickcontrols2-monthgrid.qml 1 + \image qtquickcontrols-monthgrid.png + \snippet qtquickcontrols-monthgrid.qml 1 MonthGrid can be used as a standalone control, but it is most often used in conjunction with DayOfWeekRow and WeekNumberColumn. Regardless of the use case, positioning of the grid is left to the user. - \image qtquickcontrols2-monthgrid-layout.png - \snippet qtquickcontrols2-monthgrid-layout.qml 1 + \image qtquickcontrols-monthgrid-layout.png + \snippet qtquickcontrols-monthgrid-layout.qml 1 The visual appearance of MonthGrid can be changed by implementing a \l {delegate}{custom delegate}. @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE To localize days, use \l {Locale::toString()}{Locale.toString()}. For example, to display day numbers in an Arabic locale: - \snippet qtquickcontrols2-monthgrid-localization.qml 1 + \snippet qtquickcontrols-monthgrid-localization.qml 1 \sa DayOfWeekRow, WeekNumberColumn, CalendarModel */ diff --git a/src/quicktemplates/qquickoverlay.cpp b/src/quicktemplates/qquickoverlay.cpp index 3b5e4afd1d..9f8393d7a1 100644 --- a/src/quicktemplates/qquickoverlay.cpp +++ b/src/quicktemplates/qquickoverlay.cpp @@ -679,7 +679,7 @@ QQuickOverlay *QQuickOverlayAttached::overlay() const For example, to change the color of the background dimming for a modal popup, the following code can be used: - \snippet qtquickcontrols2-overlay-modal.qml 1 + \snippet qtquickcontrols-overlay-modal.qml 1 \sa Popup::modal */ @@ -711,7 +711,7 @@ void QQuickOverlayAttached::setModal(QQmlComponent *modal) For example, to change the color of the background dimming for a modeless popup, the following code can be used: - \snippet qtquickcontrols2-overlay-modeless.qml 1 + \snippet qtquickcontrols-overlay-modeless.qml 1 \sa Popup::dim */ diff --git a/src/quicktemplates/qquickpage.cpp b/src/quicktemplates/qquickpage.cpp index 6ada004c40..28348c2518 100644 --- a/src/quicktemplates/qquickpage.cpp +++ b/src/quicktemplates/qquickpage.cpp @@ -15,14 +15,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickPage \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Styled page control with support for a header and footer. Page is a container control which makes it convenient to add a \l header and \l footer item to a page. - \image qtquickcontrols2-page-wireframe.png + \image qtquickcontrols-page-wireframe.png Items declared as children of a Page are: \list diff --git a/src/quicktemplates/qquickpageindicator.cpp b/src/quicktemplates/qquickpageindicator.cpp index de0bb137c1..b0bc5188fe 100644 --- a/src/quicktemplates/qquickpageindicator.cpp +++ b/src/quicktemplates/qquickpageindicator.cpp @@ -15,14 +15,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickPageIndicator \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-indicators + \ingroup qtquickcontrols-indicators \brief Indicates the currently active page. PageIndicator is used to indicate the currently active page in a container of multiple pages. PageIndicator consists of delegate items that present pages. - \image qtquickcontrols2-pageindicator.png + \image qtquickcontrols-pageindicator.png \code Column { @@ -226,7 +226,7 @@ void QQuickPageIndicator::setCurrentIndex(int index) reacts to presses and automatically changes the \l {currentIndex}{current index} appropriately. - \snippet qtquickcontrols2-pageindicator-interactive.qml 1 + \snippet qtquickcontrols-pageindicator-interactive.qml 1 \note Page indicators are typically quite small (in order to avoid distracting the user from the actual content of the user interface). They diff --git a/src/quicktemplates/qquickpane.cpp b/src/quicktemplates/qquickpane.cpp index 05e5c90883..9f14843db4 100644 --- a/src/quicktemplates/qquickpane.cpp +++ b/src/quicktemplates/qquickpane.cpp @@ -17,8 +17,8 @@ Q_LOGGING_CATEGORY(lcPane, "qt.quick.controls.pane") //! \instantiates QQuickPane \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Provides a background matching with the application style and theme. Pane provides a background color that matches with the application style @@ -36,9 +36,9 @@ Q_LOGGING_CATEGORY(lcPane, "qt.quick.controls.pane") implicit size of its contained item. This makes it particularly suitable for use together with layouts. - \image qtquickcontrols2-pane.png + \image qtquickcontrols-pane.png - \snippet qtquickcontrols2-pane.qml 1 + \snippet qtquickcontrols-pane.qml 1 Sometimes there might be two items within the pane: diff --git a/src/quicktemplates/qquickpopup.cpp b/src/quicktemplates/qquickpopup.cpp index 65d395247e..20f96e5e1b 100644 --- a/src/quicktemplates/qquickpopup.cpp +++ b/src/quicktemplates/qquickpopup.cpp @@ -28,8 +28,8 @@ Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup") //! \instantiates QQuickPopup \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-popups - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-popups + \ingroup qtquickcontrols-focusscopes \brief Base type of popup-like user interface controls. Popup is the base type of popup-like user interface controls. It can be @@ -78,7 +78,7 @@ Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup") The following diagram illustrates the layout of a popup within a window: - \image qtquickcontrols2-popup.png + \image qtquickcontrols-popup.png The \l implicitWidth and \l implicitHeight of a popup are typically based on the implicit sizes of the background and the content item plus any insets @@ -181,7 +181,7 @@ Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup") Another way to center a popup in the window regardless of its parent item is to use \l {anchors.centerIn}: - \snippet qtquickcontrols2-popup.qml centerIn + \snippet qtquickcontrols-popup.qml centerIn To ensure that the popup is positioned within the bounds of the enclosing window, the \l margins property can be set to a non-negative value. @@ -662,7 +662,7 @@ void QQuickPopupPrivate::setBottomMargin(qreal value, bool reset) It is also possible to center the popup in the window by using \l Overlay: - \snippet qtquickcontrols2-popup.qml centerIn + \snippet qtquickcontrols-popup.qml centerIn This makes it easy to center a popup in the window from any component. @@ -2107,7 +2107,7 @@ void QQuickPopup::resetClosePolicy() Nine transform origins are available, as shown in the image below. The default transform origin is \c Popup.Center. - \image qtquickcontrols2-popup-transformorigin.png + \image qtquickcontrols-popup-transformorigin.png \sa enter, exit, Item::transformOrigin */ diff --git a/src/quicktemplates/qquickprogressbar.cpp b/src/quicktemplates/qquickprogressbar.cpp index 3bdd1baaec..c42a62b4fe 100644 --- a/src/quicktemplates/qquickprogressbar.cpp +++ b/src/quicktemplates/qquickprogressbar.cpp @@ -12,10 +12,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickProgressBar \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-indicators + \ingroup qtquickcontrols-indicators \brief Indicates the progress of an operation. - \image qtquickcontrols2-progressbar.gif + \image qtquickcontrols-progressbar.gif ProgressBar indicates the progress of an operation. The value should be updated regularly. The range is defined by \l from and \l to, which both can contain any value. @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE for example, when unable to determine the size of the item being downloaded, or if the download progress gets interrupted due to a network disconnection. - \image qtquickcontrols2-progressbar-indeterminate.gif + \image qtquickcontrols-progressbar-indeterminate.gif \code ProgressBar { @@ -196,7 +196,7 @@ qreal QQuickProgressBar::visualPosition() const A progress bar in indeterminate mode displays that an operation is in progress, but it doesn't show how much progress has been made. - \image qtquickcontrols2-progressbar-indeterminate.gif + \image qtquickcontrols-progressbar-indeterminate.gif */ bool QQuickProgressBar::isIndeterminate() const { diff --git a/src/quicktemplates/qquickradiobutton.cpp b/src/quicktemplates/qquickradiobutton.cpp index eb19c3edd8..a943da9de6 100644 --- a/src/quicktemplates/qquickradiobutton.cpp +++ b/src/quicktemplates/qquickradiobutton.cpp @@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickRadioButton \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Exclusive radio button that can be toggled on or off. - \image qtquickcontrols2-radiobutton.gif + \image qtquickcontrols-radiobutton.gif RadioButton presents an option button that can be toggled on (checked) or off (unchecked). Radio buttons are typically used to select one option diff --git a/src/quicktemplates/qquickradiodelegate.cpp b/src/quicktemplates/qquickradiodelegate.cpp index 585d19df99..2c390ad487 100644 --- a/src/quicktemplates/qquickradiodelegate.cpp +++ b/src/quicktemplates/qquickradiodelegate.cpp @@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickRadioDelegate \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-delegates + \ingroup qtquickcontrols-delegates \brief Exclusive item delegate with a radio indicator that can be toggled on or off. - \image qtquickcontrols2-radiodelegate.gif + \image qtquickcontrols-radiodelegate.gif RadioDelegate presents an item delegate that can be toggled on (checked) or off (unchecked). Radio delegates are typically used to select one option diff --git a/src/quicktemplates/qquickrangeslider.cpp b/src/quicktemplates/qquickrangeslider.cpp index 1386c6db62..ff15a9194e 100644 --- a/src/quicktemplates/qquickrangeslider.cpp +++ b/src/quicktemplates/qquickrangeslider.cpp @@ -16,11 +16,11 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickRangeSlider \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-input + \ingroup qtquickcontrols-focusscopes \brief Used to select a range of values by sliding two handles along a track. - \image qtquickcontrols2-rangeslider.gif + \image qtquickcontrols-rangeslider.gif RangeSlider is used to select a range specified by two values, by sliding each handle along a track. diff --git a/src/quicktemplates/qquickroundbutton.cpp b/src/quicktemplates/qquickroundbutton.cpp index 335e1fce47..534fb2ed4e 100644 --- a/src/quicktemplates/qquickroundbutton.cpp +++ b/src/quicktemplates/qquickroundbutton.cpp @@ -13,16 +13,16 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickRoundButton \inqmlmodule QtQuick.Controls \since 5.8 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief A push-button control with rounded corners that can be clicked by the user. - \image qtquickcontrols2-roundbutton.png + \image qtquickcontrols-roundbutton.png RoundButton is identical to \l Button, except that it has a \l radius property which allows the corners to be rounded without having to customize the \l background. - \snippet qtquickcontrols2-roundbutton.qml 1 + \snippet qtquickcontrols-roundbutton.qml 1 \sa {Customizing RoundButton}, {Button Controls} */ diff --git a/src/quicktemplates/qquickscrollbar.cpp b/src/quicktemplates/qquickscrollbar.cpp index 5715d7fbd0..67fc8116a6 100644 --- a/src/quicktemplates/qquickscrollbar.cpp +++ b/src/quicktemplates/qquickscrollbar.cpp @@ -19,10 +19,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickScrollBar \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-indicators + \ingroup qtquickcontrols-indicators \brief Vertical or horizontal interactive scroll bar. - \image qtquickcontrols2-scrollbar.gif + \image qtquickcontrols-scrollbar.gif ScrollBar is an interactive bar that can be used to scroll to a specific position. A scroll bar can be either \l vertical or \l horizontal, and can @@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE to either direction, establish a two-way binding between the active states as presented by the following example: - \snippet qtquickcontrols2-scrollbar-active.qml 1 + \snippet qtquickcontrols-scrollbar-active.qml 1 \section1 Non-attached Scroll Bars @@ -104,9 +104,9 @@ QT_BEGIN_NAMESPACE following example, horizontal and vertical scroll bars are used to scroll over the text without using \l Flickable: - \snippet qtquickcontrols2-scrollbar-non-attached.qml 1 + \snippet qtquickcontrols-scrollbar-non-attached.qml 1 - \image qtquickcontrols2-scrollbar-non-attached.png + \image qtquickcontrols-scrollbar-non-attached.png When using a non-attached ScrollBar, the following must be done manually: @@ -590,9 +590,9 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation) \table \header \row \li \b Value \li \b Example - \row \li \c ScrollBar.NoSnap \li \image qtquickcontrols2-scrollbar-nosnap.gif - \row \li \c ScrollBar.SnapAlways \li \image qtquickcontrols2-scrollbar-snapalways.gif - \row \li \c ScrollBar.SnapOnRelease \li \image qtquickcontrols2-scrollbar-snaponrelease.gif + \row \li \c ScrollBar.NoSnap \li \image qtquickcontrols-scrollbar-nosnap.gif + \row \li \c ScrollBar.SnapAlways \li \image qtquickcontrols-scrollbar-snapalways.gif + \row \li \c ScrollBar.SnapOnRelease \li \image qtquickcontrols-scrollbar-snaponrelease.gif \endtable \sa stepSize @@ -656,7 +656,7 @@ void QQuickScrollBar::resetInteractive() The following example keeps the vertical scroll bar always visible: - \snippet qtquickcontrols2-scrollbar-policy.qml 1 + \snippet qtquickcontrols-scrollbar-policy.qml 1 */ QQuickScrollBar::Policy QQuickScrollBar::policy() const { diff --git a/src/quicktemplates/qquickscrollindicator.cpp b/src/quicktemplates/qquickscrollindicator.cpp index 9017890b8e..3a691852bc 100644 --- a/src/quicktemplates/qquickscrollindicator.cpp +++ b/src/quicktemplates/qquickscrollindicator.cpp @@ -16,10 +16,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickScrollIndicator \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-indicators + \ingroup qtquickcontrols-indicators \brief Vertical or horizontal non-interactive scroll indicator. - \image qtquickcontrols2-scrollindicator.gif + \image qtquickcontrols-scrollindicator.gif ScrollIndicator is a non-interactive indicator that indicates the current scroll position. A scroll indicator can be either \l vertical or \l horizontal, and can @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE to either direction, establish a two-way binding between the active states as presented by the following example: - \snippet qtquickcontrols2-scrollindicator-active.qml 1 + \snippet qtquickcontrols-scrollindicator-active.qml 1 \section1 Non-attached Scroll Indicators @@ -86,9 +86,9 @@ QT_BEGIN_NAMESPACE indicate how far the user has scrolled over the text (using \l MouseArea instead of \l Flickable): - \snippet qtquickcontrols2-scrollindicator-non-attached.qml 1 + \snippet qtquickcontrols-scrollindicator-non-attached.qml 1 - \image qtquickcontrols2-scrollindicator-non-attached.png + \image qtquickcontrols-scrollindicator-non-attached.png \sa ScrollBar, {Customizing ScrollIndicator}, {Indicator Controls} */ diff --git a/src/quicktemplates/qquickscrollview.cpp b/src/quicktemplates/qquickscrollview.cpp index b78ca920f4..8a352b7f61 100644 --- a/src/quicktemplates/qquickscrollview.cpp +++ b/src/quicktemplates/qquickscrollview.cpp @@ -15,23 +15,23 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickScrollView \inqmlmodule QtQuick.Controls \since 5.9 - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Scrollable view. ScrollView provides scrolling for user-defined content. It can be used to either replace a \l Flickable, or to decorate an existing one. - \image qtquickcontrols2-scrollview.png + \image qtquickcontrols-scrollview.png The first example demonstrates the simplest usage of ScrollView. - \snippet qtquickcontrols2-scrollview.qml file + \snippet qtquickcontrols-scrollview.qml file The second example illustrates using an existing \l Flickable, that is, a \l ListView. - \snippet qtquickcontrols2-scrollview-listview.qml file + \snippet qtquickcontrols-scrollview-listview.qml file \note As of Qt-6.0, ScrollView automatically clips its contents if you don't use a Flickable as a child. If this is not wanted, you can @@ -67,24 +67,24 @@ QT_BEGIN_NAMESPACE bar policies so that the horizontal scroll bar is always off, and the vertical scroll bar is always on. - \snippet qtquickcontrols2-scrollview-policy.qml file + \snippet qtquickcontrols-scrollview-policy.qml file \section2 Touch vs. Mouse Interaction On touch, ScrollView enables flicking and makes the scroll bars non-interactive. - \image qtquickcontrols2-scrollindicator.gif + \image qtquickcontrols-scrollindicator.gif When interacted with a mouse device, flicking is disabled and the scroll bars are interactive. - \image qtquickcontrols2-scrollbar.gif + \image qtquickcontrols-scrollbar.gif Scroll bars can be made interactive on touch, or non-interactive when interacted with a mouse device, by setting the \l {ScrollBar::}{interactive} property explicitly to \c true or \c false, respectively. - \snippet qtquickcontrols2-scrollview-interactive.qml file + \snippet qtquickcontrols-scrollview-interactive.qml file \sa ScrollBar, ScrollIndicator, {Customizing ScrollView}, {Container Controls}, {Focus Management in Qt Quick Controls} diff --git a/src/quicktemplates/qquickselectionrectangle.cpp b/src/quicktemplates/qquickselectionrectangle.cpp index 612b53dca2..9e9fa60710 100644 --- a/src/quicktemplates/qquickselectionrectangle.cpp +++ b/src/quicktemplates/qquickselectionrectangle.cpp @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE \ingroup utilities \brief Used to select table cells inside a TableView. - \image qtquickcontrols2-selectionrectangle.png + \image qtquickcontrols-selectionrectangle.png SelectionRectangle is used for selecting table cells in a TableView. It lets the user start a selection by doing a pointer drag inside the viewport, or by @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE The following example shows how you can make a SelectionRectangle target a TableView: - \snippet qtquickcontrols2-selectionrectangle.qml 0 + \snippet qtquickcontrols-selectionrectangle.qml 0 \note A SelectionRectangle itself is not shown as part of a selection. Only the delegates (like topLeftHandle and bottomRightHandle) are used. diff --git a/src/quicktemplates/qquickslider.cpp b/src/quicktemplates/qquickslider.cpp index 28445fe733..a510e2e430 100644 --- a/src/quicktemplates/qquickslider.cpp +++ b/src/quicktemplates/qquickslider.cpp @@ -15,10 +15,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickSlider \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input + \ingroup qtquickcontrols-input \brief Used to select a value by sliding a handle along a track. - \image qtquickcontrols2-slider.gif + \image qtquickcontrols-slider.gif Slider is used to select a value by sliding a handle along a track. @@ -425,9 +425,9 @@ void QQuickSlider::setStepSize(qreal step) \table \header \row \li \b Value \li \b Example - \row \li \c Slider.NoSnap \li \image qtquickcontrols2-slider-nosnap.gif - \row \li \c Slider.SnapAlways \li \image qtquickcontrols2-slider-snapalways.gif - \row \li \c Slider.SnapOnRelease \li \image qtquickcontrols2-slider-snaponrelease.gif + \row \li \c Slider.NoSnap \li \image qtquickcontrols-slider-nosnap.gif + \row \li \c Slider.SnapAlways \li \image qtquickcontrols-slider-snapalways.gif + \row \li \c Slider.SnapOnRelease \li \image qtquickcontrols-slider-snaponrelease.gif \endtable \sa stepSize diff --git a/src/quicktemplates/qquickspinbox.cpp b/src/quicktemplates/qquickspinbox.cpp index 867d72f550..5a8e8e12c3 100644 --- a/src/quicktemplates/qquickspinbox.cpp +++ b/src/quicktemplates/qquickspinbox.cpp @@ -27,10 +27,10 @@ static const int AUTO_REPEAT_INTERVAL = 100; \inqmlmodule QtQuick.Controls \since 5.7 \ingroup input - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-focusscopes \brief Allows the user to select from a set of preset values. - \image qtquickcontrols2-spinbox.png + \image qtquickcontrols-spinbox.png SpinBox allows the user to choose an integer value by clicking the up or down indicator buttons, or by pressing up or down on the keyboard. @@ -40,25 +40,25 @@ static const int AUTO_REPEAT_INTERVAL = 100; By default, SpinBox provides discrete values in the range of \c [0-99] with a \l stepSize of \c 1. - \snippet qtquickcontrols2-spinbox.qml 1 + \snippet qtquickcontrols-spinbox.qml 1 \section2 Custom Values - \image qtquickcontrols2-spinbox-textual.png + \image qtquickcontrols-spinbox-textual.png Even though SpinBox works on integer values, it can be customized to accept arbitrary input values. The following snippet demonstrates how \l validator, \l textFromValue and \l valueFromText can be used to customize the default behavior. - \snippet qtquickcontrols2-spinbox-textual.qml 1 + \snippet qtquickcontrols-spinbox-textual.qml 1 In the same manner, SpinBox can be customized to accept floating point numbers: - \image qtquickcontrols2-spinbox-double.png + \image qtquickcontrols-spinbox-double.png - \snippet qtquickcontrols2-spinbox-double.qml 1 + \snippet qtquickcontrols-spinbox-double.qml 1 \sa Tumbler, {Customizing SpinBox}, {Focus Management in Qt Quick Controls} */ diff --git a/src/quicktemplates/qquicksplitview.cpp b/src/quicktemplates/qquicksplitview.cpp index 2ca9923860..7bb4d4dc3d 100644 --- a/src/quicktemplates/qquicksplitview.cpp +++ b/src/quicktemplates/qquicksplitview.cpp @@ -20,8 +20,8 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickSplitView \inqmlmodule QtQuick.Controls \since 5.13 - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Lays out items with a draggable splitter between each item. SplitView is a control that lays out items horizontally or vertically with @@ -1180,7 +1180,7 @@ bool QQuickSplitView::isResizing() const To change the size of the handle for mouse and touch events without changing its visual size, use a \l {Item::}{containmentMask}: - \snippet qtquickcontrols2-splitview-handle-containmentmask.qml 1 + \snippet qtquickcontrols-splitview-handle-containmentmask.qml 1 \sa {Customizing SplitView} */ diff --git a/src/quicktemplates/qquickstackview.cpp b/src/quicktemplates/qquickstackview.cpp index 1b16c6e581..d09f55f6a4 100644 --- a/src/quicktemplates/qquickstackview.cpp +++ b/src/quicktemplates/qquickstackview.cpp @@ -22,12 +22,12 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickStackView \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-navigation - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-navigation + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Provides a stack-based navigation model. - \image qtquickcontrols2-stackview-wireframe.png + \image qtquickcontrols-stackview-wireframe.png StackView can be used with a set of inter-linked information pages. For example, an email application with separate views to list the latest emails, @@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE In the following animation, three \l Label controls are pushed onto a stack view with the \l push() function: - \image qtquickcontrols2-stackview-push.gif + \image qtquickcontrols-stackview-push.gif The stack now contains the following items: \c [A, B, C]. @@ -115,7 +115,7 @@ QT_BEGIN_NAMESPACE Continuing on from the example above, the topmost item on the stack is removed with a call to \l pop(): - \image qtquickcontrols2-stackview-pop.gif + \image qtquickcontrols-stackview-pop.gif The stack now contains the following items: \c [A, B]. @@ -136,7 +136,7 @@ QT_BEGIN_NAMESPACE In the following animation, we unwind the stack to the first item by calling \c pop(null): - \image qtquickcontrols2-stackview-unwind.gif + \image qtquickcontrols-stackview-unwind.gif The stack now contains a single item: \c [A]. @@ -144,7 +144,7 @@ QT_BEGIN_NAMESPACE In the following animation, we \l replace the topmost item with \c D: - \image qtquickcontrols2-stackview-replace.gif + \image qtquickcontrols-stackview-replace.gif The stack now contains the following items: \c [A, B, D]. @@ -1280,9 +1280,9 @@ QQuickStackView::Status QQuickStackViewAttached::status() const of items visible, consider customizing the \l transitions so that the items underneath can be seen. - \image qtquickcontrols2-stackview-visible.png + \image qtquickcontrols-stackview-visible.png - \snippet qtquickcontrols2-stackview-visible.qml 1 + \snippet qtquickcontrols-stackview-visible.qml 1 */ bool QQuickStackViewAttached::isVisible() const { diff --git a/src/quicktemplates/qquickswipedelegate.cpp b/src/quicktemplates/qquickswipedelegate.cpp index 42343d1072..24ca772b06 100644 --- a/src/quicktemplates/qquickswipedelegate.cpp +++ b/src/quicktemplates/qquickswipedelegate.cpp @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickSwipeDelegate \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-delegates + \ingroup qtquickcontrols-delegates \brief Swipable item delegate. SwipeDelegate presents a view item that can be swiped left or right to @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE In the following example, SwipeDelegate is used in a \l ListView to allow items to be removed from it by swiping to the left: - \snippet qtquickcontrols2-swipedelegate.qml 1 + \snippet qtquickcontrols-swipedelegate.qml 1 SwipeDelegate inherits its API from \l ItemDelegate, which is inherited from AbstractButton. For instance, you can set \l {AbstractButton::text}{text}, @@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE any position for \c swipe.left or \c swipe.right, the following will occur: - \image qtquickcontrols2-swipedelegate.gif + \image qtquickcontrols-swipedelegate.gif If \c swipe.left and \c swipe.right are anchored to the left and right of the \l {Control::}{background} item (respectively), they'll behave like this: - \image qtquickcontrols2-swipedelegate-leading-trailing.gif + \image qtquickcontrols-swipedelegate-leading-trailing.gif When using \c swipe.left and \c swipe.right, the control cannot be swiped past the left and right edges. To achieve this type of "wrapping" @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE example, in the image below, we set \c swipe.behind and then swipe the control repeatedly in both directions: - \image qtquickcontrols2-swipedelegate-behind.gif + \image qtquickcontrols-swipedelegate-behind.gif \sa {Customizing SwipeDelegate}, {Delegate Controls}, {Qt Quick Controls 2 - Swipe to Remove}{Swipe to Remove Example} */ @@ -1164,7 +1164,7 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) \li This property holds the transition that is applied when a swipe is released, or \l swipe.open() or \l swipe.close() is called. - \snippet qtquickcontrols2-swipedelegate-transition.qml 1 + \snippet qtquickcontrols-swipedelegate-transition.qml 1 This property was added in Qt Quick Controls 2.2. \endtable diff --git a/src/quicktemplates/qquickswipeview.cpp b/src/quicktemplates/qquickswipeview.cpp index b9ca6208d1..e19211e5ae 100644 --- a/src/quicktemplates/qquickswipeview.cpp +++ b/src/quicktemplates/qquickswipeview.cpp @@ -14,14 +14,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickSwipeView \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-navigation - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-navigation + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Enables the user to navigate pages by swiping sideways. SwipeView provides a swipe-based navigation model. - \image qtquickcontrols2-swipeview.gif + \image qtquickcontrols-swipeview.gif SwipeView is populated with a set of pages. One page is visible at a time. The user can navigate between the pages by swiping sideways. Notice that @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE with PageIndicator, to give the user a visual clue that there are multiple pages. - \snippet qtquickcontrols2-swipeview-indicator.qml 1 + \snippet qtquickcontrols-swipeview-indicator.qml 1 As shown above, SwipeView is typically populated with a static set of pages that are defined inline as children of the view. It is also possible diff --git a/src/quicktemplates/qquickswitch.cpp b/src/quicktemplates/qquickswitch.cpp index fadea992a6..1b2473cbdb 100644 --- a/src/quicktemplates/qquickswitch.cpp +++ b/src/quicktemplates/qquickswitch.cpp @@ -17,10 +17,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickSwitch \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Switch button that can be toggled on or off. - \image qtquickcontrols2-switch.gif + \image qtquickcontrols-switch.gif Switch is an option button that can be dragged or toggled on (checked) or off (unchecked). Switches are typically used to select between two states. diff --git a/src/quicktemplates/qquickswitchdelegate.cpp b/src/quicktemplates/qquickswitchdelegate.cpp index 3e52f531fa..f17faf8aa9 100644 --- a/src/quicktemplates/qquickswitchdelegate.cpp +++ b/src/quicktemplates/qquickswitchdelegate.cpp @@ -13,10 +13,10 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickSwitchDelegate \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-delegates + \ingroup qtquickcontrols-delegates \brief Item delegate with a switch indicator that can be toggled on or off. - \image qtquickcontrols2-switchdelegate.gif + \image qtquickcontrols-switchdelegate.gif SwitchDelegate presents an item delegate that can be toggled on (checked) or off (unchecked). Switch delegates are typically used to select one or more diff --git a/src/quicktemplates/qquicktabbar.cpp b/src/quicktemplates/qquicktabbar.cpp index a1dfc9068c..3894d90af3 100644 --- a/src/quicktemplates/qquicktabbar.cpp +++ b/src/quicktemplates/qquicktabbar.cpp @@ -13,20 +13,20 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickTabBar \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-navigation - \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes + \ingroup qtquickcontrols-navigation + \ingroup qtquickcontrols-containers + \ingroup qtquickcontrols-focusscopes \brief Allows the user to switch between different views or subtasks. TabBar provides a tab-based navigation model. - \image qtquickcontrols2-tabbar-wireframe.png + \image qtquickcontrols-tabbar-wireframe.png TabBar is populated with TabButton controls, and can be used together with any layout or container control that provides \c currentIndex -property, such as \l StackLayout or \l SwipeView - \snippet qtquickcontrols2-tabbar.qml 1 + \snippet qtquickcontrols-tabbar.qml 1 As shown above, TabBar is typically populated with a static set of tab buttons that are defined inline as children of the tab bar. It is also possible to @@ -45,18 +45,18 @@ QT_BEGIN_NAMESPACE The following example illustrates how to keep each tab button at their implicit size instead of being resized to fit the tabbar: - \borderedimage qtquickcontrols2-tabbar-explicit.png + \borderedimage qtquickcontrols-tabbar-explicit.png - \snippet qtquickcontrols2-tabbar-explicit.qml 1 + \snippet qtquickcontrols-tabbar-explicit.qml 1 \section2 Flickable Tabs If the total width of the buttons exceeds the available width of the tab bar, it automatically becomes flickable. - \image qtquickcontrols2-tabbar-flickable.png + \image qtquickcontrols-tabbar-flickable.png - \snippet qtquickcontrols2-tabbar-flickable.qml 1 + \snippet qtquickcontrols-tabbar-flickable.qml 1 \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls}, {Focus Management in Qt Quick Controls} diff --git a/src/quicktemplates/qquicktabbutton.cpp b/src/quicktemplates/qquicktabbutton.cpp index c3450ce164..500ee0e81b 100644 --- a/src/quicktemplates/qquicktabbutton.cpp +++ b/src/quicktemplates/qquicktabbutton.cpp @@ -15,14 +15,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickTabButton \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-navigation + \ingroup qtquickcontrols-navigation \brief Button with a look suitable for a TabBar. - \image qtquickcontrols2-tabbutton.png + \image qtquickcontrols-tabbutton.png TabButton is used in conjunction with a \l TabBar. - \snippet qtquickcontrols2-tabbutton.qml 1 + \snippet qtquickcontrols-tabbutton.qml 1 TabButton inherits its API from AbstractButton. For instance, you can set \l {AbstractButton::text}{text}, and react to \l {AbstractButton::clicked}{clicks} diff --git a/src/quicktemplates/qquicktextarea.cpp b/src/quicktemplates/qquicktextarea.cpp index 0572746d14..26083abbdf 100644 --- a/src/quicktemplates/qquicktextarea.cpp +++ b/src/quicktemplates/qquicktextarea.cpp @@ -27,13 +27,13 @@ using namespace Qt::StringLiterals; //! \instantiates QQuickTextArea \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input + \ingroup qtquickcontrols-input \brief Multi-line text input area. TextArea is a multi-line text editor. TextArea extends TextEdit with a \l {placeholderText}{placeholder text} functionality, and adds decoration. - \image qtquickcontrols2-textarea.png + \image qtquickcontrols-textarea.png \code TextArea { @@ -53,9 +53,9 @@ using namespace Qt::StringLiterals; If you want to make a TextArea scrollable, for example, when it covers an entire application page, it can be placed inside a \l ScrollView. - \image qtquickcontrols2-textarea-scrollable.png + \image qtquickcontrols-textarea-scrollable.png - \snippet qtquickcontrols2-textarea-scrollable.qml 1 + \snippet qtquickcontrols-textarea-scrollable.qml 1 A TextArea that is placed inside a \l ScrollView does the following: diff --git a/src/quicktemplates/qquicktextfield.cpp b/src/quicktemplates/qquicktextfield.cpp index 3e6d2a48a7..8188dfb312 100644 --- a/src/quicktemplates/qquicktextfield.cpp +++ b/src/quicktemplates/qquicktextfield.cpp @@ -25,18 +25,18 @@ using namespace Qt::StringLiterals; //! \instantiates QQuickTextField \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input + \ingroup qtquickcontrols-input \brief Single-line text input field. TextField is a single line text editor. TextField extends TextInput with a \l {placeholderText}{placeholder text} functionality, and adds decoration. \table - \row \li \image qtquickcontrols2-textfield-normal.png + \row \li \image qtquickcontrols-textfield-normal.png \li A text field in its normal state. - \row \li \image qtquickcontrols2-textfield-focused.png + \row \li \image qtquickcontrols-textfield-focused.png \li A text field that has active focus. - \row \li \image qtquickcontrols2-textfield-disabled.png + \row \li \image qtquickcontrols-textfield-disabled.png \li A text field that is disabled. \endtable diff --git a/src/quicktemplates/qquicktoolbar.cpp b/src/quicktemplates/qquicktoolbar.cpp index f804684fa7..c6b622621d 100644 --- a/src/quicktemplates/qquicktoolbar.cpp +++ b/src/quicktemplates/qquicktoolbar.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickToolBar \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols-containers \brief Container for context-sensitive controls. ToolBar is a container of application-wide and context sensitive @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE implicit size of its contained item. This makes it particularly suitable for use together with layouts. - \image qtquickcontrols2-toolbar.png + \image qtquickcontrols-toolbar.png \code ApplicationWindow { diff --git a/src/quicktemplates/qquicktoolbutton.cpp b/src/quicktemplates/qquicktoolbutton.cpp index 4b0a978878..3acf8782a1 100644 --- a/src/quicktemplates/qquicktoolbutton.cpp +++ b/src/quicktemplates/qquicktoolbutton.cpp @@ -15,15 +15,15 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickToolButton \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-buttons + \ingroup qtquickcontrols-buttons \brief Button with a look suitable for a ToolBar. ToolButton is functionally similar to \l Button, but provides a look that is more suitable within a \l ToolBar. - \image qtquickcontrols2-toolbar.png + \image qtquickcontrols-toolbar.png - \snippet qtquickcontrols2-toolbar.qml 1 + \snippet qtquickcontrols-toolbar.qml 1 ToolButton inherits its API from AbstractButton. For instance, you can set \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon}, diff --git a/src/quicktemplates/qquicktoolseparator.cpp b/src/quicktemplates/qquicktoolseparator.cpp index 2ac2173085..afb3caa9cd 100644 --- a/src/quicktemplates/qquicktoolseparator.cpp +++ b/src/quicktemplates/qquicktoolseparator.cpp @@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickToolSeparator \inqmlmodule QtQuick.Controls \since 5.8 - \ingroup qtquickcontrols2-separators + \ingroup qtquickcontrols-separators \brief Separates a group of items in a toolbar from adjacent items. ToolSeparator is used to visually distinguish between groups of items in a @@ -21,9 +21,9 @@ QT_BEGIN_NAMESPACE vertical toolbars by setting the \l orientation property to \c Qt.Vertical or \c Qt.Horizontal, respectively. - \image qtquickcontrols2-toolseparator.png + \image qtquickcontrols-toolseparator.png - \snippet qtquickcontrols2-toolseparator.qml 1 + \snippet qtquickcontrols-toolseparator.qml 1 \sa {Customizing ToolSeparator}, {Separator Controls} */ diff --git a/src/quicktemplates/qquicktooltip.cpp b/src/quicktemplates/qquicktooltip.cpp index 7703d57b53..2a78e4d344 100644 --- a/src/quicktemplates/qquicktooltip.cpp +++ b/src/quicktemplates/qquicktooltip.cpp @@ -21,14 +21,14 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickToolTip \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-popups + \ingroup qtquickcontrols-popups \brief Provides tool tips for any control. A tool tip is a short piece of text that informs the user of a control's function. It is typically placed above or below the parent control. The tip text can be any \l{Rich Text Processing}{rich text} formatted string. - \image qtquickcontrols2-tooltip.png + \image qtquickcontrols-tooltip.png \section2 Attached Tool Tips @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE specify \l text and \l {visible}{visibility} via attached properties. The following example illustrates this approach: - \snippet qtquickcontrols2-tooltip.qml 1 + \snippet qtquickcontrols-tooltip.qml 1 Under normal circumstances, there is only one tool tip visible at a time. In order to save resources, all items that use the ToolTip attached property @@ -63,14 +63,14 @@ QT_BEGIN_NAMESPACE interval is reached. In this example, the tool tip hides as soon as the button is released. - \snippet qtquickcontrols2-tooltip-pressandhold.qml 1 + \snippet qtquickcontrols-tooltip-pressandhold.qml 1 With pointer devices, however, it might be desired to show a tool tip as a result of hovering a button for a while. The following example presents how to show a tool tip after hovering a button for a second, and hide it after a timeout of five seconds. - \snippet qtquickcontrols2-tooltip-hover.qml 1 + \snippet qtquickcontrols-tooltip-hover.qml 1 \section2 Custom Tool Tips @@ -81,9 +81,9 @@ QT_BEGIN_NAMESPACE API is available. The following example presents a tool tip that presents the value of a slider when the handle is dragged. - \image qtquickcontrols2-tooltip-slider.png + \image qtquickcontrols-tooltip-slider.png - \snippet qtquickcontrols2-tooltip-slider.qml 1 + \snippet qtquickcontrols-tooltip-slider.qml 1 \sa {Customizing ToolTip}, {Popup Controls}, {QtQuick.Controls::Popup::closePolicy}{closePolicy} diff --git a/src/quicktemplates/qquicktreeviewdelegate.cpp b/src/quicktemplates/qquicktreeviewdelegate.cpp index f21b215dfe..1f4b8e38fe 100644 --- a/src/quicktemplates/qquicktreeviewdelegate.cpp +++ b/src/quicktemplates/qquicktreeviewdelegate.cpp @@ -14,10 +14,10 @@ QT_BEGIN_NAMESPACE \inherits ItemDelegate \inqmlmodule QtQuick.Controls \since 6.3 - \ingroup qtquickcontrols2-delegates + \ingroup qtquickcontrols-delegates \brief A delegate that can be assigned to a TreeView. - \image qtquickcontrols2-treeviewdelegate.png + \image qtquickcontrols-treeviewdelegate.png A TreeViewDelegate is a delegate that can be assigned to the \l {TableView::delegate} {delegate property} of a \l TreeView. diff --git a/src/quicktemplates/qquicktumbler.cpp b/src/quicktemplates/qquicktumbler.cpp index 434f90ad3a..e7f6606de3 100644 --- a/src/quicktemplates/qquicktumbler.cpp +++ b/src/quicktemplates/qquicktumbler.cpp @@ -20,10 +20,10 @@ Q_LOGGING_CATEGORY(lcTumbler, "qt.quick.controls.tumbler") //! \instantiates QQuickTumbler \inqmlmodule QtQuick.Controls \since 5.7 - \ingroup qtquickcontrols2-input + \ingroup qtquickcontrols-input \brief Spinnable wheel of items that can be selected. - \image qtquickcontrols2-tumbler-wrap.gif + \image qtquickcontrols-tumbler-wrap.gif \code Tumbler { @@ -52,7 +52,7 @@ Q_LOGGING_CATEGORY(lcTumbler, "qt.quick.controls.tumbler") long as there are more items in the model than there are visible items; that is, when \l count is greater than \l visibleItemCount: - \snippet qtquickcontrols2-tumbler-timePicker.qml tumbler + \snippet qtquickcontrols-tumbler-timePicker.qml tumbler \sa {Customizing Tumbler}, {Input Controls} */ diff --git a/src/quicktemplates/qquickweeknumbercolumn.cpp b/src/quicktemplates/qquickweeknumbercolumn.cpp index 925e4b4b34..69a41c53bf 100644 --- a/src/quicktemplates/qquickweeknumbercolumn.cpp +++ b/src/quicktemplates/qquickweeknumbercolumn.cpp @@ -20,15 +20,15 @@ QT_BEGIN_NAMESPACE are calculated for a given \l month and \l year, using the specified \l {Control::locale}{locale}. - \image qtquickcontrols2-weeknumbercolumn.png - \snippet qtquickcontrols2-weeknumbercolumn.qml 1 + \image qtquickcontrols-weeknumbercolumn.png + \snippet qtquickcontrols-weeknumbercolumn.qml 1 WeekNumberColumn can be used as a standalone control, but it is most often used in conjunction with MonthGrid. Regardless of the use case, positioning of the column is left to the user. - \image qtquickcontrols2-weeknumbercolumn-layout.png - \snippet qtquickcontrols2-weeknumbercolumn-layout.qml 1 + \image qtquickcontrols-weeknumbercolumn-layout.png + \snippet qtquickcontrols-weeknumbercolumn-layout.qml 1 The visual appearance of WeekNumberColumn can be changed by implementing a \l {delegate}{custom delegate}. |