AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QItemSelectionModel: Make selectedIndexes a Q_PROPERTY.

Browse Source 
With reasoning similar to commit v5.5.0-alpha1~124 (Make the
QItemSelectionModel::selection a property., 2015-02-25), this should
be a property instead of a Q_INVOKABLE so that it can participate in
persistent bindings.

Change-Id: Ib9a7900dfa3acbd6f9f7df7b6f00deb6e05c3937
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
This commit is contained in:
Stephen Kelly 2015-03-20 10:19:00 +01:00 committed by Stephen Kelly
parent 1a1c2b6aaa
commit ebafb2f14b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/itemmodels/qitemselectionmodel.cpp
View File

@ -1734,6 +1734,11 @@ const QItemSelection QItemSelectionModel::selection() const
/*!
\since 5.5
\property QItemSelectionModel::selectedIndexes
*/
/*!
\since 5.5
\property QItemSelectionModel::model
\internal
*/

3
src/corelib/itemmodels/qitemselectionmodel.h
View File

@ -147,6 +147,7 @@ class Q_CORE_EXPORT QItemSelectionModel : public QObject
Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY selectionChanged STORED false DESIGNABLE false)
Q_PROPERTY(QModelIndex currentIndex READ currentIndex NOTIFY currentChanged STORED false DESIGNABLE false)
Q_PROPERTY(QItemSelection selection READ selection NOTIFY selectionChanged STORED false DESIGNABLE false)
Q_PROPERTY(QModelIndexList selectedIndexes READ selectedIndexes NOTIFY selectionChanged STORED false DESIGNABLE false)
Q_DECLARE_PRIVATE(QItemSelectionModel)
@ -184,7 +185,7 @@ public:
bool hasSelection() const;
Q_INVOKABLE QModelIndexList selectedIndexes() const;
QModelIndexList selectedIndexes() const;
Q_INVOKABLE QModelIndexList selectedRows(int column = 0) const;
Q_INVOKABLE QModelIndexList selectedColumns(int row = 0) const;
const QItemSelection selection() const;