QML: Introduce destroy() on Base subclasses

This removes the destructors of subclasses of Base, making them nearly
trivial.

Change-Id: Ia6f7d467e87899b5ad37b8709a8f633a51689d59
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index 2b8c16f274..9e5ba4a10c 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -65,12 +65,12 @@ namespace Heap {
 
 struct QmlContextWrapper : Object {
     QmlContextWrapper(QQmlContextData *context, QObject *scopeObject, bool ownsContext = false);
-    ~QmlContextWrapper();
+    void destroy();
     bool readOnly;
     bool ownsContext;
     bool isNullWrapper;
 
-    QQmlGuardedContextData context;
+    QQmlGuardedContextData *context;
     QQmlQPointer<QObject> scopeObject;
 };
 
@@ -89,7 +89,7 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
     }
 
     inline QObject *getScopeObject() const { return d()->scopeObject; }
-    inline QQmlContextData *getContext() const { return d()->context; }
+    inline QQmlContextData *getContext() const { return *d()->context; }
 
     void setReadOnly(bool b) { d()->readOnly = b; }