diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-05 20:23:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:54 +0200 |
| commit | b11ec085703a0b019c8115ff505ee6e2553fd4f1 (patch) | |
| tree | 3336b31ba690f9b200b7fee8cc133aa4bf2e7837 /src/qml/jsruntime/qv4script.cpp | |
| parent | 05f17e841f971d3c8f635cc044c60c970c2055c9 (diff) | |
Move Managed data into it's own subclass
This prepares for moving over to a d pointer scheme,
where Managed subclasses don't hold any data directly. This
is required to be able to move over to a modern GC.
Change-Id: I3f59633ac07a7da461bd2d4f0f9f3a8e3b0baf02
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 36f61a1df5..dd7c35a0d4 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -66,13 +66,13 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, Function *f, Objec , qml(qml) , qmlContext(0) { - Q_ASSERT(scope->inUse); + Q_ASSERT(scope->inUse()); setVTable(staticVTable()); function = f; if (function) function->compilationUnit->ref(); - needsActivation = function ? function->needsActivation() : false; + managedData()->needsActivation = function ? function->needsActivation() : false; Scope s(scope); ScopedValue protectThis(s, this); @@ -88,11 +88,11 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, ObjectRef qml) , qml(qml) , qmlContext(0) { - Q_ASSERT(scope->inUse); + Q_ASSERT(scope->inUse()); setVTable(staticVTable()); function = 0; - needsActivation = false; + managedData()->needsActivation = false; Scope s(scope); ScopedValue protectThis(s, this); |