diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 21:36:00 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-08 12:34:36 +0100 |
| commit | bede2a3ac794120be65fa50bfbc8ed04082c10e0 (patch) | |
| tree | aff8f266fdbacfc7a4acb78169522944c5dd64bb /src/qml/qml/qqmlcontextwrapper_p.h | |
| parent | 3e054a80dd4ac2c67c94d6f584d244f461d98269 (diff) | |
Remove qv8engine usage in the contextwrapper
Change-Id: Iaf807add5d971e96cac57e38e13385e901f9c930
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcontextwrapper_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h index 9dee1ef878..96c7bc9af4 100644 --- a/src/qml/qml/qqmlcontextwrapper_p.h +++ b/src/qml/qml/qqmlcontextwrapper_p.h @@ -68,7 +68,7 @@ namespace Heap { struct QQmlIdObjectsArray; struct QmlContextWrapper : Object { - QmlContextWrapper(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false); + QmlContextWrapper(ExecutionEngine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false); ~QmlContextWrapper(); bool readOnly; bool ownsContext; @@ -91,8 +91,8 @@ struct Q_QML_EXPORT QmlContextWrapper : Object V4_OBJECT2(QmlContextWrapper, Object) V4_NEEDS_DESTROY - static ReturnedValue qmlScope(QV8Engine *e, QQmlContextData *ctxt, QObject *scope); - static ReturnedValue urlScope(QV8Engine *e, const QUrl &); + static ReturnedValue qmlScope(ExecutionEngine *e, QQmlContextData *ctxt, QObject *scope); + static ReturnedValue urlScope(ExecutionEngine *v4, const QUrl &); static QQmlContextData *callingContext(ExecutionEngine *v4); static void takeContextOwnership(const ValueRef qmlglobal); @@ -110,7 +110,7 @@ struct Q_QML_EXPORT QmlContextWrapper : Object static void registerQmlDependencies(ExecutionEngine *context, const CompiledData::Function *compiledFunction); ReturnedValue idObjectsArray(); - ReturnedValue qmlSingletonWrapper(QV8Engine *e, String *name); + ReturnedValue qmlSingletonWrapper(ExecutionEngine *e, String *name); }; |