diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 09:08:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 09:08:35 +0200 |
commit | 5112821a37ab749f758e354e84703df2d09d5471 (patch) | |
tree | 8f19ba6e7661109675b5e1e9b0ddae94b4c96d4f /src/qml/types | |
parent | 5d2ea1d5e9d6e29a16d0e9333cfc2dc8e7c5b677 (diff) | |
parent | a3f686cf7cc14ff481b972b1170a7ff76d0e0fd0 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/quick/items/qquickitemsmodule.cpp
tools/qml/main.cpp
Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136
Diffstat (limited to 'src/qml/types')
-rw-r--r-- | src/qml/types/qqmlitemselectionmodel.qdoc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/qml/types/qqmlitemselectionmodel.qdoc b/src/qml/types/qqmlitemselectionmodel.qdoc index 7a61416153..185ffb5fa4 100644 --- a/src/qml/types/qqmlitemselectionmodel.qdoc +++ b/src/qml/types/qqmlitemselectionmodel.qdoc @@ -50,22 +50,31 @@ /*! \qmlproperty bool ItemSelectionModel::hasSelection + \readonly - Read-only property. It will trigger property binding updates every time - \l selectionChanged() is emitted, even though its value hasn't changed. + It will trigger property binding updates every time \l selectionChanged() + is emitted, even though its value hasn't changed. \sa selection(), selectedIndexes(), select(), selectionChanged() */ /*! \qmlproperty QModelIndex ItemSelectionModel::currentIndex + \readonly - Read-only property. Use \l setCurrentIndex() to set its value. + Use \l setCurrentIndex() to set its value. \sa setCurrentIndex(), currentChanged() */ /*! + \qmlproperty QModelIndexList ItemSelectionModel::selectedIndexes + \readonly + + Contains the list of all the indexes in the selection model. +*/ + +/*! \qmlmethod bool ItemSelectionModel::isSelected(QModelIndex index) */ @@ -86,10 +95,6 @@ */ /*! - \qmlmethod QModelIndexList ItemSelectionModel::selectedIndexes() -*/ - -/*! \qmlmethod QModelIndexList ItemSelectionModel::selectedRows(int column) */ |