1 files changed, 11 insertions, 6 deletions
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index d28751d10a..25ff7ba7c8 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -61,6 +61,8 @@ QT_BEGIN_NAMESPACE
 
 class QQmlTypeNameCache;
 class QQmlType;
+class QQmlTypePrivate;
+struct QQmlImportRef;
 
 namespace QV4 {
 
@@ -77,16 +79,19 @@ struct QQmlTypeWrapper : Object {
     TypeNameMode mode;
     QQmlQPointer<QObject> object;
 
-    QQmlType *type;
+    QQmlType type() const;
+
+    QQmlTypePrivate *typePrivate;
     QQmlTypeNameCache *typeNamespace;
-    const void *importNamespace;
+    const QQmlImportRef *importNamespace;
 };
 
 struct QQmlScopedEnumWrapper : Object {
     void init() { Object::init(); }
-    void destroy() { Object::destroy(); }
+    void destroy();
     int scopeEnumIndex;
-    QQmlType *type;
+    QQmlTypePrivate *typePrivate;
+    QQmlType type() const;
 };
 
 }
@@ -101,9 +106,9 @@ struct Q_QML_EXPORT QQmlTypeWrapper : Object
 
     QVariant toVariant() const;
 
-    static ReturnedValue create(ExecutionEngine *, QObject *, QQmlType *,
+    static ReturnedValue create(ExecutionEngine *, QObject *, const QQmlType &,
                                 Heap::QQmlTypeWrapper::TypeNameMode = Heap::QQmlTypeWrapper::IncludeEnums);
-    static ReturnedValue create(ExecutionEngine *, QObject *, QQmlTypeNameCache *, const void *,
+    static ReturnedValue create(ExecutionEngine *, QObject *, QQmlTypeNameCache *, const QQmlImportRef *,
                                 Heap::QQmlTypeWrapper::TypeNameMode = Heap::QQmlTypeWrapper::IncludeEnums);