diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-07-25 13:14:21 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-07-25 12:26:33 +0000 |
| commit | 9c515a6de24bc8d5709136cc099ceeae8e3e642c (patch) | |
| tree | 18420a862f38dab6dff9339af92b1169f031591c /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 6b8695dbdbb381566c28d5d10d9de14e8eb99205 (diff) | |
Do not (dis)connectNotify on dynamically created model item objects
These item objects are direct subclasses of QObject, and cannot
override connectNotify/disconnectNotify. This prevents the creation of
the backing QMetaObject during disconnect, which happens during
destruction, which in turn will call back into the model that is being
destroyed.
Task-number: QTBUG-59704
Change-Id: I7f997e5d2fda242b38e67b9147224d72aa4508ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index 646cc5ab3d..eeed272793 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -204,7 +204,7 @@ public: static void registerQmlDependencies(const QV4::CompiledData::Function *compiledFunction, const QV4::Scope &scope); void captureProperty(QQmlNotifier *, Duration duration = OnlyOnce); - void captureProperty(QObject *, int, int, Duration duration = OnlyOnce); + void captureProperty(QObject *, int, int, Duration duration = OnlyOnce, bool doNotify = true); QQmlEngine *engine; QQmlJavaScriptExpression *expression; |