diff options
author | Dan Vrátil <dan@progdan.cz> | 2014-06-16 14:10:09 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-06-29 18:23:03 +0200 |
commit | 692c0d3526b4bd5e5b17e17b4a6547046c2bfcbc (patch) | |
tree | 940a3e84949468a47d1275aa38c2944d212ec9c2 /src/qml/types/qqmldelegatemodel_p.h | |
parent | e6bf3d444f3818145d7807ad37b6a0ab9f8d4a47 (diff) |
Fix QQmlDelegateModel ignoring layoutChange in certain situations
Fix a regression introduced by commit a0aefe1 which caused the model to
ignore layout changes if d->m_adaptorModel.rootIndex was just a descendant
of any of the parent indexes, or when no parent indexes at all were provided
in the notification.
Task-number: QTBUG-39492
Change-Id: I4c97929d25ef75947ccfcbbe5bc234096689c58d
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/qml/types/qqmldelegatemodel_p.h')
-rw-r--r-- | src/qml/types/qqmldelegatemodel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmldelegatemodel_p.h b/src/qml/types/qqmldelegatemodel_p.h index 0b67179163..53cc94bbdf 100644 --- a/src/qml/types/qqmldelegatemodel_p.h +++ b/src/qml/types/qqmldelegatemodel_p.h @@ -143,6 +143,8 @@ private Q_SLOTS: void _q_layoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint); private: + bool isDescendantOf(const QPersistentModelIndex &desc, const QList<QPersistentModelIndex> &parents) const; + Q_DISABLE_COPY(QQmlDelegateModel) }; |