diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-05 11:30:18 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-05 15:54:53 +0100 |
commit | 483d09779c2719415c5ac421074a1af3bd66ca29 (patch) | |
tree | fcf1597fcd7401931100a925652c1e311c0d8396 /src/qmlmodels/qqmladaptormodel.cpp | |
parent | a7deb047d14170cf16160c748150471456e04af4 (diff) |
Remove QQmlEnginePrivate::isQObject
The only caller has a QMetaType available and can query that one. This
leads to subsequent cleanups in QQmlListAccessor::setList and
QQmlAdaptorModel::setModel which now no longer have a need to pass the
QQmlEngine along.
Task-number: QTBUG-82931
Change-Id: I6f38892a3a5098f07bc21f4eebcca82cf52a6838
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmlmodels/qqmladaptormodel.cpp')
-rw-r--r-- | src/qmlmodels/qqmladaptormodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qmlmodels/qqmladaptormodel.cpp b/src/qmlmodels/qqmladaptormodel.cpp index 83861d8526..4736101252 100644 --- a/src/qmlmodels/qqmladaptormodel.cpp +++ b/src/qmlmodels/qqmladaptormodel.cpp @@ -962,11 +962,11 @@ QQmlAdaptorModel::~QQmlAdaptorModel() accessors->cleanup(*this); } -void QQmlAdaptorModel::setModel(const QVariant &variant, QObject *parent, QQmlEngine *engine) +void QQmlAdaptorModel::setModel(const QVariant &variant, QObject *parent) { accessors->cleanup(*this); - list.setList(variant, engine); + list.setList(variant); if (QObject *object = qvariant_cast<QObject *>(list.list())) { setObject(object, parent); @@ -1042,7 +1042,7 @@ void QQmlAdaptorModel::useImportVersion(QTypeRevision revision) void QQmlAdaptorModel::objectDestroyed(QObject *) { - setModel(QVariant(), nullptr, nullptr); + setModel(QVariant(), nullptr); } QQmlAdaptorModelEngineData::QQmlAdaptorModelEngineData(QV4::ExecutionEngine *v4) |