diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-10-15 13:58:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 14:00:57 +0200 |
| commit | f82ba75a3062cb2098ea88ea928d7236e3aaaa03 (patch) | |
| tree | b32a8cfc5efd896764f51e4820d7dadfff0cefeb /src/qml/qml/qqmlengine_p.h | |
| parent | 5302fea533f68abbe91ffc32ec732c11c8eef7ee (diff) | |
Make QQmlIncubatorPrivate refcounted
This fixes possible bugs and crashes where the incubator
could get deleted through GC while constructing the
component.
Change-Id: Ibe0c5d4e172f0b5505ace0c3ea0369169b8b48a5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine_p.h')
| -rw-r--r-- | src/qml/qml/qqmlengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index c67e45a833..5a2d6c4e00 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -196,9 +196,9 @@ public: return uniqueId++; } - // Unfortunate workaround to avoid a circular dependency between + // Unfortunate workaround to avoid a circular dependency between // qqmlengine_p.h and qqmlincubator_p.h - struct Incubator { + struct Incubator : public QSharedData { QIntrusiveListNode next; // Unfortunate workaround for MSVC QIntrusiveListNode nextWaitingFor; |