diff options
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/ComboBox.qml | 4 | ||||
| -rw-r--r-- | src/controls/RadioButton.qml | 1 | ||||
| -rw-r--r-- | src/controls/StackView.qml | 4 | ||||
| -rw-r--r-- | src/controls/StackViewDelegate.qml | 3 | ||||
| -rw-r--r-- | src/controls/TableViewColumn.qml | 4 | ||||
| -rw-r--r-- | src/controls/TextArea.qml | 4 | ||||
| -rw-r--r-- | src/controls/TextField.qml | 6 | ||||
| -rw-r--r-- | src/controls/doc/qtquickcontrols.qdocconf | 2 |
8 files changed, 13 insertions, 15 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 21d473d60..f3cde537e 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -195,8 +195,8 @@ Control { an intermediate state. The accepted signal will only be sent if the text is in an acceptable state when enter is pressed. - Currently supported validators are \l{QtQuick2::IntValidator}, - \l{QtQuick2::DoubleValidator}, and \l{QtQuick2::RegExpValidator}. An + Currently supported validators are \l{QtQuick::}{IntValidator}, + \l{QtQuick::}{DoubleValidator}, and \l{QtQuick::}{RegExpValidator}. An example of using validators is shown below, which allows input of integers between 11 and 31 into the text field: diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml index 5ab7f68cb..2947093d2 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.qml @@ -82,6 +82,7 @@ AbstractCheckable { activeFocusOnTab: true + Accessible.name: text Accessible.role: Accessible.RadioButton /*! diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml index d8089174e..2397e5e40 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.qml @@ -312,7 +312,7 @@ import QtQuick.Controls.Private 1.0 contains the properties \c enterItem and \c exitItem. You set the target of your inner animations to those items. Since the same items instance can be pushed several times to a StackView, you should always override - \l {StackViewDelegate::transitionFinished(properties)}{StackViewDelegate.transitionFinished(properties)}. + \l {StackViewDelegate::transitionFinished()}{StackViewDelegate.transitionFinished()}. Implement this function to reset any properties animated on the exitItem so that later transitions can expect the items to be in a default state. @@ -360,7 +360,7 @@ import QtQuick.Controls.Private 1.0 \section2 Advanced usage When the StackView needs a new transition, it first calls - \l {StackViewDelegate::getTransition(properties)}{StackViewDelegate.getTransition(properties)}. + \l {StackViewDelegate::getTransition()}{StackViewDelegate.getTransition()}. The base implementation of this function just looks for a property named \c properties.name inside itself (root), which is how it finds \c {property Component pushTransition} in the examples above. diff --git a/src/controls/StackViewDelegate.qml b/src/controls/StackViewDelegate.qml index e77b82352..40f9437c8 100644 --- a/src/controls/StackViewDelegate.qml +++ b/src/controls/StackViewDelegate.qml @@ -47,8 +47,7 @@ import QtQuick 2.1 \brief A delegate used by StackView for loading transitions. - See the documentation for the \l {QtQuick.Controls1::StackView} {StackView} - component. + See the documentation for the \l {StackView} component. */ QtObject { diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index 30551f90d..a5ba2e755 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -90,7 +90,7 @@ QtObject { \li Text.ElideMiddle \li Text.ElideRight - the default \endlist - \sa {QtQuick2::}{Text::elide} */ + \sa {QtQuick::}{Text::elide} */ property int elideMode: Text.ElideRight /*! \qmlproperty enumeration TableViewColumn::horizontalAlignment @@ -102,7 +102,7 @@ QtObject { \li Text.AlignHCenter \li Text.AlignJustify \endlist - \sa {QtQuick2::}{Text::horizontalAlignment} */ + \sa {QtQuick::}{Text::horizontalAlignment} */ property int horizontalAlignment: Text.AlignLeft /*! The delegate of the column. This can be used to set the diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index e551d46e7..751e7ce0c 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -405,8 +405,6 @@ ScrollView { This property contains the link string when user hovers a link embedded in the text. The link must be in rich text or HTML format and the link string provides access to the particular link. - - \sa onLinkHovered */ readonly property alias hoveredLink: edit.hoveredLink @@ -718,7 +716,7 @@ ScrollView { wrapMode: TextEdit.WordWrap textMargin: 4 - selectByMouse: true + selectByMouse: Qt.platform.os !== "android" // Workaround for QTBUG-36515 readOnly: false Keys.forwardTo: area diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index d74ed0ac0..b173c95db 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -375,8 +375,8 @@ Control { an intermediate state. The accepted signal will only be sent if the text is in an acceptable state when enter is pressed. - Currently supported validators are \l{QtQuick2::IntValidator}, - \l{QtQuick2::DoubleValidator}, and \l{QtQuick2::RegExpValidator}. An + Currently supported validators are \l{QtQuick::}{IntValidator}, + \l{QtQuick::}{DoubleValidator}, and \l{QtQuick::}{RegExpValidator}. An example of using validators is shown below, which allows input of integers between 11 and 31 into the text input: @@ -582,7 +582,7 @@ Control { TextInput { id: textInput focus: true - selectByMouse: true + selectByMouse: Qt.platform.os !== "android" // Workaround for QTBUG-36515 selectionColor: __panel ? __panel.selectionColor : "darkred" selectedTextColor: __panel ? __panel.selectedTextColor : "white" diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index 4c97d5c85..4306477cf 100644 --- a/src/controls/doc/qtquickcontrols.qdocconf +++ b/src/controls/doc/qtquickcontrols.qdocconf @@ -29,7 +29,7 @@ qhp.QtQuickControls.subprojects.qtquickcontrolsstyles.title = Qt Quick Cont qhp.QtQuickControls.subprojects.qtquickcontrolsstyles.indexTitle = Qt Quick Controls Styles Structure qhp.QtQuickControls.subprojects.qtquickcontrolsstyles.type = manual -depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts +depends = qtqml qtquick qtgui qtwidgets qtdoc qtquicklayouts # Specify the install path under QT_INSTALL_EXAMPLES # Examples will be installed under quick/controls - 'controls' subdirectory |