aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates/qquickcombobox.cpp
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2025-12-15 16:14:22 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2025-12-15 16:14:22 +0200
commitb58ec3b086518da5aa573f99426235854c23e35f (patch)
tree861a9935d8f1cdba2fdca546836a351736dbddbf /src/quicktemplates/qquickcombobox.cpp
parent4826f86e274f1b29bd769e6790824f9e62a40f62 (diff)
parent22032227d16c39211e2ebceef97d21f4d89c7c87 (diff)
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'src/quicktemplates/qquickcombobox.cpp')
-rw-r--r--src/quicktemplates/qquickcombobox.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/quicktemplates/qquickcombobox.cpp b/src/quicktemplates/qquickcombobox.cpp
index 6e08019000..d9832aaf94 100644
--- a/src/quicktemplates/qquickcombobox.cpp
+++ b/src/quicktemplates/qquickcombobox.cpp
@@ -1037,10 +1037,15 @@ void QQuickComboBox::setModel(const QVariant& m)
}
/*!
- \internal
+ \readonly
\qmlproperty model QtQuick.Controls::ComboBox::delegateModel
- This property holds the model providing delegate instances for the combo box.
+ This property holds the model that provides delegate instances for the combo box.
+
+ It is typically assigned to a \l ListView in the \l {Popup::}{contentItem}
+ of the \l popup.
+
+ \sa {Customizing ComboBox}
*/
QQmlInstanceModel *QQuickComboBox::delegateModel() const
{
@@ -1869,7 +1874,7 @@ QString QQuickComboBox::textAt(int index) const
\value Qt.MatchWildcard The search term matches using wildcards.
\value Qt.MatchFixedString The search term matches as a fixed string.
\value Qt.MatchStartsWith The search term matches the start of the item.
- \value Qt.MatchEndsWidth The search term matches the end of the item.
+ \value Qt.MatchEndsWith The search term matches the end of the item.
\value Qt.MatchContains The search term is contained in the item.
\value Qt.MatchCaseSensitive The search is case sensitive.