diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-30 13:16:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-30 16:40:54 +0200 |
commit | 35ab04c907a1cefa23eff2d7c853350fb5d27178 (patch) | |
tree | 1386ad29598e3e0a38d8a70dd5536ffd91dd0576 /src/qml/qml/v8/qv8qobjectwrapper.cpp | |
parent | 2ce60b9fd8a01496d405fcc898e88da6f967e15e (diff) |
Port the type wrapper over to v4
Change-Id: Id442281a366914be818b068f70ebe5200c527254
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8qobjectwrapper.cpp')
-rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index 5277b37a78..fbe0461397 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -52,6 +52,7 @@ #include <private/qqmlaccessors_p.h> #include <private/qqmlexpression_p.h> #include <private/qqmlglobal_p.h> +#include <private/qqmltypewrapper_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4runtime_p.h> @@ -157,10 +158,9 @@ QV4::Value QObjectWrapper::get(Managed *m, ExecutionContext *ctx, String *name, if (r.scriptIndex != -1) { return QV4::Value::undefinedValue(); } else if (r.type) { - return v8engine->typeWrapper()->newObject(object, r.type, QV8TypeWrapper::ExcludeEnums)->v4Value(); + return QmlTypeWrapper::create(v8engine, object, r.type, QmlTypeWrapper::ExcludeEnums); } else if (r.importNamespace) { - return v8engine->typeWrapper()->newObject(object, context->imports, r.importNamespace, - QV8TypeWrapper::ExcludeEnums)->v4Value(); + return QmlTypeWrapper::create(v8engine, object, context->imports, r.importNamespace, QmlTypeWrapper::ExcludeEnums); } Q_ASSERT(!"Unreachable"); } |