diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 18:47:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-01 09:10:26 +0200 |
| commit | 0e6ee136c91432d4ceeeda64e5a5fa88231398d4 (patch) | |
| tree | 6060e002af2900007895f6efa757989dd4c190c9 /src/corelib/itemmodels/qitemselectionmodel.h | |
| parent | 418869d9158ea5cd998ba30778b0b7173b48161b (diff) | |
| parent | 17294c5e4d15d5776f6e414b03671a4a9ed4993d (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/testlib/qtestblacklist.cpp
src/widgets/accessible/qaccessiblewidgets.cpp
Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
Diffstat (limited to 'src/corelib/itemmodels/qitemselectionmodel.h')
| -rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 09fab78214..4fe836c098 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -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; |