diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-09-07 13:31:14 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-09-27 08:37:39 +0000 |
| commit | c08423ac01be53a40226b30e62d2d50d1fca9fd5 (patch) | |
| tree | bf5803dcfd215b3f53f18e0479971cb2a4d3b5ad /src/qml/qml/qqmlcontextwrapper.cpp | |
| parent | 480037f2988f5b3010bd6a444cda8e28a24571fd (diff) | |
QML: Replace QPointer with a QQmlQPointer (which is trivial)
One of the steps needed to make QV4::Heap::structs trivial.
Change-Id: Ic4d73f15035af21c8a682aaad1ee68cdd91f8e7d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcontextwrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index 2d0ebad764..13d708bc17 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -66,14 +66,15 @@ Heap::QmlContextWrapper::QmlContextWrapper(QQmlContextData *context, QObject *sc , ownsContext(ownsContext) , isNullWrapper(false) , context(context) - , scopeObject(scopeObject) { + this->scopeObject.init(scopeObject); } Heap::QmlContextWrapper::~QmlContextWrapper() { if (context && ownsContext) context->destroy(); + scopeObject.destroy(); } ReturnedValue QmlContextWrapper::qmlScope(ExecutionEngine *v4, QQmlContextData *ctxt, QObject *scope) |