Rename QDeclarativeMetaProperty -> QDeclarativeProperty

There's nothing meta about our properties.

24 files changed, 225 insertions, 226 deletions

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 720c562..cecca65 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -97,7 +97,7 @@ QDeclarativeBinding::~QDeclarativeBinding()
 {
 }
 
-void QDeclarativeBinding::setTarget(const QDeclarativeMetaProperty &prop)
+void QDeclarativeBinding::setTarget(const QDeclarativeProperty &prop)
 {
     Q_D(QDeclarativeBinding);
     d->bindingData()->property = prop;
@@ -105,13 +105,13 @@ void QDeclarativeBinding::setTarget(const QDeclarativeMetaProperty &prop)
     update();
 }
 
-QDeclarativeMetaProperty QDeclarativeBinding::property() const 
+QDeclarativeProperty QDeclarativeBinding::property() const 
 {
    Q_D(const QDeclarativeBinding);
    return d->bindingData()->property; 
 }
 
-void QDeclarativeBinding::update(QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
 
@@ -161,7 +161,7 @@ void QDeclarativeBinding::update(QDeclarativeMetaPropertyPrivate::WriteFlags fla
                 data->error.setDescription(QLatin1String("Unable to assign [undefined] to ") + QLatin1String(QMetaType::typeName(data->property.propertyType())));
 
             } else if (!isUndefined && data->property.object() && 
-                       !QDeclarativeMetaPropertyPrivate::write(data->property, value, flags)) {
+                       !QDeclarativePropertyPrivate::write(data->property, value, flags)) {
 
                 QUrl url = QUrl(data->url);
                 int line = data->line;
@@ -204,7 +204,7 @@ void QDeclarativeBindingPrivate::emitValueChanged()
     q->update();
 }
 
-void QDeclarativeBinding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeBinding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
     d->bindingData()->enabled = e;
@@ -300,7 +300,7 @@ QString QDeclarativeAbstractBinding::expression() const
     return QLatin1String("<Unknown>");
 }
 
-void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags)
+void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags)
 {
     if (e) m_mePtr = 0;
 }
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index ac174fa..f66b9c7 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -56,8 +56,8 @@
 #include "qdeclarative.h"
 #include "qdeclarativepropertyvaluesource.h"
 #include "qdeclarativeexpression.h"
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaProperty>
@@ -74,12 +74,12 @@ public:
 
     virtual QString expression() const;
 
-    void setEnabled(bool e) { setEnabled(e, QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
-    virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags) = 0;
+    void setEnabled(bool e) { setEnabled(e, QDeclarativePropertyPrivate::DontRemoveBinding); }
+    virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags) = 0;
     virtual int propertyIndex() = 0;
 
-    void update() { update(QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
-    virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags) = 0;
+    void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
+    virtual void update(QDeclarativePropertyPrivate::WriteFlags) = 0;
 
     void addToObject(QObject *);
     void removeFromObject();
@@ -89,8 +89,8 @@ protected:
 
 private:
     friend class QDeclarativeDeclarativeData;
-    friend class QDeclarativeMetaProperty;
-    friend class QDeclarativeMetaPropertyPrivate;
+    friend class QDeclarativeProperty;
+    friend class QDeclarativePropertyPrivate;
     friend class QDeclarativeVME;
 
     QObject *m_object;
@@ -110,19 +110,19 @@ public:
                QObject *parent);
     ~QDeclarativeBinding();
 
-    void setTarget(const QDeclarativeMetaProperty &);
-    QDeclarativeMetaProperty property() const;
+    void setTarget(const QDeclarativeProperty &);
+    QDeclarativeProperty property() const;
 
     bool enabled() const;
 
     // Inherited from  QDeclarativeAbstractBinding
-    virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+    virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags);
     virtual int propertyIndex();
-    virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+    virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
     virtual QString expression() const;
 
 public Q_SLOTS:
-    void update() { update(QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
+    void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
 
 protected:
     void emitValueChanged();
diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h
index ac88400..041103c 100644
--- a/src/declarative/qml/qdeclarativebinding_p_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p_p.h
@@ -55,7 +55,7 @@
 
 #include "qdeclarativebinding_p.h"
 
-#include "qdeclarativemetaproperty.h"
+#include "qdeclarativeproperty.h"
 #include "qdeclarativeexpression_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -69,7 +69,7 @@ public:
     bool updating:1;
     bool enabled:1;
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
 
     virtual void refresh();
 };
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index a88f02e..17937fd 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -109,9 +109,9 @@ public:
                     scope(0), target(0), parent(0) {}
 
         // Inherited from QDeclarativeAbstractBinding
-        virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+        virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags);
         virtual int propertyIndex();
-        virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+        virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
         virtual void destroy();
 
         int index:30;
@@ -244,7 +244,7 @@ QDeclarativeAbstractBinding *QDeclarativeCompiledBindings::configBinding(int ind
     return rv;
 }
 
-void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     if (e) {
         addToObject(target);
@@ -267,7 +267,7 @@ int QDeclarativeCompiledBindingsPrivate::Binding::propertyIndex()
     return property & 0xFFFF;
 }
 
-void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativeMetaPropertyPrivate::WriteFlags)
+void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativePropertyPrivate::WriteFlags)
 {
     parent->run(this);
 }
@@ -324,7 +324,7 @@ void QDeclarativeCompiledBindingsPrivate::run(Binding *binding)
         run(binding->index, cp, binding, binding->scope, target);
 
         vt->write(binding->target, binding->property & 0xFFFF, 
-                  QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                  QDeclarativePropertyPrivate::DontRemoveBinding);
     } else {
         run(binding->index, cp, binding, binding->scope, binding->target);
     }
@@ -1701,7 +1701,7 @@ bool QDeclarativeBindingCompilerPrivate::compile(QDeclarativeJS::AST::Node *node
             const QMetaObject *from = type.metaObject;
             const QMetaObject *to = engine->rawMetaObjectForType(destination->type);
 
-            if (QDeclarativeMetaPropertyPrivate::canConvert(from, to))
+            if (QDeclarativePropertyPrivate::canConvert(from, to))
                 type.type = destination->type;
         }
 
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 9ac65f9..9dc090b 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -58,7 +58,7 @@
 #include "parser/qdeclarativejsast_p.h"
 #include "qdeclarativevmemetaobject_p.h"
 #include "qdeclarativeexpression_p.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 #include "qdeclarativerewrite_p.h"
 #include "qdeclarativescriptstring.h"
 #include "qdeclarativeglobal_p.h"
@@ -2036,7 +2036,7 @@ bool QDeclarativeCompiler::buildPropertyObjectAssignment(QDeclarativeParser::Pro
         if (propertyMetaObject) {
             const QMetaObject *c = v->object->metatype;
             while(c) {
-                isAssignable |= (QDeclarativeMetaPropertyPrivate::equal(c, propertyMetaObject));
+                isAssignable |= (QDeclarativePropertyPrivate::equal(c, propertyMetaObject));
                 c = c->superClass();
             }
         }
@@ -2619,7 +2619,7 @@ int QDeclarativeCompiler::genValueTypeData(QDeclarativeParser::Property *valueTy
                                   QDeclarativeParser::Property *prop)
 {
     QByteArray data =
-        QDeclarativeMetaPropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
+        QDeclarativePropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
                                               QDeclarativeEnginePrivate::get(engine)->valueTypes[prop->type]->metaObject(), 
                                               valueTypeProp->index);
 //                valueTypeProp->index, valueTypeProp->type);
@@ -2629,7 +2629,7 @@ int QDeclarativeCompiler::genValueTypeData(QDeclarativeParser::Property *valueTy
 
 int QDeclarativeCompiler::genPropertyData(QDeclarativeParser::Property *prop)
 {
-    return output->indexForByteArray(QDeclarativeMetaPropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
+    return output->indexForByteArray(QDeclarativePropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
 }
 
 bool QDeclarativeCompiler::completeComponentBuild()
@@ -2735,7 +2735,7 @@ bool QDeclarativeCompiler::canCoerce(int to, QDeclarativeParser::Object *from)
     const QMetaObject *fromMo = from->metaObject();
 
     while (fromMo) {
-        if (QDeclarativeMetaPropertyPrivate::equal(fromMo, toMo))
+        if (QDeclarativePropertyPrivate::equal(fromMo, toMo))
             return true;
         fromMo = fromMo->superClass();
     }
@@ -2754,7 +2754,7 @@ bool QDeclarativeCompiler::canCoerce(int to, int from)
         QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(from);
 
     while (fromMo) {
-        if (QDeclarativeMetaPropertyPrivate::equal(fromMo, toMo))
+        if (QDeclarativePropertyPrivate::equal(fromMo, toMo))
             return true;
         fromMo = fromMo->superClass();
     }
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index aaf36e0..fe63ad2 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -698,8 +698,8 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri
                 state->bindValues.at(ii);
             for (int jj = 0; jj < bv.count; ++jj) {
                 if(bv.at(jj)) 
-                    bv.at(jj)->setEnabled(true, QDeclarativeMetaPropertyPrivate::BypassInterceptor | 
-                                                QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                    bv.at(jj)->setEnabled(true, QDeclarativePropertyPrivate::BypassInterceptor | 
+                                                QDeclarativePropertyPrivate::DontRemoveBinding);
             }
             QDeclarativeEnginePrivate::clear(bv);
         }
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 4435a5b..8abea4e 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -49,7 +49,6 @@
 #include "qdeclarativecontext.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativecomponent.h"
-#include "qdeclarativemetaproperty_p.h"
 #include "qdeclarativebinding_p_p.h"
 #include "qdeclarativevme_p.h"
 #include "qdeclarativeenginedebug_p.h"
@@ -110,7 +109,7 @@
 #define CSIDL_APPDATA		0x001a	// <username>\Application Data
 #endif
 
-Q_DECLARE_METATYPE(QDeclarativeMetaProperty)
+Q_DECLARE_METATYPE(QDeclarativeProperty)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index c4a40c5..2364315 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -62,7 +62,7 @@
 #include "qdeclarativevaluetype_p.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeexpression.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 #include "qdeclarativepropertycache_p.h"
 #include "qdeclarativeobjectscriptclass_p.h"
 #include "qdeclarativecontextscriptclass_p.h"
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 2ae0b54..09882cb 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -44,8 +44,8 @@
 #include "qdeclarativeboundsignal_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativemetatype_p.h"
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 #include "qdeclarativebinding_p.h"
 #include "qdeclarativecontext_p.h"
 #include "qdeclarativewatcher_p.h"
@@ -110,7 +110,7 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
     rv.name = QString::fromUtf8(prop.name());
     rv.hasNotifySignal = prop.hasNotifySignal();
     QDeclarativeAbstractBinding *binding = 
-        QDeclarativeMetaPropertyPrivate::binding(QDeclarativeMetaProperty(obj, rv.name));
+        QDeclarativePropertyPrivate::binding(QDeclarativeProperty(obj, rv.name));
     if (binding)
         rv.binding = binding->expression();
 
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
index 4c9586c..af720d7 100644
--- a/src/declarative/qml/qdeclarativelist.cpp
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativelist.h"
 #include "qdeclarativelist_p.h"
 #include "qdeclarativeengine_p.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -174,7 +174,7 @@ bool QDeclarativeListReference::append(QObject *o) const
 {
     if (!canAppend()) return false;
 
-    if (o && !QDeclarativeMetaPropertyPrivate::canConvert(o->metaObject(), d->elementType))
+    if (o && !QDeclarativePropertyPrivate::canConvert(o->metaObject(), d->elementType))
         return false;
 
     d->property.append(&d->property, o);
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index e87f8ba..abbb9d6 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -619,7 +619,7 @@ QDeclarativeType *QDeclarativeMetaType::qmlType(const QByteArray &name, int vers
 
     QList<QDeclarativeType*> types = data->nameToType.values(name);
     foreach (QDeclarativeType *t, types) {
-        // XXX version_major<0 just a kludge for QDeclarativeMetaPropertyPrivate::initProperty
+        // XXX version_major<0 just a kludge for QDeclarativePropertyPrivate::initProperty
         if (version_major<0 || t->availableInVersion(version_major,version_minor))
             return t;
     }
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 50fe5c0..542f417 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -338,7 +338,7 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
         }
     }
 
-    QDeclarativeAbstractBinding *delBinding = QDeclarativeMetaPropertyPrivate::setBinding(obj, *lastData, 0);
+    QDeclarativeAbstractBinding *delBinding = QDeclarativePropertyPrivate::setBinding(obj, *lastData, 0);
     if (delBinding)
         delBinding->destroy();
 
@@ -348,7 +348,7 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
     } else {
         // ### Can well known types be optimized?
         QVariant v = QDeclarativeScriptClass::toVariant(engine, value);
-        QDeclarativeMetaPropertyPrivate::write(obj, *lastData, v, evalContext);
+        QDeclarativePropertyPrivate::write(obj, *lastData, v, evalContext);
     }
 }
 
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index a976140..88f356d 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 
 #include "qdeclarativecompositetypedata_p.h"
 #include "qdeclarative.h"
@@ -62,32 +62,32 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QDeclarativeMetaProperty
-    \brief The QDeclarativeMetaProperty class abstracts accessing QML properties.
+    \class QDeclarativeProperty
+    \brief The QDeclarativeProperty class abstracts accessing QML properties.
     \internal
  */
 
 /*!
-    Create an invalid QDeclarativeMetaProperty.
+    Create an invalid QDeclarativeProperty.
 */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty()
-: d(new QDeclarativeMetaPropertyPrivate)
+QDeclarativeProperty::QDeclarativeProperty()
+: d(new QDeclarativePropertyPrivate)
 {
     d->q = this;
 }
 
 /*!  \internal */
-QDeclarativeMetaProperty::~QDeclarativeMetaProperty()
+QDeclarativeProperty::~QDeclarativeProperty()
 {
     delete d; d = 0;
 }
 
 /*!
-    Creates a QDeclarativeMetaProperty for the default property of \a obj. If there is no
-    default property, an invalid QDeclarativeMetaProperty will be created.
+    Creates a QDeclarativeProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeProperty will be created.
  */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj)
-: d(new QDeclarativeMetaPropertyPrivate)
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj)
+: d(new QDeclarativePropertyPrivate)
 {
     d->q = this;
     d->initDefault(obj);
@@ -95,11 +95,11 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj)
 
 /*!
     \internal
-    Creates a QDeclarativeMetaProperty for the default property of \a obj. If there is no
-    default property, an invalid QDeclarativeMetaProperty will be created.
+    Creates a QDeclarativeProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeProperty will be created.
  */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, QDeclarativeContext *ctxt)
-: d(new QDeclarativeMetaPropertyPrivate)
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeContext *ctxt)
+: d(new QDeclarativePropertyPrivate)
 {
     d->q = this;
     d->context = ctxt;
@@ -109,7 +109,7 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, QDeclarativeCon
 /*!
     Initialize from the default property of \a obj
 */
-void QDeclarativeMetaPropertyPrivate::initDefault(QObject *obj)
+void QDeclarativePropertyPrivate::initDefault(QObject *obj)
 {
     if (!obj)
         return;
@@ -123,10 +123,10 @@ void QDeclarativeMetaPropertyPrivate::initDefault(QObject *obj)
 }
 
 /*!
-    Creates a QDeclarativeMetaProperty for the property \a name of \a obj.
+    Creates a QDeclarativeProperty for the property \a name of \a obj.
  */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &name)
-: d(new QDeclarativeMetaPropertyPrivate)
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name)
+: d(new QDeclarativePropertyPrivate)
 {
     d->q = this;
     d->initProperty(obj, name);
@@ -135,10 +135,10 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &
 
 /*!
     \internal
-    Creates a QDeclarativeMetaProperty for the property \a name of \a obj.
+    Creates a QDeclarativeProperty for the property \a name of \a obj.
  */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
-: d(new QDeclarativeMetaPropertyPrivate)
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
+: d(new QDeclarativePropertyPrivate)
 {
     d->q = this;
     d->context = ctxt;
@@ -148,7 +148,7 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &
 
 Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
 
-void QDeclarativeMetaPropertyPrivate::initProperty(QObject *obj, const QString &name)
+void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name)
 {
     if (!obj) return;
 
@@ -256,14 +256,14 @@ void QDeclarativeMetaPropertyPrivate::initProperty(QObject *obj, const QString &
 /*!
     Create a copy of \a other.
 */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaProperty &other)
-: d(new QDeclarativeMetaPropertyPrivate(*other.d))
+QDeclarativeProperty::QDeclarativeProperty(const QDeclarativeProperty &other)
+: d(new QDeclarativePropertyPrivate(*other.d))
 {
     d->q = this;
 }
 
 /*!
-  \enum QDeclarativeMetaProperty::PropertyTypeCategory
+  \enum QDeclarativeProperty::PropertyTypeCategory
 
   This enum specifies a category of QML property.
 
@@ -274,7 +274,7 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaPropert
  */
 
 /*!
-  \enum QDeclarativeMetaProperty::Type
+  \enum QDeclarativeProperty::Type
 
   This enum specifies a type of QML property.
 
@@ -287,32 +287,32 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaPropert
 /*!
     Returns the property category.
 */
-QDeclarativeMetaProperty::PropertyTypeCategory QDeclarativeMetaProperty::propertyTypeCategory() const
+QDeclarativeProperty::PropertyTypeCategory QDeclarativeProperty::propertyTypeCategory() const
 {
     return d->propertyTypeCategory();
 }
 
-QDeclarativeMetaProperty::PropertyTypeCategory 
-QDeclarativeMetaPropertyPrivate::propertyTypeCategory() const
+QDeclarativeProperty::PropertyTypeCategory 
+QDeclarativePropertyPrivate::propertyTypeCategory() const
 {
     uint type = q->type();
 
-    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
-        return QDeclarativeMetaProperty::Normal;
-    } else if (type & QDeclarativeMetaProperty::Property) {
+    if (type & QDeclarativeProperty::ValueTypeProperty) {
+        return QDeclarativeProperty::Normal;
+    } else if (type & QDeclarativeProperty::Property) {
         int type = propertyType();
         if (type == QVariant::Invalid)
-            return QDeclarativeMetaProperty::InvalidCategory;
+            return QDeclarativeProperty::InvalidCategory;
         else if ((uint)type < QVariant::UserType)
-            return QDeclarativeMetaProperty::Normal;
+            return QDeclarativeProperty::Normal;
         else if (core.flags & QDeclarativePropertyCache::Data::IsQObjectDerived)
-            return QDeclarativeMetaProperty::Object;
+            return QDeclarativeProperty::Object;
         else if (core.flags & QDeclarativePropertyCache::Data::IsQList)
-            return QDeclarativeMetaProperty::List;
+            return QDeclarativeProperty::List;
         else 
-            return QDeclarativeMetaProperty::Normal;
+            return QDeclarativeProperty::Normal;
     } else {
-        return QDeclarativeMetaProperty::InvalidCategory;
+        return QDeclarativeProperty::InvalidCategory;
     }
 }
 
@@ -320,7 +320,7 @@ QDeclarativeMetaPropertyPrivate::propertyTypeCategory() const
     Returns the type name of the property, or 0 if the property has no type
     name.
 */
-const char *QDeclarativeMetaProperty::propertyTypeName() const
+const char *QDeclarativeProperty::propertyTypeName() const
 {
     if (type() & ValueTypeProperty) {
 
@@ -343,10 +343,10 @@ const char *QDeclarativeMetaProperty::propertyTypeName() const
 }
 
 /*!
-    Returns true if \a other and this QDeclarativeMetaProperty represent the same 
+    Returns true if \a other and this QDeclarativeProperty represent the same 
     property.
 */
-bool QDeclarativeMetaProperty::operator==(const QDeclarativeMetaProperty &other) const
+bool QDeclarativeProperty::operator==(const QDeclarativeProperty &other) const
 {
     // category is intentially omitted here as it is generated 
     // from the other members
@@ -359,17 +359,17 @@ bool QDeclarativeMetaProperty::operator==(const QDeclarativeMetaProperty &other)
     Returns the QVariant type of the property, or QVariant::Invalid if the 
     property has no QVariant type.
 */
-int QDeclarativeMetaProperty::propertyType() const
+int QDeclarativeProperty::propertyType() const
 {
     return d->propertyType();
 }
 
-int QDeclarativeMetaPropertyPrivate::propertyType() const
+int QDeclarativePropertyPrivate::propertyType() const
 {
     uint type = q->type();
-    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
+    if (type & QDeclarativeProperty::ValueTypeProperty) {
         return valueType.valueTypePropType;
-    } else if (type & QDeclarativeMetaProperty::Property) {
+    } else if (type & QDeclarativeProperty::Property) {
         if (core.propType == (int)QVariant::LastType)
             return qMetaTypeId<QVariant>();
         else
@@ -382,7 +382,7 @@ int QDeclarativeMetaPropertyPrivate::propertyType() const
 /*!
     Returns the type of the property.
 */
-QDeclarativeMetaProperty::Type QDeclarativeMetaProperty::type() const
+QDeclarativeProperty::Type QDeclarativeProperty::type() const
 {
     if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
         return SignalProperty;
@@ -395,33 +395,33 @@ QDeclarativeMetaProperty::Type QDeclarativeMetaProperty::type() const
 }
 
 /*!
-    Returns true if this QDeclarativeMetaProperty represents a regular Qt property.
+    Returns true if this QDeclarativeProperty represents a regular Qt property.
 */
-bool QDeclarativeMetaProperty::isProperty() const
+bool QDeclarativeProperty::isProperty() const
 {
     return type() & Property;
 }
 
 /*!
-    Returns true if this QDeclarativeMetaProperty represents a default property.
+    Returns true if this QDeclarativeProperty represents a default property.
 */
-bool QDeclarativeMetaProperty::isDefault() const
+bool QDeclarativeProperty::isDefault() const
 {
     return type() & Default;
 }
 
 /*!
-    Returns the QDeclarativeMetaProperty's QObject.
+    Returns the QDeclarativeProperty's QObject.
 */
-QObject *QDeclarativeMetaProperty::object() const
+QObject *QDeclarativeProperty::object() const
 {
     return d->object;
 }
 
 /*!
-    Assign \a other to this QDeclarativeMetaProperty.
+    Assign \a other to this QDeclarativeProperty.
 */
-QDeclarativeMetaProperty &QDeclarativeMetaProperty::operator=(const QDeclarativeMetaProperty &other)
+QDeclarativeProperty &QDeclarativeProperty::operator=(const QDeclarativeProperty &other)
 {
     d->context = other.d->context;
     d->object = other.d->object;
@@ -439,9 +439,9 @@ QDeclarativeMetaProperty &QDeclarativeMetaProperty::operator=(const QDeclarative
 /*!
     Returns true if the property is writable, otherwise false.
 */
-bool QDeclarativeMetaProperty::isWritable() const
+bool QDeclarativeProperty::isWritable() const
 {
-    QDeclarativeMetaProperty::PropertyTypeCategory category = propertyTypeCategory();
+    QDeclarativeProperty::PropertyTypeCategory category = propertyTypeCategory();
 
     if (!d->object)
         return false;
@@ -458,7 +458,7 @@ bool QDeclarativeMetaProperty::isWritable() const
 /*!
     Returns true if the property is designable, otherwise false.
 */
-bool QDeclarativeMetaProperty::isDesignable() const
+bool QDeclarativeProperty::isDesignable() const
 {
     if (type() & Property && d->core.isValid() && d->object)
         return d->object->metaObject()->property(d->core.coreIndex).isDesignable();
@@ -469,7 +469,7 @@ bool QDeclarativeMetaProperty::isDesignable() const
 /*!
     Returns true if the property is resettable, otherwise false.
 */
-bool QDeclarativeMetaProperty::isResettable() const
+bool QDeclarativeProperty::isResettable() const
 {
     if (type() & Property && d->core.isValid() && d->object)
         return d->core.flags & QDeclarativePropertyCache::Data::IsResettable;
@@ -478,10 +478,10 @@ bool QDeclarativeMetaProperty::isResettable() const
 }
 
 /*!
-    Returns true if the QDeclarativeMetaProperty refers to a valid property, otherwise
+    Returns true if the QDeclarativeProperty refers to a valid property, otherwise
     false.
 */
-bool QDeclarativeMetaProperty::isValid() const
+bool QDeclarativeProperty::isValid() const
 {
     return type() != Invalid;
 }
@@ -489,7 +489,7 @@ bool QDeclarativeMetaProperty::isValid() const
 /*!
     Return the name of this QML property.
 */
-QString QDeclarativeMetaProperty::name() const
+QString QDeclarativeProperty::name() const
 {
     if (!d->isNameCached) {
         // ###
@@ -525,7 +525,7 @@ QString QDeclarativeMetaProperty::name() const
   Returns the \l{QMetaProperty} {Qt property} associated with
   this QML property.
  */
-QMetaProperty QDeclarativeMetaProperty::property() const
+QMetaProperty QDeclarativeProperty::property() const
 {
     if (type() & Property && d->core.isValid() && d->object)
         return d->object->metaObject()->property(d->core.coreIndex);
@@ -537,7 +537,7 @@ QMetaProperty QDeclarativeMetaProperty::property() const
     Return the QMetaMethod for this property if it is a SignalProperty, 
     otherwise returns an invalid QMetaMethod.
 */
-QMetaMethod QDeclarativeMetaProperty::method() const
+QMetaMethod QDeclarativeProperty::method() const
 {
     if (type() & SignalProperty && d->object)
         return d->object->metaObject()->method(d->core.coreIndex);
@@ -551,7 +551,7 @@ QMetaMethod QDeclarativeMetaProperty::method() const
     exists.
 */
 QDeclarativeAbstractBinding *
-QDeclarativeMetaPropertyPrivate::binding(const QDeclarativeMetaProperty &that) 
+QDeclarativePropertyPrivate::binding(const QDeclarativeProperty &that) 
 {
     if (!that.isProperty() || !that.d->object)
         return 0;
@@ -587,7 +587,7 @@ QDeclarativeMetaPropertyPrivate::binding(const QDeclarativeMetaProperty &that)
     the binding sets the intial value, it will use these flags for the write).
 */
 QDeclarativeAbstractBinding *
-QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that,
+QDeclarativePropertyPrivate::setBinding(const QDeclarativeProperty &that,
                                             QDeclarativeAbstractBinding *newBinding, 
                                             WriteFlags flags) 
 {
@@ -601,7 +601,7 @@ QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that
 }
 
 QDeclarativeAbstractBinding *
-QDeclarativeMetaPropertyPrivate::setBinding(QObject *object, const QDeclarativePropertyCache::Data &core, 
+QDeclarativePropertyPrivate::setBinding(QObject *object, const QDeclarativePropertyCache::Data &core, 
                                    QDeclarativeAbstractBinding *newBinding, WriteFlags flags)
 {
     QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, 0 != newBinding);
@@ -634,9 +634,9 @@ QDeclarativeMetaPropertyPrivate::setBinding(QObject *object, const QDeclarativeP
     signal expression exists.
 */
 QDeclarativeExpression *
-QDeclarativeMetaPropertyPrivate::signalExpression(const QDeclarativeMetaProperty &that)
+QDeclarativePropertyPrivate::signalExpression(const QDeclarativeProperty &that)
 {
-    if (!(that.type() & QDeclarativeMetaProperty::SignalProperty))
+    if (!(that.type() & QDeclarativeProperty::SignalProperty))
         return 0;
 
     const QObjectList &children = that.d->object->children();
@@ -660,10 +660,10 @@ QDeclarativeMetaPropertyPrivate::signalExpression(const QDeclarativeMetaProperty
     assumed by the caller.
 */
 QDeclarativeExpression *
-QDeclarativeMetaPropertyPrivate::setSignalExpression(const QDeclarativeMetaProperty &that,
+QDeclarativePropertyPrivate::setSignalExpression(const QDeclarativeProperty &that,
                                                      QDeclarativeExpression *expr) 
 {
-    if (!(that.type() & QDeclarativeMetaProperty::SignalProperty)) {
+    if (!(that.type() & QDeclarativeProperty::SignalProperty)) {
         delete expr;
         return 0;
     }
@@ -686,7 +686,7 @@ QDeclarativeMetaPropertyPrivate::setSignalExpression(const QDeclarativeMetaPrope
     }
 }
 
-QMetaMethod QDeclarativeMetaPropertyPrivate::findSignal(QObject *obj, const QString &name)
+QMetaMethod QDeclarativePropertyPrivate::findSignal(QObject *obj, const QString &name)
 {
     const QMetaObject *mo = obj->metaObject();
 
@@ -706,7 +706,7 @@ QMetaMethod QDeclarativeMetaPropertyPrivate::findSignal(QObject *obj, const QStr
 /*!
     Returns the property value.
 */
-QVariant QDeclarativeMetaProperty::read() const
+QVariant QDeclarativeProperty::read() const
 {
     if (!d->object)
         return QVariant();
@@ -723,10 +723,10 @@ QVariant QDeclarativeMetaProperty::read() const
     return QVariant();
 }
 
-QVariant QDeclarativeMetaPropertyPrivate::readValueProperty()
+QVariant QDeclarativePropertyPrivate::readValueProperty()
 {
     uint type = q->type();
-    if(type & QDeclarativeMetaProperty::ValueTypeProperty) {
+    if(type & QDeclarativeProperty::ValueTypeProperty) {
 
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
         QDeclarativeValueType *valueType = 0;
@@ -759,7 +759,7 @@ QVariant QDeclarativeMetaPropertyPrivate::readValueProperty()
 //###
 //writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC!
 //###
-bool QDeclarativeMetaPropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
+bool QDeclarativePropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
 {
     if (!object || !prop.isWritable())
         return false;
@@ -796,7 +796,7 @@ bool QDeclarativeMetaPropertyPrivate::writeEnumProperty(const QMetaProperty &pro
     return status;
 }
 
-bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value, WriteFlags flags)
+bool QDeclarativePropertyPrivate::writeValueProperty(const QVariant &value, WriteFlags flags)
 {
     // Remove any existing bindings on this property
     if (!(flags & DontRemoveBinding)) {
@@ -806,7 +806,7 @@ bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value,
 
     bool rv = false;
     uint type = q->type();
-    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
+    if (type & QDeclarativeProperty::ValueTypeProperty) {
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
 
         QDeclarativeValueType *writeBack = 0;
@@ -836,7 +836,7 @@ bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value,
     return rv;
 }
 
-bool QDeclarativeMetaPropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property, 
+bool QDeclarativePropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property, 
                                             const QVariant &value, QDeclarativeContext *context, 
                                             WriteFlags flags)
 {
@@ -991,7 +991,7 @@ bool QDeclarativeMetaPropertyPrivate::write(QObject *object, const QDeclarativeP
     return true;
 }
 
-const QMetaObject *QDeclarativeMetaPropertyPrivate::rawMetaObjectForType(QDeclarativeEnginePrivate *engine, int userType)
+const QMetaObject *QDeclarativePropertyPrivate::rawMetaObjectForType(QDeclarativeEnginePrivate *engine, int userType)
 {
     if (engine) {
         return engine->rawMetaObjectForType(userType);
@@ -1004,15 +1004,15 @@ const QMetaObject *QDeclarativeMetaPropertyPrivate::rawMetaObjectForType(QDeclar
 /*!
     Set the property value to \a value.
 */
-bool QDeclarativeMetaProperty::write(const QVariant &value) const
+bool QDeclarativeProperty::write(const QVariant &value) const
 {
-    return QDeclarativeMetaPropertyPrivate::write(*this, value, 0);
+    return QDeclarativePropertyPrivate::write(*this, value, 0);
 }
 
 /*!
     Resets the property value.
 */
-bool QDeclarativeMetaProperty::reset() const
+bool QDeclarativeProperty::reset() const
 {
     if (isResettable()) {
         void *args[] = { 0 };
@@ -1023,10 +1023,10 @@ bool QDeclarativeMetaProperty::reset() const
     }
 }
 
-bool QDeclarativeMetaPropertyPrivate::write(const QDeclarativeMetaProperty &that,
+bool QDeclarativePropertyPrivate::write(const QDeclarativeProperty &that,
                                             const QVariant &value, WriteFlags flags) 
 {
-    if (that.d->object && that.type() & QDeclarativeMetaProperty::Property && 
+    if (that.d->object && that.type() & QDeclarativeProperty::Property && 
         that.d->core.isValid() && that.isWritable()) 
         return that.d->writeValueProperty(value, flags);
     else 
@@ -1036,7 +1036,7 @@ bool QDeclarativeMetaPropertyPrivate::write(const QDeclarativeMetaProperty &that
 /*!
     Returns true if the property has a change notifier signal, otherwise false.
 */
-bool QDeclarativeMetaProperty::hasChangedNotifier() const
+bool QDeclarativeProperty::hasChangedNotifier() const
 {
     if (type() & Property && d->object) {
         return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
@@ -1051,7 +1051,7 @@ bool QDeclarativeMetaProperty::hasChangedNotifier() const
     Some properties, such as attached properties or those whose value never 
     changes, do not require a change notifier.
 */
-bool QDeclarativeMetaProperty::needsChangedNotifier() const
+bool QDeclarativeProperty::needsChangedNotifier() const
 {
     return type() & Property && !property().isConstant();
 }
@@ -1064,7 +1064,7 @@ bool QDeclarativeMetaProperty::needsChangedNotifier() const
     change notifier signal, or if the \a dest object does
     not have the specified \a method.
 */
-bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, int method) const
+bool QDeclarativeProperty::connectNotifier(QObject *dest, int method) const
 {
     if (!(type() & Property) || !d->object)
         return false;
@@ -1085,7 +1085,7 @@ bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, int method) const
     change notifier signal, or if the \a dest object does
     not have the specified \a slot.
 */
-bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, const char *slot) const
+bool QDeclarativeProperty::connectNotifier(QObject *dest, const char *slot) const
 {
     if (!(type() & Property) || !d->object)
         return false;
@@ -1102,18 +1102,18 @@ bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, const char *slot)
 /*!
     Return the Qt metaobject index of the property.
 */
-int QDeclarativeMetaProperty::coreIndex() const
+int QDeclarativeProperty::coreIndex() const
 {
     return d->core.coreIndex;
 }
 
-int QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(const QDeclarativeMetaProperty &that)
+int QDeclarativePropertyPrivate::valueTypeCoreIndex(const QDeclarativeProperty &that)
 {
     return that.d->valueType.valueTypeCoreIdx;
 }
 
 struct SerializedData {
-    QDeclarativeMetaProperty::Type type;
+    QDeclarativeProperty::Type type;
     QDeclarativePropertyCache::Data core;
 };
 
@@ -1121,14 +1121,14 @@ struct ValueTypeSerializedData : public SerializedData {
     QDeclarativePropertyCache::ValueTypeData valueType;
 };
 
-QByteArray QDeclarativeMetaPropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
+QByteArray QDeclarativePropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
                                                  const QMetaObject *subObject, int subIndex)
 {
     QMetaProperty prop = metaObject->property(index);
     QMetaProperty subProp = subObject->property(subIndex);
 
     ValueTypeSerializedData sd;
-    sd.type = QDeclarativeMetaProperty::ValueTypeProperty;
+    sd.type = QDeclarativeProperty::ValueTypeProperty;
     sd.core.load(metaObject->property(index));
     sd.valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(subProp);
     sd.valueType.valueTypeCoreIdx = subIndex;
@@ -1139,20 +1139,20 @@ QByteArray QDeclarativeMetaPropertyPrivate::saveValueType(const QMetaObject *met
     return rv;
 }
 
-QByteArray QDeclarativeMetaPropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
+QByteArray QDeclarativePropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
 {
     SerializedData sd;
-    sd.type = QDeclarativeMetaProperty::Property;
+    sd.type = QDeclarativeProperty::Property;
     sd.core.load(metaObject->property(index));
 
     QByteArray rv((const char *)&sd, sizeof(sd));
     return rv;
 }
 
-QDeclarativeMetaProperty 
-QDeclarativeMetaPropertyPrivate::restore(const QByteArray &data, QObject *object, QDeclarativeContext *ctxt)
+QDeclarativeProperty 
+QDeclarativePropertyPrivate::restore(const QByteArray &data, QObject *object, QDeclarativeContext *ctxt)
 {
-    QDeclarativeMetaProperty prop;
+    QDeclarativeProperty prop;
 
     if (data.isEmpty())
         return prop;
@@ -1161,9 +1161,9 @@ QDeclarativeMetaPropertyPrivate::restore(const QByteArray &data, QObject *object
     prop.d->context = ctxt;
 
     const SerializedData *sd = (const SerializedData *)data.constData();
-    if (sd->type == QDeclarativeMetaProperty::Property) {
+    if (sd->type == QDeclarativeProperty::Property) {
         prop.d->core = sd->core;
-    } else if(sd->type == QDeclarativeMetaProperty::ValueTypeProperty) {
+    } else if(sd->type == QDeclarativeProperty::ValueTypeProperty) {
         const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
         prop.d->core = vt->core;
         prop.d->valueType = vt->valueType;
@@ -1175,7 +1175,7 @@ QDeclarativeMetaPropertyPrivate::restore(const QByteArray &data, QObject *object
 /*!
     Returns true if lhs and rhs refer to the same metaobject data
 */
-bool QDeclarativeMetaPropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
+bool QDeclarativePropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
 {
     return lhs == rhs || (1 && lhs && rhs && lhs->d.stringdata == rhs->d.stringdata);
 }
@@ -1183,7 +1183,7 @@ bool QDeclarativeMetaPropertyPrivate::equal(const QMetaObject *lhs, const QMetaO
 /*!
     Returns true if from inherits to.
 */
-bool QDeclarativeMetaPropertyPrivate::canConvert(const QMetaObject *from, const QMetaObject *to)
+bool QDeclarativePropertyPrivate::canConvert(const QMetaObject *from, const QMetaObject *to)
 {
     if (from && to == &QObject::staticMetaObject)
         return true;
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativeproperty.h
index 828749f..be1065e 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEMETAPROPERTY_H
-#define QDECLARATIVEMETAPROPERTY_H
+#ifndef QDECLARATIVEPROPERTY_H
+#define QDECLARATIVEPROPERTY_H
 
 #include <QtCore/qmetaobject.h>
 
@@ -59,8 +59,8 @@ struct QMetaObject;
 class QDeclarativeContext;
 class QDeclarativeEngine;
 
-class QDeclarativeMetaPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeMetaProperty
+class QDeclarativePropertyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeProperty
 {
 public:
     enum PropertyTypeCategory {
@@ -77,17 +77,17 @@ public:
                 ValueTypeProperty = 0x10 
     };
 
-    QDeclarativeMetaProperty();
-    ~QDeclarativeMetaProperty();
+    QDeclarativeProperty();
+    ~QDeclarativeProperty();
 
-    QDeclarativeMetaProperty(QObject *);
-    QDeclarativeMetaProperty(QObject *, QDeclarativeContext *);
+    QDeclarativeProperty(QObject *);
+    QDeclarativeProperty(QObject *, QDeclarativeContext *);
 
-    QDeclarativeMetaProperty(QObject *, const QString &);
-    QDeclarativeMetaProperty(QObject *, const QString &, QDeclarativeContext *);
+    QDeclarativeProperty(QObject *, const QString &);
+    QDeclarativeProperty(QObject *, const QString &, QDeclarativeContext *);
 
-    QDeclarativeMetaProperty(const QDeclarativeMetaProperty &);
-    QDeclarativeMetaProperty &operator=(const QDeclarativeMetaProperty &);
+    QDeclarativeProperty(const QDeclarativeProperty &);
+    QDeclarativeProperty &operator=(const QDeclarativeProperty &);
 
     QString name() const;
 
@@ -113,7 +113,7 @@ public:
     PropertyTypeCategory propertyTypeCategory() const;
     const char *propertyTypeName() const;
 
-    bool operator==(const QDeclarativeMetaProperty &) const;
+    bool operator==(const QDeclarativeProperty &) const;
 
     int coreIndex() const;
     QMetaProperty property() const;
@@ -121,13 +121,13 @@ public:
 
 private:
     friend class QDeclarativeEnginePrivate;
-    friend class QDeclarativeMetaPropertyPrivate;
-    QDeclarativeMetaPropertyPrivate *d;
+    friend class QDeclarativePropertyPrivate;
+    QDeclarativePropertyPrivate *d;
 };
-typedef QList<QDeclarativeMetaProperty> QDeclarativeMetaProperties;
+typedef QList<QDeclarativeProperty> QDeclarativeProperties;
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEMETAPROPERTY_H
+#endif // QDECLARATIVEPROPERTY_H
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index a171545..d0ad09c 100644
--- a/src/declarative/qml/qdeclarativemetaproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEMETAPROPERTY_P_H
-#define QDECLARATIVEMETAPROPERTY_P_H
+#ifndef QDECLARATIVEPROPERTY_P_H
+#define QDECLARATIVEPROPERTY_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativemetaproperty.h"
+#include "qdeclarativeproperty.h"
 
 #include "qdeclarativepropertycache_p.h"
 #include "qdeclarativeguard_p.h"
@@ -64,23 +64,23 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeContext;
 class QDeclarativeEnginePrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeMetaPropertyPrivate
+class Q_AUTOTEST_EXPORT QDeclarativePropertyPrivate
 {
 public:
     enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
     Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
 
-    QDeclarativeMetaPropertyPrivate()
+    QDeclarativePropertyPrivate()
         : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false) {}
           
 
-    QDeclarativeMetaPropertyPrivate(const QDeclarativeMetaPropertyPrivate &other)
+    QDeclarativePropertyPrivate(const QDeclarativePropertyPrivate &other)
         : q(0), context(other.context), object(other.object), 
           isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
           core(other.core), nameCache(other.nameCache),
           valueType(other.valueType) {}
 
-    QDeclarativeMetaProperty *q;
+    QDeclarativeProperty *q;
     QDeclarativeContext *context;
     QDeclarativeGuard<QObject> object;
 
@@ -98,7 +98,7 @@ public:
     QMetaMethod findSignal(QObject *, const QString &);
 
     int propertyType() const;
-    QDeclarativeMetaProperty::PropertyTypeCategory propertyTypeCategory() const;
+    QDeclarativeProperty::PropertyTypeCategory propertyTypeCategory() const;
 
     QVariant readValueProperty();
     bool writeValueProperty(const QVariant &, WriteFlags);
@@ -115,26 +115,26 @@ public:
     static QByteArray saveValueType(const QMetaObject *, int, 
                                     const QMetaObject *, int);
     static QByteArray saveProperty(const QMetaObject *, int);
-    static QDeclarativeMetaProperty restore(const QByteArray &, QObject *, QDeclarativeContext *);
+    static QDeclarativeProperty restore(const QByteArray &, QObject *, QDeclarativeContext *);
 
     static bool equal(const QMetaObject *, const QMetaObject *);
     static bool canConvert(const QMetaObject *from, const QMetaObject *to);
 
 
     // "Public" (to QML) methods
-    static QDeclarativeAbstractBinding *binding(const QDeclarativeMetaProperty &that);
-    static QDeclarativeAbstractBinding *setBinding(const QDeclarativeMetaProperty &that,
+    static QDeclarativeAbstractBinding *binding(const QDeclarativeProperty &that);
+    static QDeclarativeAbstractBinding *setBinding(const QDeclarativeProperty &that,
                                                    QDeclarativeAbstractBinding *,
                                                    WriteFlags flags = DontRemoveBinding);
-    static QDeclarativeExpression *signalExpression(const QDeclarativeMetaProperty &that);
-    static QDeclarativeExpression *setSignalExpression(const QDeclarativeMetaProperty &that, 
+    static QDeclarativeExpression *signalExpression(const QDeclarativeProperty &that);
+    static QDeclarativeExpression *setSignalExpression(const QDeclarativeProperty &that, 
                                                        QDeclarativeExpression *) ;
-    static bool write(const QDeclarativeMetaProperty &that, const QVariant &, WriteFlags);
-    static int valueTypeCoreIndex(const QDeclarativeMetaProperty &that);
+    static bool write(const QDeclarativeProperty &that, const QVariant &, WriteFlags);
+    static int valueTypeCoreIndex(const QDeclarativeProperty &that);
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeMetaPropertyPrivate::WriteFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePropertyPrivate::WriteFlags)
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVEMETAPROPERTY_P_H
+#endif // QDECLARATIVEPROPERTY_P_H
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
index 7626d56..3f6d805 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
@@ -66,7 +66,7 @@ QDeclarativePropertyValueInterceptor::~QDeclarativePropertyValueInterceptor()
 }
 
 /*!
-    \fn void QDeclarativePropertyValueInterceptor::setTarget(const QDeclarativeMetaProperty &property)
+    \fn void QDeclarativePropertyValueInterceptor::setTarget(const QDeclarativeProperty &property)
     Set the target \a property for the value interceptor.  This method will
     be called by the QML engine when assigning a value interceptor.
 */
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
index 2a29d5b..3de5abc 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeMetaProperty;
+class QDeclarativeProperty;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor
 {
 public:
     QDeclarativePropertyValueInterceptor();
     virtual ~QDeclarativePropertyValueInterceptor();
-    virtual void setTarget(const QDeclarativeMetaProperty &property) = 0;
+    virtual void setTarget(const QDeclarativeProperty &property) = 0;
     virtual void write(const QVariant &value) = 0;
 };
 Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor")
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index 626e391..b106d4f 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -63,7 +63,7 @@ QDeclarativePropertyValueSource::~QDeclarativePropertyValueSource()
 }
 
 /*!
-    \fn void QDeclarativePropertyValueSource::setTarget(const QDeclarativeMetaProperty &property)
+    \fn void QDeclarativePropertyValueSource::setTarget(const QDeclarativeProperty &property)
     Set the target \a property for the value source.  This method will
     be called by the QML engine when assigning a value source.
 */
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h
index 99c80af..70d2c03 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.h
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeMetaProperty;
+class QDeclarativeProperty;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource
 {
 public:
     QDeclarativePropertyValueSource();
     virtual ~QDeclarativePropertyValueSource();
-    virtual void setTarget(const QDeclarativeMetaProperty &) = 0;
+    virtual void setTarget(const QDeclarativeProperty &) = 0;
 };
 Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, "com.trolltech.qml.QDeclarativePropertyValueSource")
 
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index d35371f..01fa214 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -100,7 +100,7 @@ void QDeclarativePointFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &point, 0, &status, &flags };
@@ -148,7 +148,7 @@ void QDeclarativePointValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &point, 0, &status, &flags };
@@ -196,7 +196,7 @@ void QDeclarativeSizeFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &size, 0, &status, &flags };
@@ -244,7 +244,7 @@ void QDeclarativeSizeValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &size, 0, &status, &flags };
@@ -292,7 +292,7 @@ void QDeclarativeRectFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &rect, 0, &status, &flags };
@@ -360,7 +360,7 @@ void QDeclarativeRectValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &rect, 0, &status, &flags };
@@ -428,7 +428,7 @@ void QDeclarativeVector3DValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &vector, 0, &status, &flags };
@@ -486,7 +486,7 @@ void QDeclarativeEasingValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &easing, 0, &status, &flags };
@@ -554,7 +554,7 @@ void QDeclarativeFontValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &font, 0, &status, &flags };
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 792598b..cb153be 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
@@ -71,7 +71,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeValueType : public QObject
 public:
     QDeclarativeValueType(QObject *parent = 0);
     virtual void read(QObject *, int) = 0;
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags flags) = 0;
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags flags) = 0;
     virtual QVariant value() = 0;
     virtual void setValue(QVariant) = 0;
 };
@@ -96,7 +96,7 @@ public:
     QDeclarativePointFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -118,7 +118,7 @@ public:
     QDeclarativePointValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -140,7 +140,7 @@ public:
     QDeclarativeSizeFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -162,7 +162,7 @@ public:
     QDeclarativeSizeValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -186,7 +186,7 @@ public:
     QDeclarativeRectFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -215,7 +215,7 @@ public:
     QDeclarativeRectValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -243,7 +243,7 @@ public:
     QDeclarativeVector3DValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -297,7 +297,7 @@ public:
     QDeclarativeEasingValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -348,7 +348,7 @@ public:
     QDeclarativeFontValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index f7af843..baa98bd 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -156,7 +156,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
     QDeclarativeContextPrivate *cp = (QDeclarativeContextPrivate *)QObjectPrivate::get(ctxt);
 
     int status = -1;    //for dbus
-    QDeclarativeMetaPropertyPrivate::WriteFlags flags = QDeclarativeMetaPropertyPrivate::BypassInterceptor;
+    QDeclarativePropertyPrivate::WriteFlags flags = QDeclarativePropertyPrivate::BypassInterceptor;
 
     for (int ii = start; !isError() && ii < (start + count); ++ii) {
         const QDeclarativeInstruction &instr = comp->bytecode.at(ii);
@@ -515,8 +515,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 int sigIdx = instr.assignSignalObject.signal;
                 const QByteArray &pr = datas.at(sigIdx);
 
-                QDeclarativeMetaProperty prop(target, QString::fromUtf8(pr));
-                if (prop.type() & QDeclarativeMetaProperty::SignalProperty) {
+                QDeclarativeProperty prop(target, QString::fromUtf8(pr));
+                if (prop.type() & QDeclarativeProperty::SignalProperty) {
 
                     QMetaMethod method = QDeclarativeMetaType::defaultMethod(assign);
                     if (method.signature() == 0)
@@ -590,8 +590,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QObject *context = 
                     stack.at(stack.count() - 1 - instr.assignBinding.context);
 
-                QDeclarativeMetaProperty mp = 
-                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
+                QDeclarativeProperty mp = 
+                    QDeclarativePropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
 
                 int coreIndex = mp.coreIndex();
 
@@ -631,8 +631,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QDeclarativePropertyValueSource *vs = reinterpret_cast<QDeclarativePropertyValueSource *>(reinterpret_cast<char *>(obj) + instr.assignValueSource.castValue);
                 QObject *target = stack.at(stack.count() - 1 - instr.assignValueSource.owner);
 
-                QDeclarativeMetaProperty prop = 
-                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignValueSource.property), target, ctxt);
+                QDeclarativeProperty prop = 
+                    QDeclarativePropertyPrivate::restore(datas.at(instr.assignValueSource.property), target, ctxt);
                 obj->setParent(target);
                 vs->setTarget(prop);
             }
@@ -643,12 +643,12 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QObject *obj = stack.pop();
                 QDeclarativePropertyValueInterceptor *vi = reinterpret_cast<QDeclarativePropertyValueInterceptor *>(reinterpret_cast<char *>(obj) + instr.assignValueInterceptor.castValue);
                 QObject *target = stack.at(stack.count() - 1 - instr.assignValueInterceptor.owner);
-                QDeclarativeMetaProperty prop = 
-                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignValueInterceptor.property), target, ctxt);
+                QDeclarativeProperty prop = 
+                    QDeclarativePropertyPrivate::restore(datas.at(instr.assignValueInterceptor.property), target, ctxt);
                 obj->setParent(target);
                 vi->setTarget(prop);
                 QDeclarativeVMEMetaObject *mo = static_cast<QDeclarativeVMEMetaObject *>((QMetaObject*)target->metaObject());
-                mo->registerInterceptor(prop.coreIndex(), QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), vi);
+                mo->registerInterceptor(prop.coreIndex(), QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), vi);
             }
             break;
 
@@ -807,7 +807,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                     static_cast<QDeclarativeValueType *>(stack.pop());
                 QObject *target = stack.top();
                 valueHandler->write(target, instr.fetchValue.property, 
-                                    QDeclarativeMetaPropertyPrivate::BypassInterceptor);
+                                    QDeclarativePropertyPrivate::BypassInterceptor);
             }
             break;
 
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 6edb707..d67c834 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -105,7 +105,7 @@ int QDeclarativeVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
     int id = _id;
     if(c == QMetaObject::WriteProperty) {
         int flags = *reinterpret_cast<int*>(a[3]);
-        if (!(flags & QDeclarativeMetaPropertyPrivate::BypassInterceptor)
+        if (!(flags & QDeclarativePropertyPrivate::BypassInterceptor)
             && !aInterceptors.isEmpty()
             && aInterceptors.testBit(id)) {
             QPair<int, QDeclarativePropertyValueInterceptor*> pair = interceptors.value(id);
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 8a43cec..aa1a34b 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -6,7 +6,7 @@ SOURCES += \
     $$PWD/qdeclarativeengine.cpp \
     $$PWD/qdeclarativeexpression.cpp \
     $$PWD/qdeclarativebinding.cpp \
-    $$PWD/qdeclarativemetaproperty.cpp \
+    $$PWD/qdeclarativeproperty.cpp \
     $$PWD/qdeclarativecomponent.cpp \
     $$PWD/qdeclarativecontext.cpp \
     $$PWD/qdeclarativecustomparser.cpp \
@@ -62,7 +62,7 @@ HEADERS += \
     $$PWD/qdeclarative.h \
     $$PWD/qdeclarativebinding_p.h \
     $$PWD/qdeclarativebinding_p_p.h \
-    $$PWD/qdeclarativemetaproperty.h \
+    $$PWD/qdeclarativeproperty.h \
     $$PWD/qdeclarativecomponent.h \
     $$PWD/qdeclarativecomponent_p.h \
     $$PWD/qdeclarativecustomparser_p.h \
@@ -87,7 +87,7 @@ HEADERS += \
     $$PWD/qdeclarativestringconverters_p.h \
     $$PWD/qdeclarativeclassfactory_p.h \
     $$PWD/qdeclarativeinfo.h \
-    $$PWD/qdeclarativemetaproperty_p.h \
+    $$PWD/qdeclarativeproperty_p.h \
     $$PWD/qdeclarativecontext_p.h \
     $$PWD/qdeclarativecompositetypedata_p.h \
     $$PWD/qdeclarativecompositetypemanager_p.h \