diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-07-10 09:52:17 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2018-07-13 10:44:19 +0000 |
| commit | 9757d5f9c90988f81bca8ce395555765896711d0 (patch) | |
| tree | e7332c8a6976c2ce4296499fe02eda521fce81f4 /src/qml/types | |
| parent | ac6bb3170d86006832170377cd5f51ff809b4455 (diff) | |
QQmlDelegateModel: check if the delegate model adapts an AIM
The aim() function doesn't check if the model inside QQmlAdaptorModel
is a actually a QAbstractItemModel (it just does a static cast).
So we need to guard it.
Change-Id: I397280ea7e6f81939d4030d0512a3a67877ad94c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index deea6121f0..7aba0689d1 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -900,7 +900,8 @@ QObject *QQmlDelegateModel::parts() const QAbstractItemModel *QQmlDelegateModel::abstractItemModel() const { - return d_func()->m_adaptorModel.aim(); + Q_D(const QQmlDelegateModel); + return d->m_adaptorModel.adaptsAim() ? d->m_adaptorModel.aim() : nullptr; } void QQmlDelegateModelPrivate::emitCreatedPackage(QQDMIncubationTask *incubationTask, QQuickPackage *package) |