diff options
Diffstat (limited to 'src/qml/types')
-rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 6732be9844..015458169a 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1049,16 +1049,16 @@ QObject *QQmlDelegateModelPrivate::object(Compositor::Group group, int index, QQ cacheItem->incubationTask->forceCompletion(); } } else if (!cacheItem->object) { - QQmlComponent *delegate = nullptr; + QQmlComponent *delegate = m_delegate; if (m_delegateChooser) { QQmlAbstractDelegateComponent *chooser = m_delegateChooser; do { delegate = chooser->delegate(&m_adaptorModel, index); chooser = qobject_cast<QQmlAbstractDelegateComponent *>(delegate); } while (chooser); + if (!delegate) + return nullptr; } - if (!delegate) - delegate = m_delegate; QQmlContext *creationContext = delegate->creationContext(); |