Fix parts of workerscript

The worker script creates a special QmlContextWrapper
that doesn't contain many things found in the main thread.
However we still need to be able to cast to it, so it
should be the same class as the regular context wrapper.

Fixes parts of the worker script auto tests.

Change-Id: I3697b2b0080dc4ac967eb447e2efd0f28fbab465
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index 41026eed32..1ef8f7476d 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -90,24 +90,12 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
     QV8Engine *v8; // ### temporary, remove
     bool readOnly;
     bool ownsContext;
+    bool isNullWrapper;
 
     QQmlGuardedContextData context;
     QQmlGuard<QObject> scopeObject;
 };
 
-struct QmlContextNullWrapper : QmlContextWrapper
-{
-    Q_MANAGED
-    QmlContextNullWrapper(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false)
-        : QmlContextWrapper(engine, context, scopeObject, ownsContext)
-    {
-        vtbl = &static_vtbl;
-    }
-
-    using Object::get;
-    static void put(Managed *m, ExecutionContext *ctx, String *name, const Value &value);
-};
-
 }
 
 QT_END_NAMESPACE