From f82ba75a3062cb2098ea88ea928d7236e3aaaa03 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 15 Oct 2013 13:58:52 +0200 Subject: 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 --- src/qml/qml/qqmlengine_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlengine_p.h') 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; -- cgit v1.2.3