diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-05 13:15:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-05 13:15:31 +0100 |
| commit | 954fe2c35d0b0435b7f0443d917a5145dfd0c2a4 (patch) | |
| tree | 13d2d5c76823fa2a3664f2a06219cd1fcc26f7a4 /src/widgets/itemviews/qheaderview.h | |
| parent | 70057dfc0e53b7996acd5ef2c0f9c40aa3f66062 (diff) | |
| parent | 681933c5b8656543c4974a1db5fde093f2934189 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ifce6ddeb4dab8c672732ec6aa6c19a6c4bce447e
Diffstat (limited to 'src/widgets/itemviews/qheaderview.h')
| -rw-r--r-- | src/widgets/itemviews/qheaderview.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index cfe2d24453..c09081cd80 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -251,9 +251,14 @@ protected: friend class QTreeView; private: + // ### Qt6: make them protected slots in QHeaderViewPrivate Q_PRIVATE_SLOT(d_func(), void _q_sectionsRemoved(const QModelIndex &parent, int logicalFirst, int logicalLast)) - Q_PRIVATE_SLOT(d_func(), void _q_sectionsAboutToBeChanged()) - Q_PRIVATE_SLOT(d_func(), void _q_sectionsChanged()) + Q_PRIVATE_SLOT(d_func(), void _q_sectionsAboutToBeMoved(const QModelIndex &sourceParent, int logicalStart, int logicalEnd, const QModelIndex &destinationParent, int logicalDestination)) + Q_PRIVATE_SLOT(d_func(), void _q_sectionsMoved(const QModelIndex &sourceParent, int logicalStart, int logicalEnd, const QModelIndex &destinationParent, int logicalDestination)) + Q_PRIVATE_SLOT(d_func(), void _q_sectionsAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), + QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint)) + Q_PRIVATE_SLOT(d_func(), void _q_sectionsChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), + QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint)) Q_DECLARE_PRIVATE(QHeaderView) Q_DISABLE_COPY(QHeaderView) }; |