diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-20 11:23:01 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-21 06:33:11 +0000 |
| commit | 26e9c07650474a23817487e768bbebbb87bd78e4 (patch) | |
| tree | a287f36b018be08ad1c75d0d41cfef0a305c0d52 /src/qml/jsruntime/qv4qmlcontext_p.h | |
| parent | 3a7bd721edad972dd0691ff814b3417b4b5228a0 (diff) | |
Clean up QML worker scripts part 2
Now that we have one JS engine per worker script, we can get rid of the
per-script QML context and let the script simply run in the global
object, which is now also mutable.
Change-Id: I36d8616b85b2c0ff3a356ee7be9d242c3da624cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qmlcontext_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4qmlcontext_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4qmlcontext_p.h b/src/qml/jsruntime/qv4qmlcontext_p.h index b9061a3f58..4fe34a0a06 100644 --- a/src/qml/jsruntime/qv4qmlcontext_p.h +++ b/src/qml/jsruntime/qv4qmlcontext_p.h @@ -69,8 +69,6 @@ namespace Heap { struct QQmlContextWrapper : Object { void init(QQmlContextData *context, QObject *scopeObject); void destroy(); - bool readOnly; - bool isNullWrapper; QQmlContextDataRef *context; QQmlQPointer<QObject> scopeObject; @@ -96,8 +94,6 @@ struct Q_QML_EXPORT QQmlContextWrapper : Object inline QObject *getScopeObject() const { return d()->scopeObject; } inline QQmlContextData *getContext() const { return *d()->context; } - void setReadOnly(bool b) { d()->readOnly = b; } - static ReturnedValue virtualGet(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty); static bool virtualPut(Managed *m, PropertyKey id, const Value &value, Value *receiver); }; @@ -107,7 +103,6 @@ struct Q_QML_EXPORT QmlContext : public ExecutionContext V4_MANAGED(QmlContext, ExecutionContext) V4_INTERNALCLASS(QmlContext) - static Heap::QmlContext *createWorkerContext(QV4::ExecutionContext *parent, const QUrl &source, Value *sendFunction); static Heap::QmlContext *create(QV4::ExecutionContext *parent, QQmlContextData *context, QObject *scopeObject); QObject *qmlScope() const { |