1 files changed, 72 insertions, 17 deletions

diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 260be26..9296779 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -159,7 +159,8 @@ enum PropertyFlags  {
     ResolveEditable = 0x00080000,
     User = 0x00100000,
     ResolveUser = 0x00200000,
-    Notify = 0x00400000
+    Notify = 0x00400000,
+    Dynamic = 0x00800000
 };
 
 enum MethodFlags  {
@@ -179,6 +180,10 @@ enum MethodFlags  {
     MethodScriptable = 0x40
 };
 
+enum MetaObjectFlags {
+    DynamicMetaObject = 0x01
+};
+
 struct QMetaObjectPrivate
 {
     int revision;
@@ -188,6 +193,7 @@ struct QMetaObjectPrivate
     int propertyCount, propertyData;
     int enumeratorCount, enumeratorData;
     int constructorCount, constructorData;
+    int flags;
 };
 
 static inline const QMetaObjectPrivate *priv(const uint* data)
@@ -271,6 +277,17 @@ int QMetaObject::static_metacall(Call cl, int idx, void **argv) const
 }
 
 /*!
+    \internal
+*/
+int QMetaObject::metacall(QObject *object, Call cl, int idx, void **argv)
+{
+    if (QMetaObject *mo = object->d_ptr->metaObject)
+        return static_cast<QAbstractDynamicMetaObject*>(mo)->metaCall(cl, idx, argv);
+    else
+        return object->qt_metacall(cl, idx, argv);
+}
+
+/*!
     \fn const char *QMetaObject::className() const
 
     Returns the class name.
@@ -690,6 +707,14 @@ int QMetaObject::indexOfProperty(const char *name) const
             }
         m = m->d.superdata;
     }
+
+    if (i == -1 && priv(this->d.data)->revision >= 3 && (priv(this->d.data)->flags & DynamicMetaObject)){
+        QAbstractDynamicMetaObject *me = 
+            const_cast<QAbstractDynamicMetaObject *>(static_cast<const QAbstractDynamicMetaObject *>(this));
+
+        i = me->createProperty(name, 0);
+    }
+
     return i;
 }
 
@@ -1320,6 +1345,16 @@ int QMetaMethod::attributes() const
 }
 
 /*!
+  Returns this method's index.
+*/
+int QMetaMethod::methodIndex() const
+{
+    if (!mobj)
+        return -1;
+    return ((handle - priv(mobj->d.data)->methodData) / 5) + mobj->methodOffset();
+}
+
+/*!
     Returns the access specification of this method (private,
     protected, or public).
 
@@ -1519,7 +1554,7 @@ bool QMetaMethod::invoke(QObject *object,
     // recompute the methodIndex by reversing the arithmetic in QMetaObject::property()
     int methodIndex = ((handle - priv(mobj->d.data)->methodData) / 5) + mobj->methodOffset();
     if (connectionType == Qt::DirectConnection) {
-        return object->qt_metacall(QMetaObject::InvokeMetaMethod, methodIndex, param) < 0;
+        return QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, methodIndex, param) < 0;
     } else {
         if (returnValue.data()) {
             qWarning("QMetaMethod::invoke: Unable to invoke methods with return values in "
@@ -2034,6 +2069,16 @@ int QMetaProperty::userType() const
 }
 
 /*!
+  Returns this property's index.
+*/
+int QMetaProperty::propertyIndex() const
+{
+    if (!mobj)
+        return -1;
+    return idx + mobj->propertyOffset();
+}
+
+/*!
     Returns true if the property's type is an enumeration value that
     is used as a flag; otherwise returns false.
 
@@ -2138,9 +2183,8 @@ QVariant QMetaProperty::read(const QObject *object) const
         value = QVariant(t, (void*)0);
         argv[0] = value.data();
     }
-    const_cast<QObject*>(object)->qt_metacall(QMetaObject::ReadProperty,
-                                              idx + mobj->propertyOffset(),
-                                              argv);
+    QMetaObject::metacall(const_cast<QObject*>(object), QMetaObject::ReadProperty,
+                          idx + mobj->propertyOffset(), argv);
     if (argv[1] == 0)
         // "value" was changed
         return value;
@@ -2205,7 +2249,7 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const
         argv[0] = &v;
     else
         argv[0] = v.data();
-    object->qt_metacall(QMetaObject::WriteProperty, idx + mobj->propertyOffset(), argv);
+    QMetaObject::metacall(object, QMetaObject::WriteProperty, idx + mobj->propertyOffset(), argv);
     return true;
 }
 
@@ -2222,7 +2266,7 @@ bool QMetaProperty::reset(QObject *object) const
     if (!object || !mobj || !isResettable())
         return false;
     void *argv[] = { 0 };
-    object->qt_metacall(QMetaObject::ResetProperty, idx + mobj->propertyOffset(), argv);
+    QMetaObject::metacall(object, QMetaObject::ResetProperty, idx + mobj->propertyOffset(), argv);
     return true;
 }
 
@@ -2334,8 +2378,8 @@ bool QMetaProperty::isDesignable(const QObject *object) const
     bool b = flags & Designable;
     if (object) {
         void *argv[] = { &b };
-        const_cast<QObject*>(object)->qt_metacall(QMetaObject::QueryPropertyDesignable,
-                                                  idx + mobj->propertyOffset(), argv);
+        QMetaObject::metacall(const_cast<QObject*>(object), QMetaObject::QueryPropertyDesignable,
+                              idx + mobj->propertyOffset(), argv);
     }
     return b;
 
@@ -2360,8 +2404,8 @@ bool QMetaProperty::isScriptable(const QObject *object) const
     bool b = flags & Scriptable;
     if (object) {
         void *argv[] = { &b };
-        const_cast<QObject*>(object)->qt_metacall(QMetaObject::QueryPropertyScriptable,
-                                                  idx + mobj->propertyOffset(), argv);
+        QMetaObject::metacall(const_cast<QObject*>(object), QMetaObject::QueryPropertyScriptable,
+                              idx + mobj->propertyOffset(), argv);
     }
     return b;
 }
@@ -2384,8 +2428,8 @@ bool QMetaProperty::isStored(const QObject *object) const
     bool b = flags & Stored;
     if (object) {
         void *argv[] = { &b };
-        const_cast<QObject*>(object)->qt_metacall(QMetaObject::QueryPropertyStored,
-                                                  idx + mobj->propertyOffset(), argv);
+        QMetaObject::metacall(const_cast<QObject*>(object), QMetaObject::QueryPropertyStored,
+                              idx + mobj->propertyOffset(), argv);
     }
     return b;
 }
@@ -2411,13 +2455,24 @@ bool QMetaProperty::isUser(const QObject *object) const
     bool b = flags & User;
     if (object) {
         void *argv[] = { &b };
-        const_cast<QObject*>(object)->qt_metacall(QMetaObject::QueryPropertyUser,
-                                                  idx + mobj->propertyOffset(), argv);
+        QMetaObject::metacall(const_cast<QObject*>(object), QMetaObject::QueryPropertyUser,
+                              idx + mobj->propertyOffset(), argv);
     }
     return b;
 }
 
 /*!
+    \internal
+*/
+bool QMetaProperty::isDynamic() const
+{
+    if (!mobj)
+        return false;
+    int flags = mobj->d.data[handle + 2];
+    return flags & Dynamic;
+}
+
+/*!
     \obsolete
 
     Returns true if the property is editable for the given \a object;
@@ -2437,8 +2492,8 @@ bool QMetaProperty::isEditable(const QObject *object) const
     bool b = flags & Editable;
     if (object) {
         void *argv[] = { &b };
-        const_cast<QObject*>(object)->qt_metacall(QMetaObject::QueryPropertyEditable,
-                                                  idx + mobj->propertyOffset(), argv);
+        QMetaObject::metacall(const_cast<QObject*>(object), QMetaObject::QueryPropertyEditable,
+                              idx + mobj->propertyOffset(), argv);
     }
     return b;
 }