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

Conflicts:
	src/declarative/qml/qdeclarativeengine.cpp
	tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp

1 files changed, 2 insertions, 3 deletions

diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 29323a7..95ac2c0 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -269,9 +269,8 @@ void tst_QDeclarativeListModel::dynamic()
 
     QDeclarativeEngine engine;
     QDeclarativeListModel model;
-    QDeclarativeEngine::setContextForObject(&model, engine.rootContext());
-    engine.rootContext()->addDefaultObject(&model);
-
+    QDeclarativeEngine::setContextForObject(&model,engine.rootContext());
+    engine.rootContext()->setContextObject(&model);
     QDeclarativeExpression e(engine.rootContext(), script, &model);
     if (!warning.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());