1 files changed, 21 insertions, 6 deletions
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index 3b0ae04cc1..730bfd6d12 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -65,7 +65,7 @@ namespace QV4 {
 
 namespace Heap {
 
-struct QmlTypeWrapper : Object {
+struct QQmlTypeWrapper : Object {
     enum TypeNameMode {
         IncludeEnums,
         ExcludeEnums
@@ -81,11 +81,18 @@ struct QmlTypeWrapper : Object {
     const void *importNamespace;
 };
 
+struct QQmlScopedEnumWrapper : Object {
+    void init() { Object::init(); }
+    void destroy() { Object::destroy(); }
+    int scopeEnumIndex;
+    QQmlType *type;
+};
+
 }
 
-struct Q_QML_EXPORT QmlTypeWrapper : Object
+struct Q_QML_EXPORT QQmlTypeWrapper : Object
 {
-    V4_OBJECT2(QmlTypeWrapper, Object)
+    V4_OBJECT2(QQmlTypeWrapper, Object)
     V4_NEEDS_DESTROY
 
     bool isSingleton() const;
@@ -94,16 +101,24 @@ struct Q_QML_EXPORT QmlTypeWrapper : Object
     QVariant toVariant() const;
 
     static ReturnedValue create(ExecutionEngine *, QObject *, QQmlType *,
-                                Heap::QmlTypeWrapper::TypeNameMode = Heap::QmlTypeWrapper::IncludeEnums);
+                                Heap::QQmlTypeWrapper::TypeNameMode = Heap::QQmlTypeWrapper::IncludeEnums);
     static ReturnedValue create(ExecutionEngine *, QObject *, QQmlTypeNameCache *, const void *,
-                                Heap::QmlTypeWrapper::TypeNameMode = Heap::QmlTypeWrapper::IncludeEnums);
+                                Heap::QQmlTypeWrapper::TypeNameMode = Heap::QQmlTypeWrapper::IncludeEnums);
 
 
     static ReturnedValue get(const Managed *m, String *name, bool *hasProperty);
-    static void put(Managed *m, String *name, const Value &value);
+    static bool put(Managed *m, String *name, const Value &value);
     static PropertyAttributes query(const Managed *, String *name);
     static bool isEqualTo(Managed *that, Managed *o);
+    static ReturnedValue instanceOf(const Object *typeObject, const Value &var);
+};
 
+struct Q_QML_EXPORT QQmlScopedEnumWrapper : Object
+{
+    V4_OBJECT2(QQmlScopedEnumWrapper, Object)
+    V4_NEEDS_DESTROY
+
+    static ReturnedValue get(const Managed *m, String *name, bool *hasProperty);
 };
 
 }