diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-11 03:04:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-11 03:04:15 +0200 |
| commit | da150dacec8a2a68d290141b1e0ab268ce648edb (patch) | |
| tree | 7828854015bfd71d13dc737296d949974b7d94c3 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | 73fa64256eaad072cc64569e9a38a59d287a414a (diff) | |
| parent | 324ec97aa256549c56d506fd96c1e06c35fed1ae (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I2d9537a060ecbed1cc51dbebcc20b09753e41330
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 00ffe3ab..7bcb60fb 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -164,7 +164,7 @@ QT_BEGIN_NAMESPACE This signal is emitted when the \uicontrol Return or \uicontrol Enter key is pressed on an \l editable combo box. If the confirmed string is not currently in the model, - the \l currentIndex will be set to \c -1 and the \c currentText will be updated + the \l currentIndex will be set to \c -1 and the \l currentText will be updated accordingly. \note If there is a \l validator set on the combo box, the signal will only be @@ -935,7 +935,7 @@ void QQuickComboBox::setCurrentIndex(int index) This property holds the text of the current item in the combo box. - \sa currentIndex, displayText, textRole + \sa currentIndex, displayText, textRole, editText */ QString QQuickComboBox::currentText() const { @@ -1307,7 +1307,7 @@ void QQuickComboBox::setEditable(bool editable) This property holds the text in the text field of an editable combo box. - \sa editable + \sa editable, currentText, displayText */ QString QQuickComboBox::editText() const { |