Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>

239 files changed, 306 insertions, 306 deletions

diff --git a/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro
deleted file mode 100644
index 6f2712adec..0000000000
--- a/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += testcase
-QT += declarative testlib
-TEMPLATE = app
-TARGET = tst_qdeclarativedebugtrace
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativedebugtrace.cpp
-
diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro
index 17b23255ac..654f788465 100644
--- a/tests/benchmarks/particles/affectors/affectors.pro
+++ b/tests/benchmarks/particles/affectors/affectors.pro
@@ -7,4 +7,4 @@ testDataFiles.files = data
 testDataFiles.path = .
 DEPLOYMENT += testDataFiles
 
-QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib
+QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
index 343bdf0430..7c00c68c90 100644
--- a/tests/benchmarks/particles/emission/emission.pro
+++ b/tests/benchmarks/particles/emission/emission.pro
@@ -7,4 +7,4 @@ testDataFiles.files = data
 testDataFiles.path = .
 DEPLOYMENT += testDataFiles
 
-QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib
+QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib
diff --git a/tests/benchmarks/declarative/animation/animation.pro b/tests/benchmarks/qml/animation/animation.pro
index fc72040a3d..5efac8da1c 100644
--- a/tests/benchmarks/declarative/animation/animation.pro
+++ b/tests/benchmarks/qml/animation/animation.pro
@@ -1,10 +1,10 @@
 TEMPLATE = app
 TARGET = tst_animation
-QT += declarative
+QT += qml
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_animation.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-QT += testlib core-private gui-private declarative-private quick-private v8-private
+QT += testlib core-private gui-private qml-private quick-private v8-private
diff --git a/tests/benchmarks/declarative/animation/data/animation.qml b/tests/benchmarks/qml/animation/data/animation.qml
index c48f5ccbe3..c48f5ccbe3 100644
--- a/tests/benchmarks/declarative/animation/data/animation.qml
+++ b/tests/benchmarks/qml/animation/data/animation.qml
diff --git a/tests/benchmarks/declarative/animation/tst_animation.cpp b/tests/benchmarks/qml/animation/tst_animation.cpp
index 6273d9740e..e5619caa6c 100644
--- a/tests/benchmarks/declarative/animation/tst_animation.cpp
+++ b/tests/benchmarks/qml/animation/tst_animation.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <private/qdeclarativemetatype_p.h>
-#include <private/qdeclarativeanimation_p_p.h>
-#include <QDeclarativeContext>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <private/qqmlmetatype_p.h>
+#include <private/qquickanimation_p_p.h>
+#include <QQmlContext>
 
 class tst_animation : public QObject
 {
@@ -68,7 +68,7 @@ private slots:
     void numberAnimationEmpty();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 tst_animation::tst_animation()
@@ -91,7 +91,7 @@ void tst_animation::abstractAnimation()
 void tst_animation::bulkValueAnimator()
 {
     QBENCHMARK {
-        QDeclarativeBulkValueAnimator *animator = new QDeclarativeBulkValueAnimator;
+        QQuickBulkValueAnimator *animator = new QQuickBulkValueAnimator;
         delete animator;
     }
 }
@@ -99,14 +99,14 @@ void tst_animation::bulkValueAnimator()
 void tst_animation::propertyUpdater()
 {
     QBENCHMARK {
-        QDeclarativeAnimationPropertyUpdater *updater = new QDeclarativeAnimationPropertyUpdater;
+        QQuickAnimationPropertyUpdater *updater = new QQuickAnimationPropertyUpdater;
         delete updater;
     }
 }
 
 void tst_animation::animationtree_qml()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("animation.qml"));
+    QQmlComponent component(&engine, TEST_FILE("animation.qml"));
     QObject *obj = component.create();
     delete obj;
 
@@ -120,7 +120,7 @@ void tst_animation::animationelements_data()
 {
     QTest::addColumn<QString>("type");
 
-    QSet<QString> types = QDeclarativeMetaType::qmlTypeNames().toSet();
+    QSet<QString> types = QQmlMetaType::qmlTypeNames().toSet();
     foreach (const QString &type, types) {
         if (type.contains(QLatin1String("Animation")))
             QTest::newRow(type.toLatin1()) << type;
@@ -133,7 +133,7 @@ void tst_animation::animationelements_data()
 void tst_animation::animationelements()
 {
     QFETCH(QString, type);
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 2, 0);
+    QQmlType *t = QQmlMetaType::qmlType(type, 2, 0);
     if (!t || !t->isCreatable())
         QSKIP("Non-creatable type");
 
@@ -145,7 +145,7 @@ void tst_animation::animationelements()
 
 void tst_animation::numberAnimation()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0\nItem { Rectangle { id: rect; NumberAnimation { target: rect; property: \"x\"; to: 100; duration: 500; easing.type: Easing.InOutQuad } } }", QUrl());
 
     QObject *obj = component.create();
@@ -159,7 +159,7 @@ void tst_animation::numberAnimation()
 
 void tst_animation::numberAnimationStarted()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0\nItem { Rectangle { id: rect; NumberAnimation { target: rect; property: \"x\"; to: 100; duration: 500; easing.type: Easing.InOutQuad; running: true; paused: true } } }", QUrl());
 
     QObject *obj = component.create();
@@ -173,7 +173,7 @@ void tst_animation::numberAnimationStarted()
 
 void tst_animation::numberAnimationMultipleTargets()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0\nItem { Rectangle { id: rect; NumberAnimation { target: rect; properties: \"x,y,z,width,height,implicitWidth,implicitHeight\"; to: 100; duration: 500; easing.type: Easing.InOutQuad; running: true; paused: true } } }", QUrl());
 
     QObject *obj = component.create();
@@ -187,7 +187,7 @@ void tst_animation::numberAnimationMultipleTargets()
 
 void tst_animation::numberAnimationEmpty()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0\nNumberAnimation { }", QUrl());
 
     QObject *obj = component.create();
diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/qml/binding/binding.pro
index ba59080232..776c8390a3 100644
--- a/tests/benchmarks/declarative/binding/binding.pro
+++ b/tests/benchmarks/qml/binding/binding.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_binding
-QT += declarative testlib
+QT += qml testlib
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_binding.cpp testtypes.cpp
diff --git a/tests/benchmarks/declarative/binding/data/creation.txt b/tests/benchmarks/qml/binding/data/creation.txt
index 05704fa341..05704fa341 100644
--- a/tests/benchmarks/declarative/binding/data/creation.txt
+++ b/tests/benchmarks/qml/binding/data/creation.txt
diff --git a/tests/benchmarks/declarative/binding/data/idproperty.txt b/tests/benchmarks/qml/binding/data/idproperty.txt
index 4e474ba49a..4e474ba49a 100644
--- a/tests/benchmarks/declarative/binding/data/idproperty.txt
+++ b/tests/benchmarks/qml/binding/data/idproperty.txt
diff --git a/tests/benchmarks/declarative/binding/data/localproperty.txt b/tests/benchmarks/qml/binding/data/localproperty.txt
index c7ca0efdb4..c7ca0efdb4 100644
--- a/tests/benchmarks/declarative/binding/data/localproperty.txt
+++ b/tests/benchmarks/qml/binding/data/localproperty.txt
diff --git a/tests/benchmarks/declarative/binding/data/objectproperty.txt b/tests/benchmarks/qml/binding/data/objectproperty.txt
index 06409f2dd1..06409f2dd1 100644
--- a/tests/benchmarks/declarative/binding/data/objectproperty.txt
+++ b/tests/benchmarks/qml/binding/data/objectproperty.txt
diff --git a/tests/benchmarks/declarative/binding/testtypes.cpp b/tests/benchmarks/qml/binding/testtypes.cpp
index 31af4f15b0..31af4f15b0 100644
--- a/tests/benchmarks/declarative/binding/testtypes.cpp
+++ b/tests/benchmarks/qml/binding/testtypes.cpp
diff --git a/tests/benchmarks/declarative/binding/testtypes.h b/tests/benchmarks/qml/binding/testtypes.h
index 1c99842e33..03542ca24c 100644
--- a/tests/benchmarks/declarative/binding/testtypes.h
+++ b/tests/benchmarks/qml/binding/testtypes.h
@@ -42,7 +42,7 @@
 #define TESTTYPES_H
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 class MyQmlObject : public QObject
 {
@@ -50,7 +50,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(int result READ result WRITE setResult)
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(MyQmlObject *object READ object WRITE setObject NOTIFY objectChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> data READ data)
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data)
     Q_CLASSINFO("DefaultProperty", "data")
 public:
     MyQmlObject() : m_result(0), m_value(0), m_object(0) {}
@@ -61,7 +61,7 @@ public:
     int value() const { return m_value; }
     void setValue(int v) { m_value = v; emit valueChanged(); }
 
-    QDeclarativeListProperty<QObject> data() { return QDeclarativeListProperty<QObject>(this, m_data); }
+    QQmlListProperty<QObject> data() { return QQmlListProperty<QObject>(this, m_data); }
 
     MyQmlObject *object() const { return m_object; }
     void setObject(MyQmlObject *o) { m_object = o; emit objectChanged(); }
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/qml/binding/tst_binding.cpp
index 858e99016b..cd854e06e0 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/qml/binding/tst_binding.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlContext>
+#include <QQmlComponent>
 #include <QFile>
 #include <QDebug>
 #include "testtypes.h"
@@ -68,7 +68,7 @@ private slots:
     void creation();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
     MyQmlObject tstObject;
 };
 
@@ -91,7 +91,7 @@ void tst_binding::cleanupTestCase()
 }
 
 #define COMPONENT(filename, binding) \
-    QDeclarativeComponent c(&engine); \
+    QQmlComponent c(&engine); \
     { \
         QFile f(filename); \
         QVERIFY(f.open(QIODevice::ReadOnly)); \
diff --git a/tests/benchmarks/declarative/compilation/compilation.pro b/tests/benchmarks/qml/compilation/compilation.pro
index 44ea3d0c68..4fa9e49918 100644
--- a/tests/benchmarks/declarative/compilation/compilation.pro
+++ b/tests/benchmarks/qml/compilation/compilation.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_compilation
-QT += declarative testlib
+QT += qml qml-private testlib core-private v8-private
 macx:CONFIG -= app_bundle
 
 CONFIG += release
diff --git a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml b/tests/benchmarks/qml/compilation/data/BoomBlock.qml
index 58ef377b71..65d253e074 100644
--- a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
+++ b/tests/benchmarks/qml/compilation/data/BoomBlock.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/compilation/tst_compilation.cpp b/tests/benchmarks/qml/compilation/tst_compilation.cpp
index b9c619af31..9eeed7e9ed 100644
--- a/tests/benchmarks/declarative/compilation/tst_compilation.cpp
+++ b/tests/benchmarks/qml/compilation/tst_compilation.cpp
@@ -41,13 +41,13 @@
 
 #include <qtest.h>
 
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/private/qdeclarativejsengine_p.h>
-#include <QtDeclarative/private/qdeclarativejsmemorypool_p.h>
-#include <QtDeclarative/private/qdeclarativejsparser_p.h>
-#include <QtDeclarative/private/qdeclarativejslexer_p.h>
-#include <QtDeclarative/private/qdeclarativescript_p.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/private/qqmljsengine_p.h>
+#include <QtQml/private/qqmljsmemorypool_p.h>
+#include <QtQml/private/qqmljsparser_p.h>
+#include <QtQml/private/qqmljslexer_p.h>
+#include <QtQml/private/qqmlscript_p.h>
 
 #include <QFile>
 #include <QDebug>
@@ -69,7 +69,7 @@ private slots:
     void scriptparser();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 tst_compilation::tst_compilation()
@@ -89,12 +89,12 @@ void tst_compilation::boomblock()
 
     //get rid of initialization effects
     {
-        QDeclarativeComponent c(&engine);
+        QQmlComponent c(&engine);
         c.setData(data, QUrl());
     }
 
     QBENCHMARK {
-        QDeclarativeComponent c(&engine);
+        QQmlComponent c(&engine);
         c.setData(data, QUrl());
 //        QVERIFY(c.isReady());
     }
@@ -119,13 +119,13 @@ void tst_compilation::jsparser()
     const QString code = stream.readAll();
 
     QBENCHMARK {
-        QDeclarativeJS::Engine engine;
-        QDeclarativeJS::NodePool nodePool(file, &engine);
+        QQmlJS::Engine engine;
+        QQmlJS::NodePool nodePool(file, &engine);
 
-        QDeclarativeJS::Lexer lexer(&engine);
+        QQmlJS::Lexer lexer(&engine);
         lexer.setCode(code, -1);
 
-        QDeclarativeJS::Parser parser(&engine);
+        QQmlJS::Parser parser(&engine);
         parser.parse();
         parser.ast();
     }
@@ -149,7 +149,7 @@ void tst_compilation::scriptparser()
     QUrl url = QUrl::fromLocalFile(file);
 
     QBENCHMARK {
-        QDeclarativeScript::Parser parser;
+        QQmlScript::Parser parser;
         parser.parse(data, url);
         parser.tree();
     }
diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/qml/creation/creation.pro
index 6d0d9d7e8f..d887a1ffbf 100644
--- a/tests/benchmarks/declarative/creation/creation.pro
+++ b/tests/benchmarks/qml/creation/creation.pro
@@ -7,4 +7,4 @@ SOURCES += tst_creation.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-QT += core-private gui-private declarative-private qtquick1-private widgets testlib
+QT += core-private gui-private qml-private qtquick1-private widgets testlib
diff --git a/tests/benchmarks/declarative/creation/data/item.qml b/tests/benchmarks/qml/creation/data/item.qml
index ebc50ceb13..af6c2f3f59 100644
--- a/tests/benchmarks/declarative/creation/data/item.qml
+++ b/tests/benchmarks/qml/creation/data/item.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/creation/data/qobject.qml b/tests/benchmarks/qml/creation/data/qobject.qml
index 4b59535bcb..90620ab35e 100644
--- a/tests/benchmarks/declarative/creation/data/qobject.qml
+++ b/tests/benchmarks/qml/creation/data/qobject.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp
index 809271e4d2..6bdaae48fd 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/qml/creation/tst_creation.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <private/qdeclarativemetatype_p.h>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <private/qqmlmetatype_p.h>
 #include <QDebug>
 #include <QGraphicsScene>
 #include <QGraphicsItem>
-#include <QDeclarativeItem>
-#include <QDeclarativeContext>
+#include <QQuickItem>
+#include <QQmlContext>
 #include <QtQuick1/private/qdeclarativetextinput_p.h>
 #include <private/qobject_p.h>
 
@@ -80,23 +80,23 @@ private slots:
     void elements();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 class TestType : public QObject
 {
 Q_OBJECT
-Q_PROPERTY(QDeclarativeListProperty<QObject> resources READ resources)
+Q_PROPERTY(QQmlListProperty<QObject> resources READ resources)
 Q_CLASSINFO("DefaultProperty", "resources")
 public:
     TestType(QObject *parent = 0)
     : QObject(parent) {}
 
-    QDeclarativeListProperty<QObject> resources() {
-        return QDeclarativeListProperty<QObject>(this, 0, resources_append);
+    QQmlListProperty<QObject> resources() {
+        return QQmlListProperty<QObject>(this, 0, resources_append);
     }
 
-    static void resources_append(QDeclarativeListProperty<QObject> *p, QObject *o) {
+    static void resources_append(QQmlListProperty<QObject> *p, QObject *o) {
         o->setParent(p->object);
     }
 };
@@ -124,7 +124,7 @@ void tst_creation::qobject_cpp()
 
 void tst_creation::qobject_qml()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0\nQtObject {}", QUrl());
     QObject *obj = component.create();
     delete obj;
@@ -137,7 +137,7 @@ void tst_creation::qobject_qml()
 
 void tst_creation::qobject_10flat_qml()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import Qt.test 1.0\nTestType { resources: [ TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{} ] }", QUrl());
     QObject *obj = component.create();
     delete obj;
@@ -168,7 +168,7 @@ void tst_creation::qobject_10flat_cpp()
 
 void tst_creation::qobject_10tree_qml()
 {
-    QDeclarativeComponent component(&engine);
+    QQmlComponent component(&engine);
     component.setData("import Qt.test 1.0\nTestType { TestType{ TestType { TestType{ TestType{ TestType{ TestType{ TestType{ TestType{ TestType{ TestType{ } } } } } } } } } } }", QUrl());
 
     QObject *obj = component.create();
@@ -201,7 +201,7 @@ void tst_creation::qobject_10tree_cpp()
 
 void tst_creation::qobject_qmltype()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("QtQuick/QtObject", 2, 0);
+    QQmlType *t = QQmlMetaType::qmlType("QtQuick/QtObject", 2, 0);
 
     QBENCHMARK {
         QObject *obj = t->create();
@@ -238,7 +238,7 @@ void tst_creation::qobject_alloc()
     }
 }
 
-struct QDeclarativeGraphics_Derived : public QObject
+struct QQmlGraphics_Derived : public QObject
 {
     void setParent_noEvent(QObject *parent) {
         bool sce = d_ptr->sendChildEvents;
@@ -248,17 +248,17 @@ struct QDeclarativeGraphics_Derived : public QObject
     }
 };
 
-inline void QDeclarativeGraphics_setParent_noEvent(QObject *object, QObject *parent)
+inline void QQmlGraphics_setParent_noEvent(QObject *object, QObject *parent)
 {
-    static_cast<QDeclarativeGraphics_Derived *>(object)->setParent_noEvent(parent);
+    static_cast<QQmlGraphics_Derived *>(object)->setParent_noEvent(parent);
 }
 
 void tst_creation::itemtree_notree_cpp()
 {
     QBENCHMARK {
-        QDeclarativeItem *item = new QDeclarativeItem;
+        QQuickItem *item = new QQuickItem;
         for (int i = 0; i < 30; ++i) {
-            QDeclarativeItem *child = new QDeclarativeItem;
+            QQuickItem *child = new QQuickItem;
             Q_UNUSED(child);
         }
         delete item;
@@ -268,10 +268,10 @@ void tst_creation::itemtree_notree_cpp()
 void tst_creation::itemtree_objtree_cpp()
 {
     QBENCHMARK {
-        QDeclarativeItem *item = new QDeclarativeItem;
+        QQuickItem *item = new QQuickItem;
         for (int i = 0; i < 30; ++i) {
-            QDeclarativeItem *child = new QDeclarativeItem;
-            QDeclarativeGraphics_setParent_noEvent(child,item);
+            QQuickItem *child = new QQuickItem;
+            QQmlGraphics_setParent_noEvent(child,item);
         }
         delete item;
     }
@@ -280,10 +280,10 @@ void tst_creation::itemtree_objtree_cpp()
 void tst_creation::itemtree_cpp()
 {
     QBENCHMARK {
-        QDeclarativeItem *item = new QDeclarativeItem;
+        QQuickItem *item = new QQuickItem;
         for (int i = 0; i < 30; ++i) {
-            QDeclarativeItem *child = new QDeclarativeItem;
-            QDeclarativeGraphics_setParent_noEvent(child,item);
+            QQuickItem *child = new QQuickItem;
+            QQmlGraphics_setParent_noEvent(child,item);
             child->setParentItem(item);
         }
         delete item;
@@ -293,11 +293,11 @@ void tst_creation::itemtree_cpp()
 void tst_creation::itemtree_data_cpp()
 {
     QBENCHMARK {
-        QDeclarativeItem *item = new QDeclarativeItem;
+        QQuickItem *item = new QQuickItem;
         for (int i = 0; i < 30; ++i) {
-            QDeclarativeItem *child = new QDeclarativeItem;
-            QDeclarativeGraphics_setParent_noEvent(child,item);
-            QDeclarativeListReference ref(item, "data");
+            QQuickItem *child = new QQuickItem;
+            QQmlGraphics_setParent_noEvent(child,item);
+            QQmlListReference ref(item, "data");
             ref.append(child);
         }
         delete item;
@@ -306,7 +306,7 @@ void tst_creation::itemtree_data_cpp()
 
 void tst_creation::itemtree_qml()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("item.qml"));
+    QQmlComponent component(&engine, TEST_FILE("item.qml"));
     QObject *obj = component.create();
     delete obj;
 
@@ -319,13 +319,13 @@ void tst_creation::itemtree_qml()
 void tst_creation::itemtree_scene_cpp()
 {
     QGraphicsScene scene;
-    QDeclarativeItem *root = new QDeclarativeItem;
+    QQuickItem *root = new QQuickItem;
     scene.addItem(root);
     QBENCHMARK {
-        QDeclarativeItem *item = new QDeclarativeItem;
+        QQuickItem *item = new QQuickItem;
         for (int i = 0; i < 30; ++i) {
-            QDeclarativeItem *child = new QDeclarativeItem;
-            QDeclarativeGraphics_setParent_noEvent(child,item);
+            QQuickItem *child = new QQuickItem;
+            QQmlGraphics_setParent_noEvent(child,item);
             child->setParentItem(item);
         }
         item->setParentItem(root);
@@ -338,7 +338,7 @@ void tst_creation::elements_data()
 {
     QTest::addColumn<QString>("type");
 
-    QList<QString> types = QDeclarativeMetaType::qmlTypeNames();
+    QList<QString> types = QQmlMetaType::qmlTypeNames();
     foreach (QString type, types)
         QTest::newRow(type.toLatin1()) << type;
 }
@@ -346,7 +346,7 @@ void tst_creation::elements_data()
 void tst_creation::elements()
 {
     QFETCH(QString, type);
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 2, 0);
+    QQmlType *t = QQmlMetaType::qmlType(type, 2, 0);
     if (!t || !t->isCreatable())
         QSKIP("Non-creatable type");
 
diff --git a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicFour.qml b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicFour.qml
index ccccc371ac..ccccc371ac 100644
--- a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicFour.qml
+++ b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicFour.qml
diff --git a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicOne.qml b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicOne.qml
index 154f9db9a3..154f9db9a3 100644
--- a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicOne.qml
+++ b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicOne.qml
diff --git a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicThree.qml b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicThree.qml
index 064ba57254..064ba57254 100644
--- a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicThree.qml
+++ b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicThree.qml
diff --git a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicTwo.qml b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicTwo.qml
index a3aac3ebd6..a3aac3ebd6 100644
--- a/tests/benchmarks/declarative/holistic/data/dynamicTargets/DynamicTwo.qml
+++ b/tests/benchmarks/qml/holistic/data/dynamicTargets/DynamicTwo.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Mlbsi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Mlbsi.qml
index 854cc3258d..854cc3258d 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Mlbsi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Mlbsi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Mldsi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Mldsi.qml
index 919fce1c46..919fce1c46 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Mldsi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Mldsi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Mlsi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Mlsi.qml
index 74451f85fd..74451f85fd 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Mlsi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Mlsi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/ModuleBm.qml b/tests/benchmarks/qml/holistic/data/jsImports/ModuleBm.qml
index 18ef8a2599..18ef8a2599 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/ModuleBm.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/ModuleBm.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Msbsi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Msbsi.qml
index d7a8b74dd1..d7a8b74dd1 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Msbsi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Msbsi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Msdsi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Msdsi.qml
index 266a26ef8e..266a26ef8e 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Msdsi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Msdsi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Mssi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Mssi.qml
index e589981252..e589981252 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Mssi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Mssi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/PragmaBm.qml b/tests/benchmarks/qml/holistic/data/jsImports/PragmaBm.qml
index f5753af88b..f5753af88b 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/PragmaBm.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/PragmaBm.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/PragmaModuleBm.qml b/tests/benchmarks/qml/holistic/data/jsImports/PragmaModuleBm.qml
index 8e1baa8572..8e1baa8572 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/PragmaModuleBm.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/PragmaModuleBm.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Slsi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Slsi.qml
index aa21358b47..aa21358b47 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Slsi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Slsi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/Sssi.qml b/tests/benchmarks/qml/holistic/data/jsImports/Sssi.qml
index 0ed7a3ee72..0ed7a3ee72 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/Sssi.qml
+++ b/tests/benchmarks/qml/holistic/data/jsImports/Sssi.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi.js
index 36a5fea77f..36a5fea77f 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi1.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi1.js
index 459451609b..459451609b 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi1.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi1.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi10.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi10.js
index 69202e63eb..69202e63eb 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi10.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi10.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi11.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi11.js
index 9f3e28a1f6..9f3e28a1f6 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi11.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi11.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi12.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi12.js
index 349c7cdd3f..349c7cdd3f 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi12.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi12.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi13.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi13.js
index 925178fadb..925178fadb 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi13.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi13.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi14.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi14.js
index 25f17ca1b8..25f17ca1b8 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi14.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi14.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi15.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi15.js
index 9445222cd9..9445222cd9 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi15.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi15.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi2.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi2.js
index f375c57663..f375c57663 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi2.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi2.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi3.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi3.js
index 0bfe7f021d..0bfe7f021d 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi3.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi3.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi4.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi4.js
index 8707e296ec..8707e296ec 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi4.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi4.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi5.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi5.js
index 0b1e8cf3de..0b1e8cf3de 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi5.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi5.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi6.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi6.js
index eb839108de..eb839108de 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi6.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi6.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi7.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi7.js
index fb22fa8f73..fb22fa8f73 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi7.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi7.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi8.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi8.js
index 736703c5bc..736703c5bc 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi8.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi8.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi9.js b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi9.js
index a1587a7de9..a1587a7de9 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlbsi9.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlbsi9.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi.js
index c0bad9c5a6..c0bad9c5a6 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi1.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi1.js
index b2a513da3b..b2a513da3b 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi1.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi1.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi10.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi10.js
index 864f027a6e..864f027a6e 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi10.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi10.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi11.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi11.js
index 2c126ec1c6..2c126ec1c6 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi11.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi11.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi12.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi12.js
index 76c14d8771..76c14d8771 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi12.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi12.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi13.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi13.js
index aaa2c6ab14..aaa2c6ab14 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi13.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi13.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi14.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi14.js
index 11394a87fb..11394a87fb 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi14.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi14.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi15.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi15.js
index 2978dbedf3..2978dbedf3 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi15.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi15.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi2.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi2.js
index f9105c07f2..f9105c07f2 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi2.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi2.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi3.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi3.js
index 046988b47a..046988b47a 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi3.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi3.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi4.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi4.js
index 7996c0d3f1..7996c0d3f1 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi4.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi4.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi5.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi5.js
index 183a09153a..183a09153a 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi5.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi5.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi6.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi6.js
index ad17faa47d..ad17faa47d 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi6.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi6.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi7.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi7.js
index 07e69fe6ee..07e69fe6ee 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi7.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi7.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi8.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi8.js
index cf245f461c..cf245f461c 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi8.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi8.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi9.js b/tests/benchmarks/qml/holistic/data/jsImports/mldsi9.js
index 2286e15d79..2286e15d79 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mldsi9.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mldsi9.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mlsi.js b/tests/benchmarks/qml/holistic/data/jsImports/mlsi.js
index 8c05cfb8bd..8c05cfb8bd 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mlsi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mlsi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/moduleBm.js b/tests/benchmarks/qml/holistic/data/jsImports/moduleBm.js
index 29bd1f83af..29bd1f83af 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/moduleBm.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/moduleBm.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi.js
index 5126faca00..5126faca00 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi1.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi1.js
index d5ba35fc97..d5ba35fc97 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi1.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi1.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi10.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi10.js
index f24ad0f7ee..f24ad0f7ee 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi10.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi10.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi11.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi11.js
index 30e072ab04..30e072ab04 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi11.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi11.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi12.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi12.js
index 3bf414a0ec..3bf414a0ec 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi12.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi12.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi13.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi13.js
index 7487b7f1a9..7487b7f1a9 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi13.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi13.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi14.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi14.js
index 504b365752..504b365752 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi14.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi14.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi15.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi15.js
index 1887f157c1..1887f157c1 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi15.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi15.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi2.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi2.js
index 56997c1394..56997c1394 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi2.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi2.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi3.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi3.js
index ce84ab63e4..ce84ab63e4 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi3.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi3.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi4.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi4.js
index 61d15d11af..61d15d11af 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi4.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi4.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi5.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi5.js
index e5bf0e1527..e5bf0e1527 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi5.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi5.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi6.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi6.js
index 8f25ad23d8..8f25ad23d8 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi6.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi6.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi7.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi7.js
index 70d521d3dc..70d521d3dc 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi7.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi7.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi8.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi8.js
index ed9f473ff9..ed9f473ff9 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi8.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi8.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi9.js b/tests/benchmarks/qml/holistic/data/jsImports/msbsi9.js
index 73a8eaf37b..73a8eaf37b 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msbsi9.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msbsi9.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi.js
index f88af5b416..f88af5b416 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi1.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi1.js
index 1d60d24b5e..1d60d24b5e 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi1.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi1.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi10.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi10.js
index 8b1151f3e2..8b1151f3e2 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi10.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi10.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi11.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi11.js
index b27d0f37af..b27d0f37af 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi11.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi11.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi12.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi12.js
index ba62852113..ba62852113 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi12.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi12.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi13.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi13.js
index f4b17ff627..f4b17ff627 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi13.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi13.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi14.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi14.js
index 4f96539faf..4f96539faf 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi14.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi14.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi15.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi15.js
index 113ed1bdc8..113ed1bdc8 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi15.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi15.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi2.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi2.js
index 67a35bc3ae..67a35bc3ae 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi2.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi2.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi3.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi3.js
index 81b4747409..81b4747409 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi3.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi3.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi4.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi4.js
index 37a4d9d2aa..37a4d9d2aa 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi4.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi4.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi5.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi5.js
index df57e75cea..df57e75cea 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi5.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi5.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi6.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi6.js
index 43e0b43877..43e0b43877 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi6.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi6.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi7.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi7.js
index 569b613e92..569b613e92 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi7.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi7.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi8.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi8.js
index b1a5bd514b..b1a5bd514b 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi8.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi8.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi9.js b/tests/benchmarks/qml/holistic/data/jsImports/msdsi9.js
index 3a0c4d0354..3a0c4d0354 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/msdsi9.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/msdsi9.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/mssi.js b/tests/benchmarks/qml/holistic/data/jsImports/mssi.js
index 7a82033d88..7a82033d88 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/mssi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/mssi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaBmOne.js b/tests/benchmarks/qml/holistic/data/jsImports/pragmaBmOne.js
index b92b79afaf..b92b79afaf 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaBmOne.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/pragmaBmOne.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaBmTwo.js b/tests/benchmarks/qml/holistic/data/jsImports/pragmaBmTwo.js
index c086016bef..c086016bef 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaBmTwo.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/pragmaBmTwo.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaLib.js b/tests/benchmarks/qml/holistic/data/jsImports/pragmaLib.js
index 8b65a68111..8b65a68111 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaLib.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/pragmaLib.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaModuleBm.js b/tests/benchmarks/qml/holistic/data/jsImports/pragmaModuleBm.js
index df710f1acf..df710f1acf 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/pragmaModuleBm.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/pragmaModuleBm.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/slsi.js b/tests/benchmarks/qml/holistic/data/jsImports/slsi.js
index 98af47885f..98af47885f 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/slsi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/slsi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsImports/sssi.js b/tests/benchmarks/qml/holistic/data/jsImports/sssi.js
index 88d9fb643b..88d9fb643b 100644
--- a/tests/benchmarks/declarative/holistic/data/jsImports/sssi.js
+++ b/tests/benchmarks/qml/holistic/data/jsImports/sssi.js
diff --git a/tests/benchmarks/declarative/holistic/data/jsTargets/JsOne.qml b/tests/benchmarks/qml/holistic/data/jsTargets/JsOne.qml
index 41d4ff5bbd..41d4ff5bbd 100644
--- a/tests/benchmarks/declarative/holistic/data/jsTargets/JsOne.qml
+++ b/tests/benchmarks/qml/holistic/data/jsTargets/JsOne.qml
diff --git a/tests/benchmarks/declarative/holistic/data/jsTargets/JsTwo.qml b/tests/benchmarks/qml/holistic/data/jsTargets/JsTwo.qml
index cb5da5a22d..cb5da5a22d 100644
--- a/tests/benchmarks/declarative/holistic/data/jsTargets/JsTwo.qml
+++ b/tests/benchmarks/qml/holistic/data/jsTargets/JsTwo.qml
diff --git a/tests/benchmarks/declarative/holistic/data/largeTargets/gridview-example.qml b/tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
index 373b1b8ced..373b1b8ced 100644
--- a/tests/benchmarks/declarative/holistic/data/largeTargets/gridview-example.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
diff --git a/tests/benchmarks/declarative/holistic/data/largeTargets/layoutdirection.qml b/tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
index 9f039594b3..9f039594b3 100644
--- a/tests/benchmarks/declarative/holistic/data/largeTargets/layoutdirection.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
diff --git a/tests/benchmarks/declarative/holistic/data/largeTargets/mousearea-example.qml b/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
index 4c82b58302..4c82b58302 100644
--- a/tests/benchmarks/declarative/holistic/data/largeTargets/mousearea-example.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
diff --git a/tests/benchmarks/declarative/holistic/data/resolutionTargets/ResolveOne.qml b/tests/benchmarks/qml/holistic/data/resolutionTargets/ResolveOne.qml
index 2673ac36ed..2673ac36ed 100644
--- a/tests/benchmarks/declarative/holistic/data/resolutionTargets/ResolveOne.qml
+++ b/tests/benchmarks/qml/holistic/data/resolutionTargets/ResolveOne.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/CppToJs.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/CppToJs.qml
index d319f6e8cb..d319f6e8cb 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/CppToJs.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/CppToJs.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/CppToQml.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/CppToQml.qml
index a9d064f740..a9d064f740 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/CppToQml.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/CppToQml.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppEight.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppEight.qml
index 97bb125bfc..97bb125bfc 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppEight.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppEight.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppEleven.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppEleven.qml
index 2258e82500..2258e82500 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppEleven.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppEleven.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppFive.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppFive.qml
index f349d0fcbf..f349d0fcbf 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppFive.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppFive.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppFour.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppFour.qml
index 267d36fba2..267d36fba2 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppFour.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppFour.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppNine.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppNine.qml
index ec3772ea62..ec3772ea62 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppNine.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppNine.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppOne.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppOne.qml
index e4a3c1acc2..e4a3c1acc2 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppOne.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppOne.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppSeven.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppSeven.qml
index 56c18a02db..56c18a02db 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppSeven.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppSeven.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppSix.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppSix.qml
index c14c43075b..c14c43075b 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppSix.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppSix.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppTen.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppTen.qml
index 05ededef38..05ededef38 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppTen.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppTen.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppThree.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppThree.qml
index 2f11f9acb3..2f11f9acb3 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppThree.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppThree.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppTwo.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppTwo.qml
index 0fe6d18507..0fe6d18507 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/JsToCppTwo.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/JsToCppTwo.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/ScarceOne.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/ScarceOne.qml
index d604242a99..d604242a99 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/ScarceOne.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/ScarceOne.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/ScarceTwo.qml b/tests/benchmarks/qml/holistic/data/scopeSwitching/ScarceTwo.qml
index cd79bb8074..cd79bb8074 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/ScarceTwo.qml
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/ScarceTwo.qml
diff --git a/tests/benchmarks/declarative/holistic/data/scopeSwitching/cppToJs.js b/tests/benchmarks/qml/holistic/data/scopeSwitching/cppToJs.js
index e62c2f27d6..e62c2f27d6 100644
--- a/tests/benchmarks/declarative/holistic/data/scopeSwitching/cppToJs.js
+++ b/tests/benchmarks/qml/holistic/data/scopeSwitching/cppToJs.js
diff --git a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallFour.qml b/tests/benchmarks/qml/holistic/data/smallTargets/SmallFour.qml
index 80af3bfee9..80af3bfee9 100644
--- a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallFour.qml
+++ b/tests/benchmarks/qml/holistic/data/smallTargets/SmallFour.qml
diff --git a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallOne.qml b/tests/benchmarks/qml/holistic/data/smallTargets/SmallOne.qml
index 58d52fe25d..58d52fe25d 100644
--- a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallOne.qml
+++ b/tests/benchmarks/qml/holistic/data/smallTargets/SmallOne.qml
diff --git a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallThree.qml b/tests/benchmarks/qml/holistic/data/smallTargets/SmallThree.qml
index a3e27f9ad6..a3e27f9ad6 100644
--- a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallThree.qml
+++ b/tests/benchmarks/qml/holistic/data/smallTargets/SmallThree.qml
diff --git a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallTwo.qml b/tests/benchmarks/qml/holistic/data/smallTargets/SmallTwo.qml
index 3ff2c5e8b0..3ff2c5e8b0 100644
--- a/tests/benchmarks/declarative/holistic/data/smallTargets/SmallTwo.qml
+++ b/tests/benchmarks/qml/holistic/data/smallTargets/SmallTwo.qml
diff --git a/tests/benchmarks/declarative/holistic/holistic.pro b/tests/benchmarks/qml/holistic/holistic.pro
index 586af79275..82f2ef6e4e 100644
--- a/tests/benchmarks/declarative/holistic/holistic.pro
+++ b/tests/benchmarks/qml/holistic/holistic.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_holistic
-QT += declarative network testlib
+QT += qml network testlib
 macx:CONFIG -= app_bundle
 
 CONFIG += release
diff --git a/tests/benchmarks/declarative/holistic/testtypes.cpp b/tests/benchmarks/qml/holistic/testtypes.cpp
index 872a3be7b1..65d3ee8522 100644
--- a/tests/benchmarks/declarative/holistic/testtypes.cpp
+++ b/tests/benchmarks/qml/holistic/testtypes.cpp
@@ -41,10 +41,10 @@
 #include "testtypes.h"
 #include <QWidget>
 #include <QPlainTextEdit>
-#include <QDeclarativeEngine>
+#include <QQmlEngine>
 #include <QScriptEngine>
 
-static QScriptValue script_api(QDeclarativeEngine *engine, QScriptEngine *scriptEngine)
+static QScriptValue script_api(QQmlEngine *engine, QScriptEngine *scriptEngine)
 {
     Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
@@ -55,7 +55,7 @@ static QScriptValue script_api(QDeclarativeEngine *engine, QScriptEngine *script
     return v;
 }
 
-static QObject *qobject_api(QDeclarativeEngine *engine, QScriptEngine *scriptEngine)
+static QObject *qobject_api(QQmlEngine *engine, QScriptEngine *scriptEngine)
 {
     Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
@@ -65,7 +65,7 @@ static QObject *qobject_api(QDeclarativeEngine *engine, QScriptEngine *scriptEng
     return o;
 }
 
-static QObject *qobject_api_engine_parent(QDeclarativeEngine *engine, QScriptEngine *scriptEngine)
+static QObject *qobject_api_engine_parent(QQmlEngine *engine, QScriptEngine *scriptEngine)
 {
     Q_UNUSED(scriptEngine)
 
diff --git a/tests/benchmarks/declarative/holistic/testtypes.h b/tests/benchmarks/qml/holistic/testtypes.h
index c3824d2352..66d755d944 100644
--- a/tests/benchmarks/declarative/holistic/testtypes.h
+++ b/tests/benchmarks/qml/holistic/testtypes.h
@@ -42,11 +42,11 @@
 #define TESTTYPES_H
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlexpression.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
-#include <QtDeclarative/qdeclarativelist.h>
+#include <QtQml/qqmllist.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qmatrix.h>
 #include <QtGui/qcolor.h>
@@ -54,8 +54,8 @@
 #include <QtGui/qvector3d.h>
 #include <QtCore/qdatetime.h>
 #include <QtScript/qjsvalue.h>
-#include <QtDeclarative/qdeclarativescriptstring.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqmlscriptstring.h>
+#include <QtQml/qqmlcomponent.h>
 
 class MyQmlAttachedObject : public QObject
 {
@@ -90,7 +90,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(int console READ console CONSTANT)
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty NOTIFY stringChanged)
     Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
+    Q_PROPERTY(QQmlListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
     Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty)
     Q_PROPERTY(QRegExp regExp READ regExp WRITE setRegExp)
     Q_PROPERTY(int nonscriptable READ nonscriptable WRITE setNonscriptable SCRIPTABLE false)
@@ -121,7 +121,7 @@ public:
         emit objectChanged();
     }
 
-    QDeclarativeListProperty<QObject> objectListProperty() { return QDeclarativeListProperty<QObject>(this, m_objectQList); }
+    QQmlListProperty<QObject> objectListProperty() { return QQmlListProperty<QObject>(this, m_objectQList); }
 
     bool methodCalled() const { return m_methodCalled; }
     bool methodIntCalled() const { return m_methodIntCalled; }
diff --git a/tests/benchmarks/declarative/holistic/tst_holistic.cpp b/tests/benchmarks/qml/holistic/tst_holistic.cpp
index 6a2aa19804..db8cc1cecb 100644
--- a/tests/benchmarks/declarative/holistic/tst_holistic.cpp
+++ b/tests/benchmarks/qml/holistic/tst_holistic.cpp
@@ -42,10 +42,10 @@
 #include "testtypes.h"
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <QDeclarativeContext>
-#include <QDeclarativeProperty>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlProperty>
 #include <QFile>
 #include <QDebug>
 
@@ -122,7 +122,7 @@ private slots:
     void typeResolution();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 tst_holistic::tst_holistic()
@@ -268,7 +268,7 @@ void tst_holistic::compilation()
         engine.clearComponentCache();
         for (int i = 0; i < repetitions; ++i) {
             for (int j = 0; j < files.size(); ++j) {
-                QDeclarativeComponent c(&engine, QUrl::fromLocalFile(files.at(j)));
+                QQmlComponent c(&engine, QUrl::fromLocalFile(files.at(j)));
             }
         }
     }
@@ -285,9 +285,9 @@ void tst_holistic::instantiation()
     Q_ASSERT(files.size() > 0);
     Q_ASSERT(repetitions > 0);
 
-    QList<QDeclarativeComponent*> components;
+    QList<QQmlComponent*> components;
     for (int i = 0; i < files.size(); ++i) {
-        QDeclarativeComponent *c = new QDeclarativeComponent(&engine, QUrl::fromLocalFile(files.at(i)));
+        QQmlComponent *c = new QQmlComponent(&engine, QUrl::fromLocalFile(files.at(i)));
         components.append(c);
     }
 
@@ -323,7 +323,7 @@ void tst_holistic::creation()
         engine.clearComponentCache();
         for (int i = 0; i < repetitions; ++i) {
             for (int j = 0; j < files.size(); ++j) {
-                QDeclarativeComponent c(&engine, QUrl::fromLocalFile(files.at(j)));
+                QQmlComponent c(&engine, QUrl::fromLocalFile(files.at(j)));
                 QObject *obj = c.create();
                 delete obj;
             }
@@ -382,7 +382,7 @@ void tst_holistic::dynamicity()
     QFETCH(QVariant, writeValueTwo);
     QFETCH(QString, readProperty);
 
-    QDeclarativeComponent c(&engine, file);
+    QQmlComponent c(&engine, file);
     QObject *obj = c.create();
 
     QVariant readValue;
@@ -491,7 +491,7 @@ void tst_holistic::cppToJsDirect()
     QFETCH(QString, file);
     QFETCH(QString, methodName);
 
-    QDeclarativeComponent c(&engine, file);
+    QQmlComponent c(&engine, file);
     QObject *obj = c.create();
 
     QBENCHMARK {
@@ -510,11 +510,11 @@ void tst_holistic::cppToJsIndirect()
     // The benchmark deliberately causes change signals to be emitted (and
     // modifies the scarce resources) so that the properties are updated.
 
-    QDeclarativeComponent c(&engine, QString(SRCDIR + QLatin1String("/data/scopeSwitching/ScarceTwo.qml")));
+    QQmlComponent c(&engine, QString(SRCDIR + QLatin1String("/data/scopeSwitching/ScarceTwo.qml")));
     QObject *obj = c.create();
 
     ScarceResourceProvider *srp = 0;
-    srp = qobject_cast<ScarceResourceProvider*>(QDeclarativeProperty::read(obj, "a").value<QObject*>());
+    srp = qobject_cast<ScarceResourceProvider*>(QQmlProperty::read(obj, "a").value<QObject*>());
 
     QBENCHMARK {
         srp->changeResources(); // will cause small+large scarce resources changed signals to be emitted.
@@ -573,7 +573,7 @@ void tst_holistic::typeResolution()
     Q_ASSERT(propertyNameTwo.size() == propertyValueTwo.size());
     Q_ASSERT(repetitions > 0);
 
-    QDeclarativeComponent c(&engine, file);
+    QQmlComponent c(&engine, file);
     QObject *obj = c.create();
 
     PropertyNameList writeProperty;
diff --git a/tests/benchmarks/declarative/javascript/data/NestedIdObject.qml b/tests/benchmarks/qml/javascript/data/NestedIdObject.qml
index 753d547ace..753d547ace 100644
--- a/tests/benchmarks/declarative/javascript/data/NestedIdObject.qml
+++ b/tests/benchmarks/qml/javascript/data/NestedIdObject.qml
diff --git a/tests/benchmarks/declarative/javascript/data/intQObjectProperty.qml b/tests/benchmarks/qml/javascript/data/intQObjectProperty.qml
index c3e6ebc16a..c3e6ebc16a 100644
--- a/tests/benchmarks/declarative/javascript/data/intQObjectProperty.qml
+++ b/tests/benchmarks/qml/javascript/data/intQObjectProperty.qml
diff --git a/tests/benchmarks/declarative/javascript/data/localId.qml b/tests/benchmarks/qml/javascript/data/localId.qml
index d42b891092..d42b891092 100644
--- a/tests/benchmarks/declarative/javascript/data/localId.qml
+++ b/tests/benchmarks/qml/javascript/data/localId.qml
diff --git a/tests/benchmarks/declarative/javascript/data/nestedId.qml b/tests/benchmarks/qml/javascript/data/nestedId.qml
index 538699d452..538699d452 100644
--- a/tests/benchmarks/declarative/javascript/data/nestedId.qml
+++ b/tests/benchmarks/qml/javascript/data/nestedId.qml
diff --git a/tests/benchmarks/declarative/javascript/data/stringQObjectProperty.qml b/tests/benchmarks/qml/javascript/data/stringQObjectProperty.qml
index ccd8a791b6..ccd8a791b6 100644
--- a/tests/benchmarks/declarative/javascript/data/stringQObjectProperty.qml
+++ b/tests/benchmarks/qml/javascript/data/stringQObjectProperty.qml
diff --git a/tests/benchmarks/declarative/javascript/javascript.pro b/tests/benchmarks/qml/javascript/javascript.pro
index 8026540309..281bbd0069 100644
--- a/tests/benchmarks/declarative/javascript/javascript.pro
+++ b/tests/benchmarks/qml/javascript/javascript.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_javascript
-QT += declarative testlib
+QT += qml testlib
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_javascript.cpp testtypes.cpp
diff --git a/tests/benchmarks/declarative/javascript/testtypes.cpp b/tests/benchmarks/qml/javascript/testtypes.cpp
index 0ba82a495d..43abef2d03 100644
--- a/tests/benchmarks/declarative/javascript/testtypes.cpp
+++ b/tests/benchmarks/qml/javascript/testtypes.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "testtypes.h"
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 void registerTypes()
 {
diff --git a/tests/benchmarks/declarative/javascript/testtypes.h b/tests/benchmarks/qml/javascript/testtypes.h
index 91be9078ed..91be9078ed 100644
--- a/tests/benchmarks/declarative/javascript/testtypes.h
+++ b/tests/benchmarks/qml/javascript/testtypes.h
diff --git a/tests/benchmarks/declarative/javascript/tst_javascript.cpp b/tests/benchmarks/qml/javascript/tst_javascript.cpp
index f27c7e5b73..d506951b9f 100644
--- a/tests/benchmarks/declarative/javascript/tst_javascript.cpp
+++ b/tests/benchmarks/qml/javascript/tst_javascript.cpp
@@ -42,8 +42,8 @@
 #include <QDir>
 #include <QDebug>
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 
 #include "testtypes.h"
 
@@ -60,7 +60,7 @@ private slots:
     void run();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 tst_javascript::tst_javascript()
@@ -98,7 +98,7 @@ void tst_javascript::run()
 {
     QFETCH(QString, file);
 
-    QDeclarativeComponent c(&engine, file);
+    QQmlComponent c(&engine, file);
 
     if (c.isError()) {
         qWarning() << c.errors();
diff --git a/tests/benchmarks/declarative/js/js.pro b/tests/benchmarks/qml/js/js.pro
index b1448d8eb8..b1448d8eb8 100644
--- a/tests/benchmarks/declarative/js/js.pro
+++ b/tests/benchmarks/qml/js/js.pro
diff --git a/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
index f04da8ec95..f8f2874a63 100644
--- a/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro
+++ b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
@@ -4,4 +4,4 @@ TARGET = tst_bench_qjsengine
 
 SOURCES += tst_qjsengine.cpp
 
-QT += declarative testlib
+QT += qml testlib
diff --git a/tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index c7011e40a0..5713eb2f2e 100644
--- a/tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsengine.h>
+#include <QtQml/qjsvalue.h>
+#include <QtQml/qjsengine.h>
 
 
 Q_DECLARE_METATYPE(QJSValue)
diff --git a/tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
index 2dc917d3aa..772aa5da8c 100644
--- a/tests/benchmarks/declarative/js/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
@@ -4,4 +4,4 @@ TARGET = tst_bench_qjsvalue
 
 SOURCES += tst_qjsvalue.cpp
 
-QT += declarative testlib
+QT += qml testlib
diff --git a/tests/benchmarks/declarative/js/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
index 4c085ab437..6c760f37aa 100644
--- a/tests/benchmarks/declarative/js/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsengine.h>
+#include <QtQml/qjsvalue.h>
+#include <QtQml/qjsengine.h>
 
 Q_DECLARE_METATYPE(QJSValue)
 
diff --git a/tests/benchmarks/declarative/js/qjsvalueiterator/qjsvalueiterator.pro b/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
index a15ceba9a4..7601789ca9 100644
--- a/tests/benchmarks/declarative/js/qjsvalueiterator/qjsvalueiterator.pro
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
@@ -4,4 +4,4 @@ TARGET = tst_bench_qjsvalueiterator
 
 SOURCES += tst_qjsvalueiterator.cpp
 
-QT = core declarative testlib
+QT = core qml testlib
diff --git a/tests/benchmarks/declarative/js/qjsvalueiterator/tst_qjsvalueiterator.cpp b/tests/benchmarks/qml/js/qjsvalueiterator/tst_qjsvalueiterator.cpp
index f8426fbefb..51c6cffd99 100644
--- a/tests/benchmarks/declarative/js/qjsvalueiterator/tst_qjsvalueiterator.cpp
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/tst_qjsvalueiterator.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QtDeclarative/qjsengine.h>
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsvalueiterator.h>
+#include <QtQml/qjsengine.h>
+#include <QtQml/qjsvalue.h>
+#include <QtQml/qjsvalueiterator.h>
 
 class tst_QJSValueIterator : public QObject
 {
diff --git a/tests/benchmarks/declarative/painting/data/63x63.png b/tests/benchmarks/qml/painting/data/63x63.png
index d9efda8a7a..d9efda8a7a 100644
--- a/tests/benchmarks/declarative/painting/data/63x63.png
+++ b/tests/benchmarks/qml/painting/data/63x63.png
diff --git a/tests/benchmarks/declarative/painting/data/63x63_opaque.png b/tests/benchmarks/qml/painting/data/63x63_opaque.png
index d1429080db..d1429080db 100644
--- a/tests/benchmarks/declarative/painting/data/63x63_opaque.png
+++ b/tests/benchmarks/qml/painting/data/63x63_opaque.png
diff --git a/tests/benchmarks/declarative/painting/data/64x64.png b/tests/benchmarks/qml/painting/data/64x64.png
index b149f33c3d..b149f33c3d 100644
--- a/tests/benchmarks/declarative/painting/data/64x64.png
+++ b/tests/benchmarks/qml/painting/data/64x64.png
diff --git a/tests/benchmarks/declarative/painting/data/64x64_opaque.png b/tests/benchmarks/qml/painting/data/64x64_opaque.png
index 94c07f3b3e..94c07f3b3e 100644
--- a/tests/benchmarks/declarative/painting/data/64x64_opaque.png
+++ b/tests/benchmarks/qml/painting/data/64x64_opaque.png
diff --git a/tests/benchmarks/declarative/painting/paintbenchmark.cpp b/tests/benchmarks/qml/painting/paintbenchmark.cpp
index 548a9269f6..548a9269f6 100644
--- a/tests/benchmarks/declarative/painting/paintbenchmark.cpp
+++ b/tests/benchmarks/qml/painting/paintbenchmark.cpp
diff --git a/tests/benchmarks/declarative/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro
index ff85b5f5f2..ff85b5f5f2 100644
--- a/tests/benchmarks/declarative/painting/painting.pro
+++ b/tests/benchmarks/qml/painting/painting.pro
diff --git a/tests/benchmarks/declarative/pointers/pointers.pro b/tests/benchmarks/qml/pointers/pointers.pro
index d4112f94ec..d2f9729a14 100644
--- a/tests/benchmarks/declarative/pointers/pointers.pro
+++ b/tests/benchmarks/qml/pointers/pointers.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
-QT += declarative testlib
+QT += qml testlib
 TEMPLATE = app
 TARGET = tst_pointers
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/declarative/pointers/tst_pointers.cpp b/tests/benchmarks/qml/pointers/tst_pointers.cpp
index ce81c7f5c9..d65376460a 100644
--- a/tests/benchmarks/declarative/pointers/tst_pointers.cpp
+++ b/tests/benchmarks/qml/pointers/tst_pointers.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include "private/qdeclarativeguard_p.h"
+#include "private/qqmlguard_p.h"
 #include <QWeakPointer>
 
 class tst_pointers : public QObject
@@ -59,7 +59,7 @@ void tst_pointers::qmlguard()
 {
     QObject *obj = new QObject;
     QBENCHMARK {
-        QDeclarativeGuard<QObject> guardedObject;
+        QQmlGuard<QObject> guardedObject;
         guardedObject = obj;
     }
 }
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/qml/qml.pro
index 820d84b0a2..7a75c69dd1 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -6,9 +6,9 @@ SUBDIRS += \
            javascript \
            holistic \
            pointers \
-           qdeclarativecomponent \
-           qdeclarativeimage \
-           qdeclarativemetaproperty \
+           qqmlcomponent \
+           qqmlimage \
+           qqmlmetaproperty \
            script \
            qmltime \
            js
diff --git a/tests/benchmarks/declarative/qmltime/example.qml b/tests/benchmarks/qml/qmltime/example.qml
index f608963930..66c4fdacaa 100644
--- a/tests/benchmarks/declarative/qmltime/example.qml
+++ b/tests/benchmarks/qml/qmltime/example.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/qml/qmltime/qmltime.cpp
index f33b9205e7..7bca7e6544 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ b/tests/benchmarks/qml/qmltime/qmltime.cpp
@@ -38,25 +38,25 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include <QApplication>
 #include <QTime>
-#include <QDeclarativeContext>
+#include <QQmlContext>
 #include <QGraphicsScene>
 #include <QGraphicsRectItem>
 
 class Timer : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeComponent *component READ component WRITE setComponent)
+    Q_PROPERTY(QQmlComponent *component READ component WRITE setComponent)
 
 public:
     Timer();
 
-    QDeclarativeComponent *component() const;
-    void setComponent(QDeclarativeComponent *);
+    QQmlComponent *component() const;
+    void setComponent(QQmlComponent *);
 
     static Timer *timerInstance();
 
@@ -66,9 +66,9 @@ public:
     void setWillParent(bool p);
 
 private:
-    void runTest(QDeclarativeContext *, uint);
+    void runTest(QQmlContext *, uint);
 
-    QDeclarativeComponent *m_component;
+    QQmlComponent *m_component;
     static Timer *m_timer;
 
     bool m_willparent;
@@ -90,12 +90,12 @@ Timer::Timer()
     m_scene.addItem(&m_item);
 }
 
-QDeclarativeComponent *Timer::component() const
+QQmlComponent *Timer::component() const
 {
     return m_component;
 }
 
-void Timer::setComponent(QDeclarativeComponent *c)
+void Timer::setComponent(QQmlComponent *c)
 {
     m_component = c;
 }
@@ -107,7 +107,7 @@ Timer *Timer::timerInstance()
 
 void Timer::run(uint iterations)
 {
-    QDeclarativeContext context(qmlContext(this));
+    QQmlContext context(qmlContext(this));
 
     QObject *o = m_component->create(&context);
     QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
@@ -128,7 +128,7 @@ void Timer::setWillParent(bool p)
     m_willparent = p;
 }
 
-void Timer::runTest(QDeclarativeContext *context, uint iterations)
+void Timer::runTest(QQmlContext *context, uint iterations)
 {
     QTime t;
     t.start();
@@ -249,8 +249,8 @@ int main(int argc, char ** argv)
     if (filename.isEmpty())
         usage(argv[0]);
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, filename);
+    QQmlEngine engine;
+    QQmlComponent component(&engine, filename);
     if (component.isError()) {
         qWarning() << component.errors();
         return -1;
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.pro b/tests/benchmarks/qml/qmltime/qmltime.pro
index e1948981bf..6cc6d13b34 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.pro
+++ b/tests/benchmarks/qml/qmltime/qmltime.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = qmltime
-QT += declarative widgets testlib
+QT += qml widgets testlib
 macx:CONFIG -= app_bundle
 
 SOURCES += qmltime.cpp 
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml b/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml
index b08b43268c..6ecfb3d48f 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
+++ b/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml b/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml
index a173050427..c2e3b3decb 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
+++ b/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml b/tests/benchmarks/qml/qmltime/tests/anchors/null.qml
index ea01839e14..677281f162 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
+++ b/tests/benchmarks/qml/qmltime/tests/anchors/null.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml b/tests/benchmarks/qml/qmltime/tests/animation/large.qml
index b58de4955b..16aad5c9ec 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
+++ b/tests/benchmarks/qml/qmltime/tests/animation/large.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml b/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml
index fbe4acb8d3..5538182646 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
+++ b/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml
index 85698d6bf6..4677bb6e72 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
+++ b/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml
index 6a8ca1b968..af54e9c9e9 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
+++ b/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml
index 4dde9f289e..87d61b810e 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
+++ b/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml b/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml
index 802598839c..029f782ef5 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
+++ b/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml b/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml
index d5d22f948c..1310115c43 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
+++ b/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml
index ab42dfb2f9..bed709991e 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
+++ b/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml
index c32ca2e61b..a25cbb8f45 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
+++ b/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml
index dff5f11f99..ae2ad3e60e 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
+++ b/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml b/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml
index 6b16afc1c4..a077f448d5 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
+++ b/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml
index e9f13e9deb..0377a8e1a2 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
+++ b/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml
index d50da90764..e9fc2c06ec 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
+++ b/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml b/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml
index 8f7814be6a..3a5daec0a5 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
+++ b/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml b/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml
index 34d6b30670..c283261dd5 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
+++ b/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml b/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml
index 4dd63bb36e..4722150d98 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
+++ b/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml b/tests/benchmarks/qml/qqmlcomponent/data/myqmlobject.qml
index a7db476f70..4c7e48fc7c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/myqmlobject.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml b/tests/benchmarks/qml/qqmlcomponent/data/myqmlobject_binding.qml
index a8add75aee..918f93c30e 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/myqmlobject_binding.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml b/tests/benchmarks/qml/qqmlcomponent/data/object.qml
index 91371c80d6..726871b8ea 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/object.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml b/tests/benchmarks/qml/qqmlcomponent/data/object_id.qml
index 240f27b4ac..eb99567717 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/object_id.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/qml/qqmlcomponent/data/samegame/BoomBlock.qml
index dbe9e99260..5678fa400e 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/samegame/BoomBlock.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png
+++ b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/blueStone.png
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png
+++ b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/greenStone.png
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png
+++ b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/redStone.png
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png
+++ b/tests/benchmarks/qml/qqmlcomponent/data/samegame/pics/yellowStone.png
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml b/tests/benchmarks/qml/qqmlcomponent/data/synthesized_properties.2.qml
index 3a86c48af1..ec987defb3 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/synthesized_properties.2.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml b/tests/benchmarks/qml/qqmlcomponent/data/synthesized_properties.qml
index 9d4dc03c82..397efae5f8 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
+++ b/tests/benchmarks/qml/qqmlcomponent/data/synthesized_properties.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
index 0d415db8ba..ba41f5a95b 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
+++ b/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
@@ -1,10 +1,10 @@
 CONFIG += testcase
 TEMPLATE = app
-TARGET = tst_qdeclarativecomponent
-QT += declarative testlib
+TARGET = tst_qqmlcomponent
+QT += qml testlib
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp
+SOURCES += tst_qqmlcomponent.cpp testtypes.cpp
 HEADERS += testtypes.h
 
 # Define SRCDIR equal to test's source directory
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp b/tests/benchmarks/qml/qqmlcomponent/testtypes.cpp
index 4d2932aa79..4d2932aa79 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
+++ b/tests/benchmarks/qml/qqmlcomponent/testtypes.cpp
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h b/tests/benchmarks/qml/qqmlcomponent/testtypes.h
index 1c99842e33..03542ca24c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
+++ b/tests/benchmarks/qml/qqmlcomponent/testtypes.h
@@ -42,7 +42,7 @@
 #define TESTTYPES_H
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 class MyQmlObject : public QObject
 {
@@ -50,7 +50,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(int result READ result WRITE setResult)
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(MyQmlObject *object READ object WRITE setObject NOTIFY objectChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> data READ data)
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data)
     Q_CLASSINFO("DefaultProperty", "data")
 public:
     MyQmlObject() : m_result(0), m_value(0), m_object(0) {}
@@ -61,7 +61,7 @@ public:
     int value() const { return m_value; }
     void setValue(int v) { m_value = v; emit valueChanged(); }
 
-    QDeclarativeListProperty<QObject> data() { return QDeclarativeListProperty<QObject>(this, m_data); }
+    QQmlListProperty<QObject> data() { return QQmlListProperty<QObject>(this, m_data); }
 
     MyQmlObject *object() const { return m_object; }
     void setObject(MyQmlObject *o) { m_object = o; emit objectChanged(); }
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/benchmarks/qml/qqmlcomponent/tst_qqmlcomponent.cpp
index d20126b132..47b7455a94 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
+++ b/tests/benchmarks/qml/qqmlcomponent/tst_qqmlcomponent.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QFile>
 #include <QDebug>
 #include "testtypes.h"
@@ -63,7 +63,7 @@ private slots:
     void creation();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 tst_qmlcomponent::tst_qmlcomponent()
@@ -100,7 +100,7 @@ void tst_qmlcomponent::creation()
 {
     QFETCH(QString, file);
 
-    QDeclarativeComponent c(&engine, file);
+    QQmlComponent c(&engine, file);
     QVERIFY(c.isReady());
 
     QObject *obj = c.create();
@@ -113,4 +113,4 @@ void tst_qmlcomponent::creation()
 }
 
 QTEST_MAIN(tst_qmlcomponent)
-#include "tst_qdeclarativecomponent.moc"
+#include "tst_qqmlcomponent.moc"
diff --git a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
new file mode 100644
index 0000000000..ebf0ae074f
--- /dev/null
+++ b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
@@ -0,0 +1,8 @@
+CONFIG += testcase
+QT += qml testlib
+TEMPLATE = app
+TARGET = tst_qqmldebugtrace
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qqmldebugtrace.cpp
+
diff --git a/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp b/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp
index a8ac44a008..36144f6a76 100644
--- a/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp
+++ b/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp
@@ -43,12 +43,12 @@
 #include <QObject>
 #include <qtest.h>
 
-class tst_qdeclarativedebugtrace : public QObject
+class tst_qqmldebugtrace : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_qdeclarativedebugtrace() {}
+    tst_qqmldebugtrace() {}
 
 private slots:
     void all();
@@ -57,7 +57,7 @@ private slots:
     void trace();
 };
 
-void tst_qdeclarativedebugtrace::all()
+void tst_qqmldebugtrace::all()
 {
     QBENCHMARK {
         QElapsedTimer t;
@@ -66,7 +66,7 @@ void tst_qdeclarativedebugtrace::all()
     }
 }
 
-void tst_qdeclarativedebugtrace::startElapsed()
+void tst_qqmldebugtrace::startElapsed()
 {
     QElapsedTimer t;
     QBENCHMARK {
@@ -75,7 +75,7 @@ void tst_qdeclarativedebugtrace::startElapsed()
     }
 }
 
-void tst_qdeclarativedebugtrace::doubleElapsed()
+void tst_qqmldebugtrace::doubleElapsed()
 {
     QElapsedTimer t;
     t.start();
@@ -85,7 +85,7 @@ void tst_qdeclarativedebugtrace::doubleElapsed()
     }
 }
 
-void tst_qdeclarativedebugtrace::trace()
+void tst_qqmldebugtrace::trace()
 {
     QString s("A decent sized string of text here.");
     QBENCHMARK {
@@ -95,6 +95,6 @@ void tst_qdeclarativedebugtrace::trace()
     }
 }
 
-QTEST_MAIN(tst_qdeclarativedebugtrace)
+QTEST_MAIN(tst_qqmldebugtrace)
 
-#include "tst_qdeclarativedebugtrace.moc"
+#include "tst_qqmldebugtrace.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/image.png b/tests/benchmarks/qml/qqmlimage/image.png
index 623d36233d..623d36233d 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/image.png
+++ b/tests/benchmarks/qml/qqmlimage/image.png
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
index 6a46e8f40c..21d3efdd1f 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
+++ b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
@@ -1,11 +1,11 @@
 CONFIG += testcase
 TEMPLATE = app
-TARGET = tst_qdeclarativeimage
-QT += declarative testlib
+TARGET = tst_qqmlimage
+QT += qml quick-private testlib
 macx:CONFIG -= app_bundle
 CONFIG += release
 
-SOURCES += tst_qdeclarativeimage.cpp
+SOURCES += tst_qqmlimage.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp
index fcebd35671..ec872b881a 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <private/qdeclarativeimage_p.h>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <private/qquickimage_p.h>
 
 class tst_qmlgraphicsimage : public QObject
 {
@@ -56,7 +56,7 @@ private slots:
     void qmlgraphicsimage_url();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 void tst_qmlgraphicsimage::qmlgraphicsimage()
@@ -65,8 +65,8 @@ void tst_qmlgraphicsimage::qmlgraphicsimage()
     QUrl url(SRCDIR "/image.png");
     QBENCHMARK {
         QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QDeclarativeImage *image = new QDeclarativeImage;
-        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        QQuickImage *image = new QQuickImage;
+        QQmlEngine::setContextForObject(image, engine.rootContext());
         delete image;
     }
 }
@@ -77,14 +77,14 @@ void tst_qmlgraphicsimage::qmlgraphicsimage_file()
     QUrl url(SRCDIR "/image.png");
     //get rid of initialization effects
     {
-        QDeclarativeImage *image = new QDeclarativeImage;
-        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        QQuickImage *image = new QQuickImage;
+        QQmlEngine::setContextForObject(image, engine.rootContext());
         image->setSource(url);
     }
     QBENCHMARK {
         QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QDeclarativeImage *image = new QDeclarativeImage;
-        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        QQuickImage *image = new QQuickImage;
+        QQmlEngine::setContextForObject(image, engine.rootContext());
         image->setSource(url);
         delete image;
     }
@@ -96,8 +96,8 @@ void tst_qmlgraphicsimage::qmlgraphicsimage_url()
     QUrl url(SRCDIR "/image.png");
     QBENCHMARK {
         QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QDeclarativeImage *image = new QDeclarativeImage;
-        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        QQuickImage *image = new QQuickImage;
+        QQmlEngine::setContextForObject(image, engine.rootContext());
         image->setSource(url2);
         delete image;
     }
@@ -105,4 +105,4 @@ void tst_qmlgraphicsimage::qmlgraphicsimage_url()
 
 QTEST_MAIN(tst_qmlgraphicsimage)
 
-#include "tst_qdeclarativeimage.moc"
+#include "tst_qqmlimage.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml b/tests/benchmarks/qml/qqmlmetaproperty/data/object.qml
index c386df72a3..47c0442d29 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
+++ b/tests/benchmarks/qml/qqmlmetaproperty/data/object.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml b/tests/benchmarks/qml/qqmlmetaproperty/data/synthesized_object.qml
index 6eec87aea1..a4609cb6e0 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
+++ b/tests/benchmarks/qml/qqmlmetaproperty/data/synthesized_object.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
index 1ac0bb240a..9d507e9581 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
+++ b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
@@ -1,10 +1,10 @@
 CONFIG += testcase
 TEMPLATE = app
-TARGET = tst_qdeclarativemetaproperty
-QT += declarative testlib
+TARGET = tst_qqmlmetaproperty
+QT += qml testlib
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qdeclarativemetaproperty.cpp 
+SOURCES += tst_qqmlmetaproperty.cpp 
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/benchmarks/qml/qqmlmetaproperty/tst_qqmlmetaproperty.cpp
index 7726c051ac..216d603da8 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/benchmarks/qml/qqmlmetaproperty/tst_qqmlmetaproperty.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <QDeclarativeProperty>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <QQmlProperty>
 #include <QFile>
 #include <QDebug>
 
@@ -63,7 +63,7 @@ private slots:
     void lookup();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 tst_qmlmetaproperty::tst_qmlmetaproperty()
@@ -94,17 +94,17 @@ void tst_qmlmetaproperty::lookup()
 {
     QFETCH(QString, file);
 
-    QDeclarativeComponent c(&engine, file);
+    QQmlComponent c(&engine, file);
     QVERIFY(c.isReady());
 
     QObject *obj = c.create();
 
     QBENCHMARK {
-        QDeclarativeProperty p(obj, "x");
+        QQmlProperty p(obj, "x");
     }
 
     delete obj;
 }
 
 QTEST_MAIN(tst_qmlmetaproperty)
-#include "tst_qdeclarativemetaproperty.moc"
+#include "tst_qqmlmetaproperty.moc"
diff --git a/tests/benchmarks/declarative/script/data/CustomObject.qml b/tests/benchmarks/qml/script/data/CustomObject.qml
index 7c8c561114..485f8a1354 100644
--- a/tests/benchmarks/declarative/script/data/CustomObject.qml
+++ b/tests/benchmarks/qml/script/data/CustomObject.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/block.qml b/tests/benchmarks/qml/script/data/block.qml
index 67ad5cbed2..3816b9f64b 100644
--- a/tests/benchmarks/declarative/script/data/block.qml
+++ b/tests/benchmarks/qml/script/data/block.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/enums.qml b/tests/benchmarks/qml/script/data/enums.qml
index 8450b15732..8450b15732 100644
--- a/tests/benchmarks/declarative/script/data/enums.qml
+++ b/tests/benchmarks/qml/script/data/enums.qml
diff --git a/tests/benchmarks/declarative/script/data/global.js b/tests/benchmarks/qml/script/data/global.js
index 4e3a4780f9..4e3a4780f9 100644
--- a/tests/benchmarks/declarative/script/data/global.js
+++ b/tests/benchmarks/qml/script/data/global.js
diff --git a/tests/benchmarks/declarative/script/data/global_prop.qml b/tests/benchmarks/qml/script/data/global_prop.qml
index c77faaf9f4..c77faaf9f4 100644
--- a/tests/benchmarks/declarative/script/data/global_prop.qml
+++ b/tests/benchmarks/qml/script/data/global_prop.qml
diff --git a/tests/benchmarks/declarative/script/data/namespacedEnums.qml b/tests/benchmarks/qml/script/data/namespacedEnums.qml
index e49bf7e1ad..e49bf7e1ad 100644
--- a/tests/benchmarks/declarative/script/data/namespacedEnums.qml
+++ b/tests/benchmarks/qml/script/data/namespacedEnums.qml
diff --git a/tests/benchmarks/declarative/script/data/script.js b/tests/benchmarks/qml/script/data/script.js
index 9f46570004..9f46570004 100644
--- a/tests/benchmarks/declarative/script/data/script.js
+++ b/tests/benchmarks/qml/script/data/script.js
diff --git a/tests/benchmarks/declarative/script/data/script2.js b/tests/benchmarks/qml/script/data/script2.js
index 102f081140..102f081140 100644
--- a/tests/benchmarks/declarative/script/data/script2.js
+++ b/tests/benchmarks/qml/script/data/script2.js
diff --git a/tests/benchmarks/declarative/script/data/scriptCall.qml b/tests/benchmarks/qml/script/data/scriptCall.qml
index 420f621dfc..420f621dfc 100644
--- a/tests/benchmarks/declarative/script/data/scriptCall.qml
+++ b/tests/benchmarks/qml/script/data/scriptCall.qml
diff --git a/tests/benchmarks/declarative/script/data/signal_args.qml b/tests/benchmarks/qml/script/data/signal_args.qml
index ed5c56a197..757ac1a1f9 100644
--- a/tests/benchmarks/declarative/script/data/signal_args.qml
+++ b/tests/benchmarks/qml/script/data/signal_args.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/signal_qml.qml b/tests/benchmarks/qml/script/data/signal_qml.qml
index c5bda7d18e..c7314a6b1e 100644
--- a/tests/benchmarks/declarative/script/data/signal_qml.qml
+++ b/tests/benchmarks/qml/script/data/signal_qml.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/signal_unconnected.qml b/tests/benchmarks/qml/script/data/signal_unconnected.qml
index 90fe2bc6f5..a33942dd2d 100644
--- a/tests/benchmarks/declarative/script/data/signal_unconnected.qml
+++ b/tests/benchmarks/qml/script/data/signal_unconnected.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/signal_unusedArgs.qml b/tests/benchmarks/qml/script/data/signal_unusedArgs.qml
index 6de5815939..52b4e1a54f 100644
--- a/tests/benchmarks/declarative/script/data/signal_unusedArgs.qml
+++ b/tests/benchmarks/qml/script/data/signal_unusedArgs.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/slot_complex.qml b/tests/benchmarks/qml/script/data/slot_complex.qml
index 8e2cb30089..4763146c65 100644
--- a/tests/benchmarks/declarative/script/data/slot_complex.qml
+++ b/tests/benchmarks/qml/script/data/slot_complex.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/slot_complex_js.js b/tests/benchmarks/qml/script/data/slot_complex_js.js
index 64a1f65daa..64a1f65daa 100644
--- a/tests/benchmarks/declarative/script/data/slot_complex_js.js
+++ b/tests/benchmarks/qml/script/data/slot_complex_js.js
diff --git a/tests/benchmarks/declarative/script/data/slot_complex_js.qml b/tests/benchmarks/qml/script/data/slot_complex_js.qml
index ca06046389..e44fc73f8e 100644
--- a/tests/benchmarks/declarative/script/data/slot_complex_js.qml
+++ b/tests/benchmarks/qml/script/data/slot_complex_js.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/slot_simple.qml b/tests/benchmarks/qml/script/data/slot_simple.qml
index c93fbcc757..b788970d12 100644
--- a/tests/benchmarks/declarative/script/data/slot_simple.qml
+++ b/tests/benchmarks/qml/script/data/slot_simple.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/data/slot_simple_js.js b/tests/benchmarks/qml/script/data/slot_simple_js.js
index d6e60608da..d6e60608da 100644
--- a/tests/benchmarks/declarative/script/data/slot_simple_js.js
+++ b/tests/benchmarks/qml/script/data/slot_simple_js.js
diff --git a/tests/benchmarks/declarative/script/data/slot_simple_js.qml b/tests/benchmarks/qml/script/data/slot_simple_js.qml
index 07334ab4fa..5af1b0868f 100644
--- a/tests/benchmarks/declarative/script/data/slot_simple_js.qml
+++ b/tests/benchmarks/qml/script/data/slot_simple_js.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/qml/script/script.pro
index 310d17d3c9..88e8d9b33d 100644
--- a/tests/benchmarks/declarative/script/script.pro
+++ b/tests/benchmarks/qml/script/script.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_script
-QT += declarative testlib
+QT += qml qml-private testlib v8-private core-private
 macx:CONFIG -= app_bundle
 CONFIG += release
 
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/qml/script/tst_script.cpp
index 0e5d782134..204fb945eb 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/qml/script/tst_script.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
-#include <private/qdeclarativeengine_p.h>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <private/qqmlengine_p.h>
 #include <private/qdeclarativeobjectscriptclass_p.h>
-#include <private/qdeclarativerectangle_p.h>
+#include <private/qquickrectangle_p.h>
 #include <QScriptEngine>
 #include <QScriptValue>
 
@@ -309,12 +309,12 @@ void tst_script::property_qobject()
 
 void tst_script::property_qmlobject()
 {
-    QDeclarativeEngine qmlengine;
+    QQmlEngine qmlengine;
 
-    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QQmlEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QQmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -352,12 +352,12 @@ void tst_script::setproperty_js()
 
 void tst_script::setproperty_qmlobject()
 {
-    QDeclarativeEngine qmlengine;
+    QQmlEngine qmlengine;
 
-    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QQmlEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QQmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -436,12 +436,12 @@ void tst_script::function_qobject()
 
 void tst_script::function_qmlobject()
 {
-    QDeclarativeEngine qmlengine;
+    QQmlEngine qmlengine;
 
-    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QQmlEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QQmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -520,12 +520,12 @@ void tst_script::function_args_qobject()
 
 void tst_script::function_args_qmlobject()
 {
-    QDeclarativeEngine qmlengine;
+    QQmlEngine qmlengine;
 
-    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QQmlEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QQmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -539,8 +539,8 @@ void tst_script::function_args_qmlobject()
 
 void tst_script::signal_unconnected()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("signal_unconnected.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("signal_unconnected.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -553,8 +553,8 @@ void tst_script::signal_unconnected()
 
 void tst_script::signal_qml()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("signal_qml.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("signal_qml.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -567,8 +567,8 @@ void tst_script::signal_qml()
 
 void tst_script::signal_args()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("signal_args.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("signal_args.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -581,8 +581,8 @@ void tst_script::signal_args()
 
 void tst_script::signal_unusedArgs()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("signal_unusedArgs.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("signal_unusedArgs.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -595,8 +595,8 @@ void tst_script::signal_unusedArgs()
 
 void tst_script::slot_simple()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("slot_simple.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("slot_simple.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -609,8 +609,8 @@ void tst_script::slot_simple()
 
 void tst_script::slot_simple_js()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("slot_simple_js.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("slot_simple_js.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -623,8 +623,8 @@ void tst_script::slot_simple_js()
 
 void tst_script::slot_complex()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("slot_complex.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("slot_complex.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -637,8 +637,8 @@ void tst_script::slot_complex()
 
 void tst_script::slot_complex_js()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("slot_complex_js.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("slot_complex_js.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -660,9 +660,9 @@ void tst_script::block_data()
 void tst_script::block()
 {
     QFETCH(QString, methodName);
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("block.qml"));
-    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle *>(component.create());
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("block.qml"));
+    QQuickRectangle *rect = qobject_cast<QQuickRectangle *>(component.create());
     QVERIFY(rect != 0);
 
     int index = rect->metaObject()->indexOfMethod(methodName.toUtf8());
@@ -697,9 +697,9 @@ void tst_script::global_property_js()
 
 void tst_script::global_property_qml()
 {
-    QDeclarativeEngine qmlengine;
+    QQmlEngine qmlengine;
 
-    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QQmlEnginePrivate::getScriptEngine(&qmlengine);
     QScriptValue prog = engine->evaluate(GLOBALPROPERTY_PROGRAM);
     prog.call();
 
@@ -710,9 +710,9 @@ void tst_script::global_property_qml()
 
 void tst_script::global_property_qml_js()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("global_prop.qml"));
-    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle *>(component.create());
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("global_prop.qml"));
+    QQuickRectangle *rect = qobject_cast<QQuickRectangle *>(component.create());
     QVERIFY(rect != 0);
 
     int index = rect->metaObject()->indexOfMethod("triggered()");
@@ -728,9 +728,9 @@ void tst_script::global_property_qml_js()
 
 void tst_script::scriptfile_property()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("global_prop.qml"));
-    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle *>(component.create());
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("global_prop.qml"));
+    QQuickRectangle *rect = qobject_cast<QQuickRectangle *>(component.create());
     QVERIFY(rect != 0);
 
     int index = rect->metaObject()->indexOfMethod("incrementTriggered()");
@@ -746,8 +746,8 @@ void tst_script::scriptfile_property()
 
 void tst_script::enums()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("enums.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("enums.qml"));
     QObject *o = component.create();
     QVERIFY(o != 0);
 
@@ -764,8 +764,8 @@ void tst_script::enums()
 
 void tst_script::namespacedEnums()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("namespacedEnums.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("namespacedEnums.qml"));
     QObject *o = component.create();
     QVERIFY(o != 0);
 
@@ -782,8 +782,8 @@ void tst_script::namespacedEnums()
 
 void tst_script::scriptCall()
 {
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, TEST_FILE("scriptCall.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, TEST_FILE("scriptCall.qml"));
     QObject *o = component.create();
     QVERIFY(o != 0);
 
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml b/tests/benchmarks/qml/typeimports/data/QmlTestType1.qml
index 47467a64a6..eb1ae13881 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml
+++ b/tests/benchmarks/qml/typeimports/data/QmlTestType1.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml b/tests/benchmarks/qml/typeimports/data/QmlTestType2.qml
index 2547d44ec0..f6801cddef 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml
+++ b/tests/benchmarks/qml/typeimports/data/QmlTestType2.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml b/tests/benchmarks/qml/typeimports/data/QmlTestType3.qml
index b07f70a802..21ade835ec 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml
+++ b/tests/benchmarks/qml/typeimports/data/QmlTestType3.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml b/tests/benchmarks/qml/typeimports/data/QmlTestType4.qml
index 3407b3b0bd..45fdbfbb09 100644
--- a/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml
+++ b/tests/benchmarks/qml/typeimports/data/QmlTestType4.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/typeimports/data/cpp.qml b/tests/benchmarks/qml/typeimports/data/cpp.qml
index 28bc3222d3..8700846b5a 100644
--- a/tests/benchmarks/declarative/typeimports/data/cpp.qml
+++ b/tests/benchmarks/qml/typeimports/data/cpp.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/typeimports/data/qml.qml b/tests/benchmarks/qml/typeimports/data/qml.qml
index c6a71b30c5..1235cde924 100644
--- a/tests/benchmarks/declarative/typeimports/data/qml.qml
+++ b/tests/benchmarks/qml/typeimports/data/qml.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp b/tests/benchmarks/qml/typeimports/tst_typeimports.cpp
index a4fb034eb2..69b3f2e215 100644
--- a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp
+++ b/tests/benchmarks/qml/typeimports/tst_typeimports.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 
 class tst_typeimports : public QObject
@@ -55,22 +55,22 @@ private slots:
     void qml();
 
 private:
-    QDeclarativeEngine engine;
+    QQmlEngine engine;
 };
 
 class TestType1 : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QObject> resources READ resources);
+    Q_PROPERTY(QQmlListProperty<QObject> resources READ resources);
     Q_CLASSINFO("DefaultProperty", "resources");
 public:
     TestType1(QObject *parent = 0) : QObject(parent) {}
 
-    QDeclarativeListProperty<QObject> resources() {
-        return QDeclarativeListProperty<QObject>(this, 0, resources_append);
+    QQmlListProperty<QObject> resources() {
+        return QQmlListProperty<QObject>(this, 0, resources_append);
     }
 
-    static void resources_append(QDeclarativeListProperty<QObject> *p, QObject *o) {
+    static void resources_append(QQmlListProperty<QObject> *p, QObject *o) {
         o->setParent(p->object);
     }
 };
@@ -114,7 +114,7 @@ inline QUrl TEST_FILE(const QString &filename)
 void tst_typeimports::cpp()
 {
     QBENCHMARK {
-        QDeclarativeComponent component(&engine, TEST_FILE("cpp.qml"));
+        QQmlComponent component(&engine, TEST_FILE("cpp.qml"));
         QVERIFY(component.isReady());
     }
 }
@@ -122,10 +122,10 @@ void tst_typeimports::cpp()
 void tst_typeimports::qml()
 {
     //get rid of initialization effects
-    { QDeclarativeComponent component(&engine, TEST_FILE("qml.qml")); }
+    { QQmlComponent component(&engine, TEST_FILE("qml.qml")); }
 
     QBENCHMARK {
-        QDeclarativeComponent component(&engine, TEST_FILE("qml.qml"));
+        QQmlComponent component(&engine, TEST_FILE("qml.qml"));
         QVERIFY(component.isReady());
     }
 }
diff --git a/tests/benchmarks/declarative/typeimports/typeimports.pro b/tests/benchmarks/qml/typeimports/typeimports.pro
index 403387f0ce..dc58e4044b 100644
--- a/tests/benchmarks/declarative/typeimports/typeimports.pro
+++ b/tests/benchmarks/qml/typeimports/typeimports.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_typeimports
-QT += declarative testlib
+QT += qml testlib
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_typeimports.cpp