diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:00:07 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-12 10:06:06 +0100 |
| commit | 1196b1ef6c5d2cb05ceba5d6f178dc7e2432ed61 (patch) | |
| tree | 2a99ee28d15d8ee51fc28096e5559bfc2d453e3f /src/qmlmodels/qqmlobjectmodel.cpp | |
| parent | fb54af6638dcbeae8ad21249fe234ef4d82c005b (diff) | |
| parent | ca206bceaff3667469986402e6143bf4c666b228 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/types/qqmlbind.cpp
Change-Id: Ib992d1a7ac6c1a96d39819be6f23955dc31b44b2
Diffstat (limited to 'src/qmlmodels/qqmlobjectmodel.cpp')
| -rw-r--r-- | src/qmlmodels/qqmlobjectmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmlmodels/qqmlobjectmodel.cpp b/src/qmlmodels/qqmlobjectmodel.cpp index 8e7b0a9b5f..85e64cc2f9 100644 --- a/src/qmlmodels/qqmlobjectmodel.cpp +++ b/src/qmlmodels/qqmlobjectmodel.cpp @@ -265,7 +265,7 @@ QObject *QQmlObjectModel::object(int index, QQmlIncubator::IncubationMode) return item.item; } -QQmlInstanceModel::ReleaseFlags QQmlObjectModel::release(QObject *item) +QQmlInstanceModel::ReleaseFlags QQmlObjectModel::release(QObject *item, ReusableFlag) { Q_D(QQmlObjectModel); int idx = d->indexOf(item); @@ -273,7 +273,7 @@ QQmlInstanceModel::ReleaseFlags QQmlObjectModel::release(QObject *item) if (!d->children[idx].deref()) return QQmlInstanceModel::Referenced; } - return nullptr; + return {}; } QVariant QQmlObjectModel::variantValue(int index, const QString &role) |