summaryrefslogtreecommitdiff
path: root/src/controls/ComboBox.qml
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@theqtcompany.com>2015-03-12 10:02:36 +0100
committerCaroline Chao <caroline.chao@theqtcompany.com>2015-03-13 14:59:12 +0000
commit95abac09523df5f0563f46ceb5365f80cb87a18c (patch)
treecab91b55cebb14df0bfb20b44ec426b860308c4c /src/controls/ComboBox.qml
parentd04eb32908cfa7c6692bacfc292494b85ce3cd8a (diff)
downloadqtquickcontrols-95abac09523df5f0563f46ceb5365f80cb87a18c.tar.gz
Doc: Fix qml method signatures
So the return value and parameters can be seen in the documentation. + Fix minor doc issues Change-Id: I99e520c103bb0faeb88b26eb7b9ff73922851abc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/controls/ComboBox.qml')
-rw-r--r--src/controls/ComboBox.qml8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 9eb63fe7..7de1b738 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -166,7 +166,8 @@ Control {
*/
readonly property alias count: popupItems.count
- /*! Returns the text for a given \a index.
+ /*! \qmlmethod string ComboBox::textAt(int index)
+ Returns the text for a given \a index.
If an invalid index is provided, \c null is returned
\since QtQuick.Controls 1.1
*/
@@ -176,7 +177,8 @@ Control {
return popupItems.objectAt(index).text;
}
- /*! Finds and returns the index of a given \a text
+ /*! \qmlmethod int ComboBox::find(string text)
+ Finds and returns the index of a given \a text
If no match is found, \c -1 is returned. The search is case sensitive.
\since QtQuick.Controls 1.1
*/
@@ -298,7 +300,7 @@ Control {
signal activated(int index)
/*!
- \qmlmethod ComboBox::selectAll()
+ \qmlmethod void ComboBox::selectAll()
\since QtQuick.Controls 1.1
Causes all \l editText to be selected.