diff options
Diffstat (limited to 'src/qml/types/qqmlobjectmodel.cpp')
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index dcd0360199..08740b4a6f 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -267,7 +267,7 @@ bool QQmlObjectModel::isValid() const return true; } -QObject *QQmlObjectModel::object(int index, bool) +QObject *QQmlObjectModel::object(int index, QQmlIncubator::IncubationMode) { Q_D(QQmlObjectModel); QQmlObjectModelPrivate::Item &item = d->children[index]; @@ -287,7 +287,7 @@ QQmlInstanceModel::ReleaseFlags QQmlObjectModel::release(QObject *item) if (!d->children[idx].deref()) return QQmlInstanceModel::Referenced; } - return 0; + return nullptr; } QString QQmlObjectModel::stringValue(int index, const QString &name) @@ -298,6 +298,11 @@ QString QQmlObjectModel::stringValue(int index, const QString &name) return QQmlEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString(); } +QQmlIncubator::Status QQmlObjectModel::incubationStatus(int) +{ + return QQmlIncubator::Ready; +} + int QQmlObjectModel::indexOf(QObject *item, QObject *) const { Q_D(const QQmlObjectModel); @@ -332,7 +337,7 @@ QObject *QQmlObjectModel::get(int index) const { Q_D(const QQmlObjectModel); if (index < 0 || index >= d->children.count()) - return 0; + return nullptr; return d->children.at(index).item; } |