1 files changed, 32 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index f101f352f1..8ab5c96c3a 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
@@ -93,6 +93,14 @@ struct QObjectMethod : FunctionObject {
     const QMetaObject *metaObject();
 };
 
+struct QMetaObjectWrapper : FunctionObject {
+    QMetaObjectWrapper(const QMetaObject* metaObject);
+    const QMetaObject* metaObject;
+    QVector<QQmlPropertyData> constructors;
+
+    void ensureConstructorsCache();
+};
+
 struct QmlSignalHandler : Object {
     QmlSignalHandler(QObject *object, int signalIndex);
     QPointer<QObject> object;
@@ -184,11 +192,33 @@ struct Q_QML_EXPORT QObjectMethod : public QV4::FunctionObject
     QV4::ReturnedValue method_toString(QV4::ExecutionContext *ctx) const;
     QV4::ReturnedValue method_destroy(QV4::ExecutionContext *ctx, const Value *args, int argc) const;
 
-    static ReturnedValue call(const Managed *, CallData *callData);
+    static void call(const Managed *, Scope &scope, CallData *callData);
 
-    ReturnedValue callInternal(CallData *callData) const;
+    void callInternal(CallData *callData, Scope &scope) const;
 
     static void markObjects(Heap::Base *that, QV4::ExecutionEngine *e);
+
+    static QPair<QObject *, int> extractQtMethod(const QV4::FunctionObject *function);
+};
+
+
+struct Q_QML_EXPORT QMetaObjectWrapper : public QV4::FunctionObject
+{
+    V4_OBJECT2(QMetaObjectWrapper, QV4::FunctionObject)
+    V4_NEEDS_DESTROY
+
+    static ReturnedValue create(ExecutionEngine *engine, const QMetaObject* metaObject);
+    static void construct(const Managed *, Scope &scope, CallData *callData);
+    static bool isEqualTo(Managed *a, Managed *b);
+
+    const QMetaObject *metaObject() const { return d()->metaObject; }
+
+private:
+    void init(ExecutionEngine *engine);
+    ReturnedValue constructInternal(CallData *callData) const;
+    ReturnedValue callConstructor(const QQmlPropertyData &data, QV4::ExecutionEngine *engine, QV4::CallData *callArgs) const;
+    ReturnedValue callOverloadedConstructor(QV4::ExecutionEngine *engine, QV4::CallData *callArgs) const;
+
 };
 
 struct Q_QML_EXPORT QmlSignalHandler : public QV4::Object