aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlincubator_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-10-15 13:58:52 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-15 14:00:57 +0200
commitf82ba75a3062cb2098ea88ea928d7236e3aaaa03 (patch)
treeb32a8cfc5efd896764f51e4820d7dadfff0cefeb /src/qml/qml/qqmlincubator_p.h
parent5302fea533f68abbe91ffc32ec732c11c8eef7ee (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/qqmlincubator_p.h')
-rw-r--r--src/qml/qml/qqmlincubator_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h
index 229919f37a..58e9c93f15 100644
--- a/src/qml/qml/qqmlincubator_p.h
+++ b/src/qml/qml/qqmlincubator_p.h
@@ -91,7 +91,7 @@ public:
QQmlVME vme;
QQmlVMEGuard vmeGuard;
- QQmlIncubatorPrivate *waitingOnMe;
+ QExplicitlySharedDataPointer<QQmlIncubatorPrivate> waitingOnMe;
typedef QQmlEnginePrivate::Incubator QIPBase;
QIntrusiveList<QIPBase, &QIPBase::nextWaitingFor> waitingFor;