19cd7cf · unity8 · git.iko.soy

QQmlIntanceModel: use QQmlIncubator::IncubationMode instead of bool to specify incubation mode

commit19cd7cf0a1db2fabf8825040728cc8b095bb89a5 authorMarius Gripsgard <marius@ubports.com> dateTue 10 Apr 2018, 18:25 (9 years ago) parentcf47c66

2 files changed+2−2

unifiedsplit

plugins/Dash/abstractdashview.cpp+1−1

@@ -236,7 +236,7 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

236236 return nullptr;

237237

238238 m_asyncRequestedIndex = -1;

239− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

239+ QObject* object = m_delegateModel->object(modelIndex, asynchronous ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested);

240240 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

241241 if (!item) {

242242 if (object) {

plugins/Dash/listviewwithpageheader.cpp+1−1

@@ -871,7 +871,7 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

871871 return nullptr;

872872

873873 m_asyncRequestedIndex = -1;

874− QObject* object = m_delegateModel->object(modelIndex, asynchronous);

874+ QObject* object = m_delegateModel->object(modelIndex, asynchronous ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested);

875875 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

876876 if (!item) {

877877 if (object) {