Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
	src/declarative/qml/qdeclarativeproperty.cpp

1 files changed, 2 insertions, 2 deletions

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);
     }
 }