diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-26 16:59:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 17:39:24 +0100 |
| commit | fd8981d835f298306a39c5d32b1050bf8f9b5653 (patch) | |
| tree | 36cbd0d0e6fd038fc4adff19b12a22c9e95ab99a /src/qml/qml/qqmlobjectcreator_p.h | |
| parent | e525b727f29adad1df3a6a81d6bba7c4617f78ba (diff) | |
[new compiler] Fix tst_qquickloader::deleteComponentCrash by introducing a watcher for self-deletion
Change-Id: I809a4860831847ab61c7ca0ba302057ec165ee24
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 5b7ee039c4..58cb55e633 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -47,6 +47,7 @@ #include <private/qqmlcompiler_p.h> #include <private/qqmltypecompiler_p.h> #include <private/qfinitestack_p.h> +#include <private/qrecursionwatcher_p.h> QT_BEGIN_NAMESPACE @@ -62,6 +63,7 @@ struct QQmlObjectCreatorSharedState QFiniteStack<QQmlParserStatus*> allParserStatusCallbacks; QQmlComponentAttached *componentAttached; QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks; + QRecursionNode recursionNode; }; class QQmlObjectCreator |