diff options
| -rw-r--r-- | src/qmlmodels/qqmladaptormodel.cpp | 4 | ||||
| -rw-r--r-- | src/qmlmodels/qqmladaptormodel_p.h | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmldelegatemodel.cpp | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmltableinstancemodel.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qmlmodels/qqmladaptormodel.cpp b/src/qmlmodels/qqmladaptormodel.cpp index fe0ab6bcbc..9ee9c91cd4 100644 --- a/src/qmlmodels/qqmladaptormodel.cpp +++ b/src/qmlmodels/qqmladaptormodel.cpp @@ -962,7 +962,7 @@ QQmlAdaptorModel::~QQmlAdaptorModel() accessors->cleanup(*this); } -void QQmlAdaptorModel::setModel(const QVariant &variant, QObject *) +void QQmlAdaptorModel::setModel(const QVariant &variant) { accessors->cleanup(*this); @@ -1048,7 +1048,7 @@ void QQmlAdaptorModel::useImportVersion(QTypeRevision revision) void QQmlAdaptorModel::objectDestroyed(QObject *) { - setModel(QVariant(), nullptr); + setModel(QVariant()); } QQmlAdaptorModelEngineData::QQmlAdaptorModelEngineData(QV4::ExecutionEngine *v4) diff --git a/src/qmlmodels/qqmladaptormodel_p.h b/src/qmlmodels/qqmladaptormodel_p.h index a67561da6d..58991fbb15 100644 --- a/src/qmlmodels/qqmladaptormodel_p.h +++ b/src/qmlmodels/qqmladaptormodel_p.h @@ -125,7 +125,7 @@ public: ~QQmlAdaptorModel(); inline QVariant model() const { return list.list(); } - void setModel(const QVariant &variant, QObject *parent = nullptr); + void setModel(const QVariant &variant); void invalidateModel(); bool isValid() const; diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index e555e81261..142d180c08 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -550,7 +550,7 @@ void QQmlDelegateModel::setRootIndex(const QVariant &root) if (!d->m_adaptorModel.isValid() && d->m_adaptorModel.aim()) { // The previous root index was invalidated, so we need to reconnect the model. d->disconnectFromAbstractItemModel(); - d->m_adaptorModel.setModel(d->m_adaptorModel.list.list(), this); + d->m_adaptorModel.setModel(d->m_adaptorModel.list.list()); d->connectToAbstractItemModel(); } if (d->m_adaptorModel.canFetchMore()) diff --git a/src/qmlmodels/qqmltableinstancemodel.cpp b/src/qmlmodels/qqmltableinstancemodel.cpp index 10b44af90b..66bbe4cb17 100644 --- a/src/qmlmodels/qqmltableinstancemodel.cpp +++ b/src/qmlmodels/qqmltableinstancemodel.cpp @@ -461,7 +461,7 @@ void QQmlTableInstanceModel::setModel(const QVariant &model) drainReusableItemsPool(0); if (auto const aim = abstractItemModel()) disconnect(aim, &QAbstractItemModel::dataChanged, this, &QQmlTableInstanceModel::dataChangedCallback); - m_adaptorModel.setModel(model, this); + m_adaptorModel.setModel(model); if (auto const aim = abstractItemModel()) connect(aim, &QAbstractItemModel::dataChanged, this, &QQmlTableInstanceModel::dataChangedCallback); } |