diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-12-04 14:06:59 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-12-12 09:03:56 +0000 |
| commit | 1d88e9919ff837d535f9bbde53613b6a6b96fcd8 (patch) | |
| tree | 759b83dcbcff472837c41872b70e7a7ba1ba4c86 /src/qml/qml/qqmlcontext_p.h | |
| parent | e3446c8225acbaa6a613d6c62e8e2fc58e2b70b0 (diff) | |
QML: Fix registering and unregistering of context objects
When we add a context object we need to include it into the list of
contextObjects of its outer context, so that the outerContext member can
be reset when the outer context disappears. On the flip side, we also
need to remove it from this list when the object gets removed. We don't
need to reset the inner context of an object when the outer context
disappears, though.
Fixes: QTBUG-72241
Change-Id: Ifd34650d852642a364df23b697d32e3961d0479b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcontext_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcontext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h index 290b7fc7ee..7e3cef8e1d 100644 --- a/src/qml/qml/qqmlcontext_p.h +++ b/src/qml/qml/qqmlcontext_p.h @@ -129,7 +129,7 @@ public: void setParent(QQmlContextData *, bool stronglyReferencedByParent = false); void refreshExpressions(); - void addObject(QObject *); + void addObject(QQmlData *data); QUrl resolvedUrl(const QUrl &); |