diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 21:47:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-08 22:08:46 +0100 |
| commit | fbf674e566032121d6d0a865dbff2a5dac2b3f0d (patch) | |
| tree | 2558b67102a1942c513d209d31eb3608327c3a92 /src/qml/qml/qqmltypewrapper.cpp | |
| parent | 9d7b27f5bf44a46707e6d50ebf51ecf73f91dd1b (diff) | |
Remove v8engine usage in the value type provider
Change-Id: I6b26a8249175a86c6e15d000b24ba3300e112715
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypewrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index c0f9ca18f0..6cdc83a34b 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -71,7 +71,7 @@ QObject* QmlTypeWrapper::singletonObject() const if (!isSingleton()) return 0; - QQmlEngine *e = engine()->v8Engine->engine(); + QQmlEngine *e = engine()->qmlEngine(); QQmlType::SingletonInstanceInfo *siinfo = d()->type->singletonInstanceInfo(); siinfo->init(e); return siinfo->qobjectApi(e); @@ -80,7 +80,7 @@ QObject* QmlTypeWrapper::singletonObject() const QVariant QmlTypeWrapper::toVariant() const { if (d()->type && d()->type->isSingleton()) { - QQmlEngine *e = engine()->v8Engine->engine(); + QQmlEngine *e = engine()->qmlEngine(); QQmlType::SingletonInstanceInfo *siinfo = d()->type->singletonInstanceInfo(); siinfo->init(e); // note: this will also create QJSValue singleton which isn't strictly required. QObject *qobjectSingleton = siinfo->qobjectApi(e); @@ -143,7 +143,7 @@ ReturnedValue QmlTypeWrapper::get(Managed *m, String *name, bool *hasProperty) // singleton types are handled differently to other types. if (type->isSingleton()) { - QQmlEngine *e = v4->v8Engine->engine(); + QQmlEngine *e = v4->qmlEngine(); QQmlType::SingletonInstanceInfo *siinfo = type->singletonInstanceInfo(); siinfo->init(e); |