diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-11-24 15:38:41 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-11 15:52:13 +0100 |
| commit | 8afc1f7fe24c625cdb84406cc7665f1dcabf88c4 (patch) | |
| tree | 04c5d73167544182e509ce7e40bd18c29909d0a7 /src/qml/jsruntime/qv4variantobject.cpp | |
| parent | 4322c8d7686c7cbbdf348146d32d705007b21d56 (diff) | |
Move prototype back from the vtable into Object
This is the only way we can support a GC that moves
objects around in memory.
Change-Id: I1d168fae4aa9f575b730e469e762bc5b5549b886
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4variantobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index fe23b8aa15..3e659eec5a 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -43,13 +43,8 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(VariantObject); -Heap::VariantObject::VariantObject(InternalClass *ic) - : Heap::Object(ic) -{ -} - Heap::VariantObject::VariantObject(QV4::ExecutionEngine *engine, const QVariant &value) - : Heap::Object(engine->variantClass) + : Heap::Object(engine->variantClass, engine->variantPrototype.asObject()) { data = value; if (isScarce()) |