From bfa87b7bd8f8fb94889fd99ee413e69bc17f9e81 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 3 Jun 2016 13:44:24 +0200 Subject: Clean up property cache reference counting in QQmlVMEMetaObject When the intercepting functionality of the VME meta-object was split into the QQmlInterceptorMetaObject the property cache was moved as a member but the manual refcounting remained in the QQmlVMEMetaObject constructor and destructor. That's fragile and potential future sub-classes of the interceptor would have to do the same refcounting. Instead let's just store a QQmlRefPointer in the right place. Similar logic applies to the QQmlDesignerMetaObject, which had a copy of the property cache for now aparent reason. Change-Id: I7f6d3917fc5ef1c4beb065525be10bb9c0fadcf3 Reviewed-by: Thomas Hartmann Reviewed-by: Lars Knoll --- src/qml/qml/qqmlvmemetaobject_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlvmemetaobject_p.h') diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 41f454eb62..5aa141d026 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -111,7 +111,7 @@ protected: public: QObject *object; - QQmlPropertyCache *cache; + QQmlRefPointer cache; QBiPointer parent; QQmlPropertyValueInterceptor *interceptors; -- cgit v1.2.3