diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-04 16:35:00 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-05 10:55:08 +0200 |
| commit | f0e32d311a791910acef672b1ab9a2ac4a80171e (patch) | |
| tree | b4af025e391eb84e8a5ec7e6ec550e35aeac5488 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | c0a79111f7c08b482338df05e047da1ddbf95c9b (diff) | |
Move QV8QObjectWrapper::newQObject into QV4::QObjectWrapper
...where it is just called wrap(), because it doesn't always create a new
JS wrapper for the QObject.
Change-Id: Ieed0fc97174eb51cd04df0149e715c234a5822bd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 108fb79abc..233533efb4 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -1207,8 +1207,8 @@ bool QQmlVMEMetaObject::ensureVarPropertiesAllocated() void QQmlVMEMetaObject::ensureQObjectWrapper() { QQmlEnginePrivate *ep = (ctxt == 0 || ctxt->engine == 0) ? 0 : QQmlEnginePrivate::get(ctxt->engine); - QV8Engine *v8e = (ep == 0) ? 0 : ep->v8engine(); - v8e->newQObject(object); + QV4::ExecutionEngine *v4 = (ep == 0) ? 0 : ep->v4engine(); + QV4::QObjectWrapper::wrap(v4, object); } void QQmlVMEMetaObject::mark() |