911 files changed, 473 insertions, 473 deletions

diff --git a/examples/declarative/canvas/stockchart/stockchart.pro b/examples/declarative/canvas/stockchart/stockchart.pro
deleted file mode 100644
index 4006b5dccf..0000000000
--- a/examples/declarative/canvas/stockchart/stockchart.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative network
-
-DESTDIR = com/nokia/StockChartExample
-TARGET  = qmlstockchartexampleplugin
-
-SOURCES += model.cpp  plugin.cpp
-HEADERS += model.h
-qdeclarativesources.files += \
-    com/nokia/StockChartExample/qmldir \
-    stock.qml
-
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nokia/StockChartExample
-
-sources.files += stockchart.pro model.h model.cpp plugin.cpp README
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nokia/StockChartExample
-
-INSTALLS += qdeclarativesources sources target
diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/declarative/painteditem/textballoons/textballoons.pro
deleted file mode 100644
index 453a00336d..0000000000
--- a/examples/declarative/painteditem/textballoons/textballoons.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative quick
-
-TARGET = qmltextballoonplugin
-
-HEADERS += TextBalloonPlugin/plugin.h \
-    textballoon.h
-
-SOURCES += textballoon.cpp
-
-DESTDIR = TextBalloonPlugin
-
-qdeclarativesources.files += \
-    TextBalloonPlugin/qmldir
-
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/painteditem/textballoons/TextBalloonPlugin
- 
-sources.files = textballoons.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/painteditem/textballoons
-target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/painteditem/textballoons/TextBalloonPlugin
-
-INSTALLS = qdeclarativesources sources target
diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri
index a3627b8fa2..4286bb6e24 100644
--- a/examples/embedded/qmlcalculator/deployment.pri
+++ b/examples/embedded/qmlcalculator/deployment.pri
@@ -1,4 +1,4 @@
-qmlcalculator_src = $$PWD/../../declarative/calculator
+qmlcalculator_src = $$PWD/../../qml/calculator
 
 qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core
 DEPLOYMENT += qmlcalculator_files
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp
index 4be7bc462d..17bf0f14f2 100644
--- a/examples/embedded/qmlcalculator/qmlcalculator.cpp
+++ b/examples/embedded/qmlcalculator/qmlcalculator.cpp
@@ -41,17 +41,17 @@
 
 #include <QtCore/QFileInfo>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
 
 int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
 
     const QString mainQmlApp = QLatin1String("calculator.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
 
 #if defined(QT_KEYPAD_NAVIGATION)
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro
index 25c16ca78a..4ebf2d5972 100644
--- a/examples/embedded/qmlcalculator/qmlcalculator.pro
+++ b/examples/embedded/qmlcalculator/qmlcalculator.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative
+QT += qml
 SOURCES += $$PWD/qmlcalculator.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri
index 771a4dba76..75b39ac48f 100644
--- a/examples/embedded/qmlclocks/deployment.pri
+++ b/examples/embedded/qmlclocks/deployment.pri
@@ -1,4 +1,4 @@
-qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks
+qmlclocks_src = $$PWD/../../../examples/qml/toys/clocks
 
 qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content
 DEPLOYMENT += qmlclocks_files
diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp
index ce42ec7b18..1f9a553944 100644
--- a/examples/embedded/qmlclocks/qmlclocks.cpp
+++ b/examples/embedded/qmlclocks/qmlclocks.cpp
@@ -41,17 +41,17 @@
 
 #include <QtCore/QFileInfo>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
 
 int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
 
     const QString mainQmlApp = QLatin1String("clocks.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
 
 #if defined(QT_KEYPAD_NAVIGATION)
diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro
index 8e9dcdf87c..43a9e31972 100644
--- a/examples/embedded/qmlclocks/qmlclocks.pro
+++ b/examples/embedded/qmlclocks/qmlclocks.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative
+QT += qml
 SOURCES += $$PWD/qmlclocks.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri
index d845120923..58c815e1e5 100644
--- a/examples/embedded/qmldialcontrol/deployment.pri
+++ b/examples/embedded/qmldialcontrol/deployment.pri
@@ -1,4 +1,4 @@
-qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol
+qmldialcontrol_src = $$PWD/../../../examples/qml/ui-components/dialcontrol
 
 qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content
 DEPLOYMENT += qmldialcontrol_files
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
index e66f6f6c56..6f81e5f8a0 100644
--- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
+++ b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
@@ -41,17 +41,17 @@
 
 #include <QtCore/QFileInfo>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
 
 int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
 
     const QString mainQmlApp = QLatin1String("dialcontrol.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
 
 #if defined(QT_KEYPAD_NAVIGATION)
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
index 08f876b926..58ed7cabb8 100644
--- a/examples/embedded/qmldialcontrol/qmldialcontrol.pro
+++ b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative
+QT += qml
 SOURCES += $$PWD/qmldialcontrol.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri
index 7a5d0401cb..427259b816 100644
--- a/examples/embedded/qmleasing/deployment.pri
+++ b/examples/embedded/qmleasing/deployment.pri
@@ -1,4 +1,4 @@
-qmleasing_src = $$PWD/../../../examples/declarative/animation/easing
+qmleasing_src = $$PWD/../../../examples/qml/animation/easing
 
 qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content
 DEPLOYMENT += qmleasing_files
diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp
index 8220e03cff..d516825d9a 100644
--- a/examples/embedded/qmleasing/qmleasing.cpp
+++ b/examples/embedded/qmleasing/qmleasing.cpp
@@ -41,17 +41,17 @@
 
 #include <QtCore/QFileInfo>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
 
 int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
 
     const QString mainQmlApp = QLatin1String("easing.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
 
 #if defined(QT_KEYPAD_NAVIGATION)
diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro
index c9f008d42e..6e0383502b 100644
--- a/examples/embedded/qmleasing/qmleasing.pro
+++ b/examples/embedded/qmleasing/qmleasing.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative
+QT += qml
 SOURCES += $$PWD/qmleasing.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri
index 0d76ddc1db..7b9b62b459 100644
--- a/examples/embedded/qmlflickr/deployment.pri
+++ b/examples/embedded/qmlflickr/deployment.pri
@@ -1,4 +1,4 @@
-qmlflickr_src = $$PWD/../../declarative/flickr
+qmlflickr_src = $$PWD/../../qml/flickr
 
 qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile
 DEPLOYMENT += qmlflickr_files
diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp
index 93b28f7cec..268542e61b 100644
--- a/examples/embedded/qmlflickr/qmlflickr.cpp
+++ b/examples/embedded/qmlflickr/qmlflickr.cpp
@@ -42,17 +42,17 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlNetworkAccessManagerFactory>
 #include <QtNetwork/QNetworkConfiguration>
 #include <QtNetwork/QNetworkConfigurationManager>
 #include <QtNetwork/QNetworkAccessManager>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlEngine>
 
 // Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
 // the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
 public:
     ~NetworkAccessManagerFactory() { }
@@ -92,10 +92,10 @@ int main(int argc, char *argv[])
     NetworkAccessManagerFactory networkAccessManagerFactory;
 
     const QString mainQmlApp = QLatin1String("flickr.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
     view.setGeometry(QRect(100, 100, 360, 640));
     view.show();
diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro
index 869d651b05..141c02d3fe 100644
--- a/examples/embedded/qmlflickr/qmlflickr.pro
+++ b/examples/embedded/qmlflickr/qmlflickr.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative network
+QT += qml network
 SOURCES += $$PWD/qmlflickr.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri
index 504373914a..ea9a052b4b 100644
--- a/examples/embedded/qmlphotoviewer/deployment.pri
+++ b/examples/embedded/qmlphotoviewer/deployment.pri
@@ -1,4 +1,4 @@
-qmlphotoviewer_src = $$PWD/../../declarative/photoviewer
+qmlphotoviewer_src = $$PWD/../../qml/photoviewer
 
 qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore
 DEPLOYMENT += qmlphotoviewer_files
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
index 32c9d24eaa..18bf1ae094 100644
--- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
+++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
@@ -42,16 +42,16 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlNetworkAccessManagerFactory>
 #include <QtNetwork/QNetworkConfiguration>
 #include <QtNetwork/QNetworkConfigurationManager>
 #include <QtNetwork/QNetworkAccessManager>
 
 // Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
 // the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
 public:
     ~NetworkAccessManagerFactory() { }
@@ -91,10 +91,10 @@ int main(int argc, char *argv[])
     NetworkAccessManagerFactory networkAccessManagerFactory;
 
     const QString mainQmlApp = QLatin1String("photoviewer.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
 
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
     view.setGeometry(QRect(100, 100, 360, 640));
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
index 9941b2e226..1c0301118e 100644
--- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
+++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative network
+QT += qml network
 SOURCES += $$PWD/qmlphotoviewer.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri
index a3c045ca54..2f3066bc72 100644
--- a/examples/embedded/qmltwitter/deployment.pri
+++ b/examples/embedded/qmltwitter/deployment.pri
@@ -1,4 +1,4 @@
-qmltwitter_src = $$PWD/../../declarative/twitter
+qmltwitter_src = $$PWD/../../qml/twitter
 
 qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore
 DEPLOYMENT += qmltwitter_files
diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp
index 19b187bc82..a3a5c40f34 100644
--- a/examples/embedded/qmltwitter/qmltwitter.cpp
+++ b/examples/embedded/qmltwitter/qmltwitter.cpp
@@ -42,16 +42,16 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
 #include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlNetworkAccessManagerFactory>
 #include <QtNetwork/QNetworkConfiguration>
 #include <QtNetwork/QNetworkConfigurationManager>
 #include <QtNetwork/QNetworkAccessManager>
 
 // Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
 // the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
 public:
     ~NetworkAccessManagerFactory() { }
@@ -91,10 +91,10 @@ int main(int argc, char *argv[])
     NetworkAccessManagerFactory networkAccessManagerFactory;
 
     const QString mainQmlApp = QLatin1String("twitter.qml");
-    QDeclarativeView view;
+    QQuickView view;
     view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
     view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
     QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
     view.setGeometry(QRect(100, 100, 360, 640));
     view.show();
diff --git a/examples/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro
index ce40cd7489..eca46f9f97 100644
--- a/examples/embedded/qmltwitter/qmltwitter.pro
+++ b/examples/embedded/qmltwitter/qmltwitter.pro
@@ -1,5 +1,5 @@
 !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
 
-QT += declarative network
+QT += qml network
 SOURCES += $$PWD/qmltwitter.cpp
 include($$PWD/deployment.pri)
diff --git a/examples/examples.pro b/examples/examples.pro
index 2c9497dde0..3e5c4d08a5 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS += declarative tutorials
+SUBDIRS += qml tutorials
 contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
diff --git a/examples/declarative/README b/examples/qml/README
index 56c48d71fb..56c48d71fb 100644
--- a/examples/declarative/README
+++ b/examples/qml/README
diff --git a/examples/declarative/accessibility/accessibility.qml b/examples/qml/accessibility/accessibility.qml
index 6fdcd38ac6..e0152f065b 100644
--- a/examples/declarative/accessibility/accessibility.qml
+++ b/examples/qml/accessibility/accessibility.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/examples/declarative/accessibility/widgets/Button.qml b/examples/qml/accessibility/widgets/Button.qml
index 4a076fa428..793f895c57 100644
--- a/examples/declarative/accessibility/widgets/Button.qml
+++ b/examples/qml/accessibility/widgets/Button.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/examples/declarative/animation/animation.qml b/examples/qml/animation/animation.qml
index 7c5829e790..7c5829e790 100644
--- a/examples/declarative/animation/animation.qml
+++ b/examples/qml/animation/animation.qml
diff --git a/examples/declarative/animation/animation.qmlproject b/examples/qml/animation/animation.qmlproject
index 2e96daa881..2e96daa881 100644
--- a/examples/declarative/animation/animation.qmlproject
+++ b/examples/qml/animation/animation.qmlproject
diff --git a/examples/declarative/animation/basics/color-animation.qml b/examples/qml/animation/basics/color-animation.qml
index a54091d7dd..a54091d7dd 100644
--- a/examples/declarative/animation/basics/color-animation.qml
+++ b/examples/qml/animation/basics/color-animation.qml
diff --git a/examples/declarative/animation/basics/images/face-smile.png b/examples/qml/animation/basics/images/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/animation/basics/images/face-smile.png
+++ b/examples/qml/animation/basics/images/face-smile.png
diff --git a/examples/declarative/animation/basics/images/moon.png b/examples/qml/animation/basics/images/moon.png
index 9407b2b4f0..9407b2b4f0 100644
--- a/examples/declarative/animation/basics/images/moon.png
+++ b/examples/qml/animation/basics/images/moon.png
diff --git a/examples/declarative/animation/basics/images/shadow.png b/examples/qml/animation/basics/images/shadow.png
index 8270565e87..8270565e87 100644
--- a/examples/declarative/animation/basics/images/shadow.png
+++ b/examples/qml/animation/basics/images/shadow.png
diff --git a/examples/declarative/animation/basics/images/star.png b/examples/qml/animation/basics/images/star.png
index 27ef924267..27ef924267 100644
--- a/examples/declarative/animation/basics/images/star.png
+++ b/examples/qml/animation/basics/images/star.png
diff --git a/examples/declarative/animation/basics/images/sun.png b/examples/qml/animation/basics/images/sun.png
index 7713ca5ce7..7713ca5ce7 100644
--- a/examples/declarative/animation/basics/images/sun.png
+++ b/examples/qml/animation/basics/images/sun.png
diff --git a/examples/declarative/animation/basics/property-animation.qml b/examples/qml/animation/basics/property-animation.qml
index 4a4d3e3b2a..4a4d3e3b2a 100644
--- a/examples/declarative/animation/basics/property-animation.qml
+++ b/examples/qml/animation/basics/property-animation.qml
diff --git a/examples/declarative/animation/behaviors/SideRect.qml b/examples/qml/animation/behaviors/SideRect.qml
index 623c6965d8..623c6965d8 100644
--- a/examples/declarative/animation/behaviors/SideRect.qml
+++ b/examples/qml/animation/behaviors/SideRect.qml
diff --git a/examples/declarative/animation/behaviors/behavior-example.qml b/examples/qml/animation/behaviors/behavior-example.qml
index 89fc9992b6..89fc9992b6 100644
--- a/examples/declarative/animation/behaviors/behavior-example.qml
+++ b/examples/qml/animation/behaviors/behavior-example.qml
diff --git a/examples/declarative/animation/behaviors/wigglytext.qml b/examples/qml/animation/behaviors/wigglytext.qml
index e2ed472088..e2ed472088 100644
--- a/examples/declarative/animation/behaviors/wigglytext.qml
+++ b/examples/qml/animation/behaviors/wigglytext.qml
diff --git a/examples/declarative/animation/easing/content/QuitButton.qml b/examples/qml/animation/easing/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/declarative/animation/easing/content/QuitButton.qml
+++ b/examples/qml/animation/easing/content/QuitButton.qml
diff --git a/examples/declarative/animation/easing/content/quit.png b/examples/qml/animation/easing/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/animation/easing/content/quit.png
+++ b/examples/qml/animation/easing/content/quit.png
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/qml/animation/easing/easing.qml
index 207b653d6e..207b653d6e 100644
--- a/examples/declarative/animation/easing/easing.qml
+++ b/examples/qml/animation/easing/easing.qml
diff --git a/examples/declarative/animation/pathanimation/pathanimation.qml b/examples/qml/animation/pathanimation/pathanimation.qml
index 4d0a31bdf8..4d0a31bdf8 100644
--- a/examples/declarative/animation/pathanimation/pathanimation.qml
+++ b/examples/qml/animation/pathanimation/pathanimation.qml
diff --git a/examples/declarative/animation/pathinterpolator/pathinterpolator.qml b/examples/qml/animation/pathinterpolator/pathinterpolator.qml
index 67a34ce582..67a34ce582 100644
--- a/examples/declarative/animation/pathinterpolator/pathinterpolator.qml
+++ b/examples/qml/animation/pathinterpolator/pathinterpolator.qml
diff --git a/examples/declarative/animation/states/qt-logo.png b/examples/qml/animation/states/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/declarative/animation/states/qt-logo.png
+++ b/examples/qml/animation/states/qt-logo.png
diff --git a/examples/declarative/animation/states/states.qml b/examples/qml/animation/states/states.qml
index 7ca56a9295..7ca56a9295 100644
--- a/examples/declarative/animation/states/states.qml
+++ b/examples/qml/animation/states/states.qml
diff --git a/examples/declarative/animation/states/transitions.qml b/examples/qml/animation/states/transitions.qml
index d57924d6d2..d57924d6d2 100644
--- a/examples/declarative/animation/states/transitions.qml
+++ b/examples/qml/animation/states/transitions.qml
diff --git a/examples/declarative/calculator/calculator.qml b/examples/qml/calculator/calculator.qml
index e2d6679b89..913643a93b 100644
--- a/examples/declarative/calculator/calculator.qml
+++ b/examples/qml/calculator/calculator.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/examples/declarative/calculator/content/Button.qml b/examples/qml/calculator/content/Button.qml
index 6b480eb9b8..feaa5e7df3 100644
--- a/examples/declarative/calculator/content/Button.qml
+++ b/examples/qml/calculator/content/Button.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/examples/declarative/calculator/content/Display.qml b/examples/qml/calculator/content/Display.qml
index 3333484971..3dceeab169 100644
--- a/examples/declarative/calculator/content/Display.qml
+++ b/examples/qml/calculator/content/Display.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/examples/declarative/calculator/content/calculator.js b/examples/qml/calculator/content/calculator.js
index 7c363c7f30..7c363c7f30 100644
--- a/examples/declarative/calculator/content/calculator.js
+++ b/examples/qml/calculator/content/calculator.js
diff --git a/examples/declarative/calculator/content/images/button-.png b/examples/qml/calculator/content/images/button-.png
index 544e514536..544e514536 100644
--- a/examples/declarative/calculator/content/images/button-.png
+++ b/examples/qml/calculator/content/images/button-.png
diff --git a/examples/declarative/calculator/content/images/button-blue.png b/examples/qml/calculator/content/images/button-blue.png
index 5f92de32d0..5f92de32d0 100644
--- a/examples/declarative/calculator/content/images/button-blue.png
+++ b/examples/qml/calculator/content/images/button-blue.png
diff --git a/examples/declarative/calculator/content/images/button-green.png b/examples/qml/calculator/content/images/button-green.png
index 36c93914c7..36c93914c7 100644
--- a/examples/declarative/calculator/content/images/button-green.png
+++ b/examples/qml/calculator/content/images/button-green.png
diff --git a/examples/declarative/calculator/content/images/button-purple.png b/examples/qml/calculator/content/images/button-purple.png
index 347cbbea9d..347cbbea9d 100644
--- a/examples/declarative/calculator/content/images/button-purple.png
+++ b/examples/qml/calculator/content/images/button-purple.png
diff --git a/examples/declarative/calculator/content/images/button-red.png b/examples/qml/calculator/content/images/button-red.png
index 3b335891ae..3b335891ae 100644
--- a/examples/declarative/calculator/content/images/button-red.png
+++ b/examples/qml/calculator/content/images/button-red.png
diff --git a/examples/declarative/calculator/content/images/display.png b/examples/qml/calculator/content/images/display.png
index 9507f4382e..9507f4382e 100644
--- a/examples/declarative/calculator/content/images/display.png
+++ b/examples/qml/calculator/content/images/display.png
diff --git a/examples/declarative/calculator/content/qmldir b/examples/qml/calculator/content/qmldir
index a926b93fac..a926b93fac 100644
--- a/examples/declarative/calculator/content/qmldir
+++ b/examples/qml/calculator/content/qmldir
diff --git a/examples/declarative/canvas/bezierCurve/bezierCurve.qml b/examples/qml/canvas/bezierCurve/bezierCurve.qml
index f57839b0a5..f57839b0a5 100644
--- a/examples/declarative/canvas/bezierCurve/bezierCurve.qml
+++ b/examples/qml/canvas/bezierCurve/bezierCurve.qml
diff --git a/examples/declarative/canvas/clip/clip.qml b/examples/qml/canvas/clip/clip.qml
index d861ff0a46..d861ff0a46 100644
--- a/examples/declarative/canvas/clip/clip.qml
+++ b/examples/qml/canvas/clip/clip.qml
diff --git a/examples/declarative/canvas/contents/Button.qml b/examples/qml/canvas/contents/Button.qml
index 1413cdb9fa..1413cdb9fa 100644
--- a/examples/declarative/canvas/contents/Button.qml
+++ b/examples/qml/canvas/contents/Button.qml
diff --git a/examples/declarative/canvas/contents/ScrollBar.qml b/examples/qml/canvas/contents/ScrollBar.qml
index 98b8efee4a..98b8efee4a 100644
--- a/examples/declarative/canvas/contents/ScrollBar.qml
+++ b/examples/qml/canvas/contents/ScrollBar.qml
diff --git a/examples/declarative/canvas/contents/Slider.qml b/examples/qml/canvas/contents/Slider.qml
index 1050e307f6..1050e307f6 100644
--- a/examples/declarative/canvas/contents/Slider.qml
+++ b/examples/qml/canvas/contents/Slider.qml
diff --git a/examples/declarative/canvas/contents/Stocks.qml b/examples/qml/canvas/contents/Stocks.qml
index 043bca132e..043bca132e 100644
--- a/examples/declarative/canvas/contents/Stocks.qml
+++ b/examples/qml/canvas/contents/Stocks.qml
diff --git a/examples/declarative/canvas/contents/TitleBar.qml b/examples/qml/canvas/contents/TitleBar.qml
index 28edda2ae7..28edda2ae7 100644
--- a/examples/declarative/canvas/contents/TitleBar.qml
+++ b/examples/qml/canvas/contents/TitleBar.qml
diff --git a/examples/declarative/canvas/contents/ToolBar.qml b/examples/qml/canvas/contents/ToolBar.qml
index 7ae7391ddf..7ae7391ddf 100644
--- a/examples/declarative/canvas/contents/ToolBar.qml
+++ b/examples/qml/canvas/contents/ToolBar.qml
diff --git a/examples/declarative/canvas/contents/images/button-pressed.png b/examples/qml/canvas/contents/images/button-pressed.png
index e434d327f2..e434d327f2 100644
--- a/examples/declarative/canvas/contents/images/button-pressed.png
+++ b/examples/qml/canvas/contents/images/button-pressed.png
diff --git a/examples/declarative/canvas/contents/images/button.png b/examples/qml/canvas/contents/images/button.png
index 56a63ce641..56a63ce641 100644
--- a/examples/declarative/canvas/contents/images/button.png
+++ b/examples/qml/canvas/contents/images/button.png
diff --git a/examples/declarative/canvas/contents/images/default.svg b/examples/qml/canvas/contents/images/default.svg
index 248199cc4e..248199cc4e 100644
--- a/examples/declarative/canvas/contents/images/default.svg
+++ b/examples/qml/canvas/contents/images/default.svg
diff --git a/examples/declarative/canvas/contents/images/gloss.png b/examples/qml/canvas/contents/images/gloss.png
index 5d370cd93d..5d370cd93d 100755
--- a/examples/declarative/canvas/contents/images/gloss.png
+++ b/examples/qml/canvas/contents/images/gloss.png
diff --git a/examples/declarative/canvas/contents/images/lineedit.png b/examples/qml/canvas/contents/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100755
--- a/examples/declarative/canvas/contents/images/lineedit.png
+++ b/examples/qml/canvas/contents/images/lineedit.png
diff --git a/examples/declarative/canvas/contents/images/lineedit.sci b/examples/qml/canvas/contents/images/lineedit.sci
index 054bff78be..054bff78be 100644
--- a/examples/declarative/canvas/contents/images/lineedit.sci
+++ b/examples/qml/canvas/contents/images/lineedit.sci
diff --git a/examples/declarative/canvas/contents/images/quit.png b/examples/qml/canvas/contents/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100755
--- a/examples/declarative/canvas/contents/images/quit.png
+++ b/examples/qml/canvas/contents/images/quit.png
diff --git a/examples/declarative/canvas/contents/images/stripes.png b/examples/qml/canvas/contents/images/stripes.png
index 9f36727ea4..9f36727ea4 100755
--- a/examples/declarative/canvas/contents/images/stripes.png
+++ b/examples/qml/canvas/contents/images/stripes.png
diff --git a/examples/declarative/canvas/contents/images/titlebar.png b/examples/qml/canvas/contents/images/titlebar.png
index 51c90082d0..51c90082d0 100755
--- a/examples/declarative/canvas/contents/images/titlebar.png
+++ b/examples/qml/canvas/contents/images/titlebar.png
diff --git a/examples/declarative/canvas/contents/images/titlebar.sci b/examples/qml/canvas/contents/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100644
--- a/examples/declarative/canvas/contents/images/titlebar.sci
+++ b/examples/qml/canvas/contents/images/titlebar.sci
diff --git a/examples/declarative/canvas/contents/images/toolbutton.png b/examples/qml/canvas/contents/images/toolbutton.png
index 11310013ee..11310013ee 100755
--- a/examples/declarative/canvas/contents/images/toolbutton.png
+++ b/examples/qml/canvas/contents/images/toolbutton.png
diff --git a/examples/declarative/canvas/contents/images/toolbutton.sci b/examples/qml/canvas/contents/images/toolbutton.sci
index 9e4f965307..9e4f965307 100644
--- a/examples/declarative/canvas/contents/images/toolbutton.sci
+++ b/examples/qml/canvas/contents/images/toolbutton.sci
diff --git a/examples/declarative/canvas/contents/qt-logo.png b/examples/qml/canvas/contents/qt-logo.png
index 5ab3a1b0c4..5ab3a1b0c4 100644
--- a/examples/declarative/canvas/contents/qt-logo.png
+++ b/examples/qml/canvas/contents/qt-logo.png
diff --git a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml b/examples/qml/canvas/quadraticCurveTo/quadraticCurveTo.qml
index bc3ca0071a..bc3ca0071a 100644
--- a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml
+++ b/examples/qml/canvas/quadraticCurveTo/quadraticCurveTo.qml
diff --git a/examples/declarative/canvas/roundedrect/roundedrect.qml b/examples/qml/canvas/roundedrect/roundedrect.qml
index fd86c63a3b..fd86c63a3b 100644
--- a/examples/declarative/canvas/roundedrect/roundedrect.qml
+++ b/examples/qml/canvas/roundedrect/roundedrect.qml
diff --git a/examples/declarative/canvas/smile/smile.qml b/examples/qml/canvas/smile/smile.qml
index 28a48a6c81..28a48a6c81 100644
--- a/examples/declarative/canvas/smile/smile.qml
+++ b/examples/qml/canvas/smile/smile.qml
diff --git a/examples/declarative/canvas/squircle/squircle.png b/examples/qml/canvas/squircle/squircle.png
index 86c69d945f..86c69d945f 100644
--- a/examples/declarative/canvas/squircle/squircle.png
+++ b/examples/qml/canvas/squircle/squircle.png
diff --git a/examples/declarative/canvas/squircle/squircle.qml b/examples/qml/canvas/squircle/squircle.qml
index 2fc65b67b3..2fc65b67b3 100644
--- a/examples/declarative/canvas/squircle/squircle.qml
+++ b/examples/qml/canvas/squircle/squircle.qml
diff --git a/examples/declarative/canvas/stockchart/README b/examples/qml/canvas/stockchart/README
index 2652866ed6..2652866ed6 100644
--- a/examples/declarative/canvas/stockchart/README
+++ b/examples/qml/canvas/stockchart/README
diff --git a/examples/declarative/canvas/stockchart/com/nokia/StockChartExample/qmldir b/examples/qml/canvas/stockchart/com/nokia/StockChartExample/qmldir
index 4c60e556d4..4c60e556d4 100644
--- a/examples/declarative/canvas/stockchart/com/nokia/StockChartExample/qmldir
+++ b/examples/qml/canvas/stockchart/com/nokia/StockChartExample/qmldir
diff --git a/examples/declarative/canvas/stockchart/model.cpp b/examples/qml/canvas/stockchart/model.cpp
index 42eb2d592f..42eb2d592f 100644
--- a/examples/declarative/canvas/stockchart/model.cpp
+++ b/examples/qml/canvas/stockchart/model.cpp
diff --git a/examples/declarative/canvas/stockchart/model.h b/examples/qml/canvas/stockchart/model.h
index 95e6f4891c..95e6f4891c 100644
--- a/examples/declarative/canvas/stockchart/model.h
+++ b/examples/qml/canvas/stockchart/model.h
diff --git a/examples/declarative/canvas/stockchart/plugin.cpp b/examples/qml/canvas/stockchart/plugin.cpp
index af64af4da8..3b354e2b31 100644
--- a/examples/declarative/canvas/stockchart/plugin.cpp
+++ b/examples/qml/canvas/stockchart/plugin.cpp
@@ -38,12 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/QQmlExtensionPlugin>
+#include <QtQml/qqml.h>
 #include <QtGui/QGuiApplication>
 #include "model.h"
 
-class QStockChartExampleQmlPlugin : public QDeclarativeExtensionPlugin
+class QStockChartExampleQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/examples/declarative/canvas/stockchart/stock.qml b/examples/qml/canvas/stockchart/stock.qml
index 1c95fde2ce..1c95fde2ce 100644
--- a/examples/declarative/canvas/stockchart/stock.qml
+++ b/examples/qml/canvas/stockchart/stock.qml
diff --git a/examples/qml/canvas/stockchart/stockchart.pro b/examples/qml/canvas/stockchart/stockchart.pro
new file mode 100644
index 0000000000..0e3ca82c44
--- /dev/null
+++ b/examples/qml/canvas/stockchart/stockchart.pro
@@ -0,0 +1,20 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+QT += qml network
+
+DESTDIR = com/nokia/StockChartExample
+TARGET  = qmlstockchartexampleplugin
+
+SOURCES += model.cpp  plugin.cpp
+HEADERS += model.h
+qqmlsources.files += \
+    com/nokia/StockChartExample/qmldir \
+    stock.qml
+
+qqmlsources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/StockChartExample
+
+sources.files += stockchart.pro model.h model.cpp plugin.cpp README
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/StockChartExample
+
+INSTALLS += qqmlsources sources target
diff --git a/examples/declarative/canvas/tiger/tiger.js b/examples/qml/canvas/tiger/tiger.js
index 4be0d26c9d..4be0d26c9d 100644
--- a/examples/declarative/canvas/tiger/tiger.js
+++ b/examples/qml/canvas/tiger/tiger.js
diff --git a/examples/declarative/canvas/tiger/tiger.qml b/examples/qml/canvas/tiger/tiger.qml
index 2eb1bb2106..2eb1bb2106 100644
--- a/examples/declarative/canvas/tiger/tiger.qml
+++ b/examples/qml/canvas/tiger/tiger.qml
diff --git a/examples/declarative/canvas/twitterfriends/TwitterUser.qml b/examples/qml/canvas/twitterfriends/TwitterUser.qml
index 8b906216ef..8b906216ef 100644
--- a/examples/declarative/canvas/twitterfriends/TwitterUser.qml
+++ b/examples/qml/canvas/twitterfriends/TwitterUser.qml
diff --git a/examples/declarative/canvas/twitterfriends/cache.js b/examples/qml/canvas/twitterfriends/cache.js
index 6c8a1cd71a..6c8a1cd71a 100644
--- a/examples/declarative/canvas/twitterfriends/cache.js
+++ b/examples/qml/canvas/twitterfriends/cache.js
diff --git a/examples/declarative/canvas/twitterfriends/twitter.qml b/examples/qml/canvas/twitterfriends/twitter.qml
index 9dc2bcc939..9dc2bcc939 100644
--- a/examples/declarative/canvas/twitterfriends/twitter.qml
+++ b/examples/qml/canvas/twitterfriends/twitter.qml
diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/qml/cppextensions/cppextensions.pro
index cde19b5c90..cde19b5c90 100644
--- a/examples/declarative/cppextensions/cppextensions.pro
+++ b/examples/qml/cppextensions/cppextensions.pro
diff --git a/examples/declarative/cppextensions/cppextensions.qmlproject b/examples/qml/cppextensions/cppextensions.qmlproject
index 6b362842cb..6b362842cb 100644
--- a/examples/declarative/cppextensions/cppextensions.qmlproject
+++ b/examples/qml/cppextensions/cppextensions.qmlproject
diff --git a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir b/examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir
index 6be88bccec..6be88bccec 100644
--- a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
+++ b/examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/qml/cppextensions/imageprovider/imageprovider-example.qml
index fe2f1b130b..fe2f1b130b 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/qml/cppextensions/imageprovider/imageprovider-example.qml
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/examples/qml/cppextensions/imageprovider/imageprovider.cpp
index 94f85753ed..506d5b0812 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
+++ b/examples/qml/cppextensions/imageprovider/imageprovider.cpp
@@ -39,19 +39,19 @@
 ****************************************************************************/
 
 
-#include <qdeclarativeextensionplugin.h>
+#include <qqmlextensionplugin.h>
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativeimageprovider.h>
+#include <qqmlengine.h>
+#include <qqmlimageprovider.h>
 #include <QImage>
 #include <QPainter>
 
 //![0]
-class ColorImageProvider : public QDeclarativeImageProvider
+class ColorImageProvider : public QQmlImageProvider
 {
 public:
     ColorImageProvider()
-        : QDeclarativeImageProvider(QDeclarativeImageProvider::Pixmap)
+        : QQmlImageProvider(QQmlImageProvider::Pixmap)
     {
     }
 
@@ -84,7 +84,7 @@ public:
 //![1]
 
 
-class ImageProviderExtensionPlugin : public QDeclarativeExtensionPlugin
+class ImageProviderExtensionPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
@@ -93,7 +93,7 @@ public:
         Q_UNUSED(uri);
     }
 
-    void initializeEngine(QDeclarativeEngine *engine, const char *uri)
+    void initializeEngine(QQmlEngine *engine, const char *uri)
     {
         Q_UNUSED(uri);
         engine->addImageProvider("colors", new ColorImageProvider);
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/qml/cppextensions/imageprovider/imageprovider.pro
index cfa7923128..f75a6ebd89 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/qml/cppextensions/imageprovider/imageprovider.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += qml
 
 DESTDIR = ImageProviderCore
 TARGET  = qmlimageproviderplugin
@@ -8,13 +8,13 @@ TARGET  = qmlimageproviderplugin
 SOURCES += imageprovider.cpp
 
 sources.files = $$SOURCES imageprovider.qml imageprovider.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageprovider
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/imageprovider
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageprovider/ImageProviderCore
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/imageprovider/ImageProviderCore
 
 ImageProviderCore_sources.files = \
     ImageProviderCore/qmldir 
-ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageprovider/ImageProviderCore
+ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/imageprovider/ImageProviderCore
 
 INSTALLS = sources ImageProviderCore_sources target
 
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject b/examples/qml/cppextensions/imageprovider/imageprovider.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
+++ b/examples/qml/cppextensions/imageprovider/imageprovider.qmlproject
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp
index 2bad2aa285..6ebded0512 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp
@@ -42,13 +42,13 @@
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
 
-#include <QDeclarativeEngine>
-#include <QDeclarativeNetworkAccessManagerFactory>
+#include <QQmlEngine>
+#include <QQmlNetworkAccessManagerFactory>
 #include <QtQuick/QQuickView>
 
 
 /*
-   This example illustrates using a QDeclarativeNetworkAccessManagerFactory to
+   This example illustrates using a QQmlNetworkAccessManagerFactory to
    create a QNetworkAccessManager with a proxy.
 
    Usage:
@@ -58,7 +58,7 @@
 static QString proxyHost;
 static int proxyPort = 0;
 
-class MyNetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+class MyNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
 public:
     virtual QNetworkAccessManager *create(QObject *parent);
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 479af364d0..6cbc24a7b8 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -1,4 +1,4 @@
-QT += declarative quick network
+QT += qml quick network
 
 SOURCES += main.cpp 
 RESOURCES += networkaccessmanagerfactory.qrc
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
index 17e9301471..17e9301471 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml b/examples/qml/cppextensions/networkaccessmanagerfactory/view.qml
index b2d46a991f..b2d46a991f 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/view.qml
diff --git a/examples/declarative/cppextensions/plugins/README b/examples/qml/cppextensions/plugins/README
index f4f9074059..f4f9074059 100644
--- a/examples/declarative/cppextensions/plugins/README
+++ b/examples/qml/cppextensions/plugins/README
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
index eac9226a00..eac9226a00 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir
index e1288cfac0..e1288cfac0 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/qml/cppextensions/plugins/plugin.cpp
index 6fbf962f4e..b53ef2ccb3 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/qml/cppextensions/plugins/plugin.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/QQmlExtensionPlugin>
+#include <QtQml/qqml.h>
 #include <qdebug.h>
 #include <qdatetime.h>
 #include <qbasictimer.h>
@@ -138,7 +138,7 @@ int TimeModel::instances=0;
 MinuteTimer *TimeModel::timer=0;
 
 //![plugin]
-class QExampleQmlPlugin : public QDeclarativeExtensionPlugin
+class QExampleQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/qml/cppextensions/plugins/plugins.pro
index bdcb62ca8a..e6c7fe64a0 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/qml/cppextensions/plugins/plugins.pro
@@ -1,13 +1,13 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += qml
 
 DESTDIR = com/nokia/TimeExample
 TARGET  = qmlqtimeexampleplugin
 
 SOURCES += plugin.cpp
 
-qdeclarativesources.files += \
+qqmlsources.files += \
     com/nokia/TimeExample/qmldir \
     com/nokia/TimeExample/center.png \
     com/nokia/TimeExample/clock.png \
@@ -15,11 +15,11 @@ qdeclarativesources.files += \
     com/nokia/TimeExample/hour.png \
     com/nokia/TimeExample/minute.png
 
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nokia/TimeExample
+qqmlsources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample
 
 sources.files += plugins.pro plugin.cpp plugins.qml README
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nokia/TimeExample
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample
 
-INSTALLS += qdeclarativesources sources target
+INSTALLS += qqmlsources sources target
 
diff --git a/examples/declarative/cppextensions/plugins/plugins.qml b/examples/qml/cppextensions/plugins/plugins.qml
index f1048ddd36..f1048ddd36 100644
--- a/examples/declarative/cppextensions/plugins/plugins.qml
+++ b/examples/qml/cppextensions/plugins/plugins.qml
diff --git a/examples/declarative/cppextensions/plugins/plugins.qmlproject b/examples/qml/cppextensions/plugins/plugins.qmlproject
index 771ab45b66..771ab45b66 100644
--- a/examples/declarative/cppextensions/plugins/plugins.qmlproject
+++ b/examples/qml/cppextensions/plugins/plugins.qmlproject
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/qml/cppextensions/referenceexamples/adding/adding.pro
index 1a972926b7..706322e9ff 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
+++ b/examples/qml/cppextensions/referenceexamples/adding/adding.pro
@@ -1,11 +1,11 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp 
 HEADERS += person.h
 RESOURCES += adding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/adding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/adding
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/adding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/adding
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc b/examples/qml/cppextensions/referenceexamples/adding/adding.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
+++ b/examples/qml/cppextensions/referenceexamples/adding/adding.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/example.qml b/examples/qml/cppextensions/referenceexamples/adding/example.qml
index 3b2ca34d10..3b2ca34d10 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/adding/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp b/examples/qml/cppextensions/referenceexamples/adding/main.cpp
index 4c1918b6de..c3a0ab6812 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/adding/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "person.h"
 
@@ -50,8 +50,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Person>("People", 1,0, "Person");
 //![0]
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     Person *person = qobject_cast<Person *>(component.create());
     if (person) {
         qWarning() << "The person's name is" << person->name();
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/person.cpp b/examples/qml/cppextensions/referenceexamples/adding/person.cpp
index 0e78b0b77b..0e78b0b77b 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/adding/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/person.h b/examples/qml/cppextensions/referenceexamples/adding/person.h
index 45fb2f3297..45fb2f3297 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/person.h
+++ b/examples/qml/cppextensions/referenceexamples/adding/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/qml/cppextensions/referenceexamples/attached/attached.pro
index 4cfd4e0aed..f4385e1a30 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
+++ b/examples/qml/cppextensions/referenceexamples/attached/attached.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/attached
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/attached
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/attached
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/attached
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc b/examples/qml/cppextensions/referenceexamples/attached/attached.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
+++ b/examples/qml/cppextensions/referenceexamples/attached/attached.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
index feefef4fe1..6b784fdccd 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
@@ -69,9 +69,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h
index c789c0bd51..1da6c34026 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h
@@ -42,7 +42,7 @@
 
 #include <QObject>
 #include <QDate>
-#include <qdeclarative.h>
+#include <qqml.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -63,7 +63,7 @@ class BirthdayParty : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -71,7 +71,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/example.qml b/examples/qml/cppextensions/referenceexamples/attached/example.qml
index 6a83af2804..6a83af2804 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/attached/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp b/examples/qml/cppextensions/referenceexamples/attached/main.cpp
index 4c2c3003fe..ce067bbbf7 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -55,8 +55,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Boy>("People", 1,0, "Boy");
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/person.cpp b/examples/qml/cppextensions/referenceexamples/attached/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/person.h b/examples/qml/cppextensions/referenceexamples/attached/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/person.h
+++ b/examples/qml/cppextensions/referenceexamples/attached/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/qml/cppextensions/referenceexamples/binding/binding.pro
index 2add33fa47..0379f93ea7 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
+++ b/examples/qml/cppextensions/referenceexamples/binding/binding.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 
 RESOURCES += binding.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/binding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/binding
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/binding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/binding
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc b/examples/qml/cppextensions/referenceexamples/binding/binding.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
+++ b/examples/qml/cppextensions/referenceexamples/binding/binding.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
index 4f5acdfb75..9a38c3b646 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
@@ -75,9 +75,9 @@ void BirthdayParty::setHost(Person *c)
     emit hostChanged();
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h
index 376d107f26..195e9cd9cf 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h
@@ -43,7 +43,7 @@
 #include <QObject>
 #include <QDate>
 #include <QDebug>
-#include <qdeclarative.h>
+#include <qqml.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -69,7 +69,7 @@ class BirthdayParty : public QObject
 // ![0]
     Q_PROPERTY(Person *host READ host WRITE setHost NOTIFY hostChanged)
 // ![0]
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
@@ -78,7 +78,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/example.qml b/examples/qml/cppextensions/referenceexamples/binding/example.qml
index 99a0098ff6..99a0098ff6 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/binding/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
index df4dbec9c4..90220e15ae 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
@@ -49,7 +49,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
     timer->start(1000);
 }
 
-void HappyBirthdaySong::setTarget(const QDeclarativeProperty &p)
+void HappyBirthdaySong::setTarget(const QQmlProperty &p)
 {
     m_target = p;
 }
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h
index a9f3a94544..ace48b2af0 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
+++ b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h
@@ -40,20 +40,20 @@
 #ifndef HAPPYBIRTHDAYSONG_H
 #define HAPPYBIRTHDAYSONG_H
 
-#include <QDeclarativePropertyValueSource>
-#include <QDeclarativeProperty>
+#include <QQmlPropertyValueSource>
+#include <QQmlProperty>
 
 #include <QStringList>
 
-class HappyBirthdaySong : public QObject, public QDeclarativePropertyValueSource
+class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_INTERFACES(QQmlPropertyValueSource)
 public:
     HappyBirthdaySong(QObject *parent = 0);
 
-    virtual void setTarget(const QDeclarativeProperty &);
+    virtual void setTarget(const QQmlProperty &);
 
     QString name() const;
     void setName(const QString &);
@@ -66,7 +66,7 @@ signals:
 private:
     int m_line;
     QStringList m_lyrics;
-    QDeclarativeProperty m_target;
+    QQmlProperty m_target;
     QString m_name;
 };
 
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/qml/cppextensions/referenceexamples/binding/main.cpp
index 551d24b702..389cb7609b 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "happybirthdaysong.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Boy>("People", 1,0, "Boy");
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/person.cpp b/examples/qml/cppextensions/referenceexamples/binding/person.cpp
index 89e7127caf..89e7127caf 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/person.h b/examples/qml/cppextensions/referenceexamples/binding/person.h
index d0f196b95c..d0f196b95c 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/person.h
+++ b/examples/qml/cppextensions/referenceexamples/binding/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
index 1859ca9461..d697ac22b6 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
@@ -54,9 +54,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h
index 4315d3727e..43611693d9 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h
@@ -41,7 +41,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include "person.h"
 
 class BirthdayParty : public QObject
@@ -49,7 +49,7 @@ class BirthdayParty : public QObject
     Q_OBJECT
 // ![0]
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
 // ![0]
 public:
     BirthdayParty(QObject *parent = 0);
@@ -57,7 +57,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/qml/cppextensions/referenceexamples/coercion/coercion.pro
index 742b85b683..60e8532bab 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
+++ b/examples/qml/cppextensions/referenceexamples/coercion/coercion.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/coercion
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/coercion
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/coercion
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/coercion
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc b/examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
+++ b/examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/example.qml b/examples/qml/cppextensions/referenceexamples/coercion/example.qml
index 25791f38f8..25791f38f8 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/coercion/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp b/examples/qml/cppextensions/referenceexamples/coercion/main.cpp
index 95b309de4c..15e41ca597 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -58,8 +58,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Girl>("People", 1,0, "Girl");
     //![register boy girl]
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp b/examples/qml/cppextensions/referenceexamples/coercion/person.cpp
index b28d63216e..b28d63216e 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.h b/examples/qml/cppextensions/referenceexamples/coercion/person.h
index dc4ae43dd6..dc4ae43dd6 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/person.h
+++ b/examples/qml/cppextensions/referenceexamples/coercion/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
index 1859ca9461..d697ac22b6 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
@@ -54,9 +54,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.h
index cfca6689db..3ee635039d 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.h
@@ -41,7 +41,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include "person.h"
 
 // ![0]
@@ -49,7 +49,7 @@ class BirthdayParty : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -57,7 +57,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/qml/cppextensions/referenceexamples/default/default.pro
index 6533cdd7d3..36ef39fc55 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.pro
+++ b/examples/qml/cppextensions/referenceexamples/default/default.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/default
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/default
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/default
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/default
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.qrc b/examples/qml/cppextensions/referenceexamples/default/default.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.qrc
+++ b/examples/qml/cppextensions/referenceexamples/default/default.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/default/example.qml b/examples/qml/cppextensions/referenceexamples/default/example.qml
index 9ef24b59b7..9ef24b59b7 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/default/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/default/main.cpp b/examples/qml/cppextensions/referenceexamples/default/main.cpp
index 3a03279129..175945fc5d 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -53,8 +53,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Boy>("People", 1,0, "Boy");
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/default/person.cpp b/examples/qml/cppextensions/referenceexamples/default/person.cpp
index 5a615a1ecd..5a615a1ecd 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/default/person.h b/examples/qml/cppextensions/referenceexamples/default/person.h
index d85672798c..d85672798c 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/person.h
+++ b/examples/qml/cppextensions/referenceexamples/default/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/example.qml b/examples/qml/cppextensions/referenceexamples/extended/example.qml
index 642a95d443..642a95d443 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/extended/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/qml/cppextensions/referenceexamples/extended/extended.pro
index 3d9f59c470..206ea19c61 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/qml/cppextensions/referenceexamples/extended/extended.pro
@@ -1,11 +1,11 @@
-QT += declarative widgets
+QT += qml widgets
 
 SOURCES += main.cpp \
            lineedit.cpp 
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/extended
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/extended
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/extended
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/extended
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc b/examples/qml/cppextensions/referenceexamples/extended/extended.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
+++ b/examples/qml/cppextensions/referenceexamples/extended/extended.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp b/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp
index 8f7fd8aa93..a3b1d0d54e 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
+++ b/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 #include "lineedit.h"
-#include <qdeclarative.h>
+#include <qqml.h>
 
 LineEditExtension::LineEditExtension(QObject *object)
 : QObject(object), m_lineedit(static_cast<QLineEdit *>(object))
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h b/examples/qml/cppextensions/referenceexamples/extended/lineedit.h
index fa8c75df78..fa8c75df78 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
+++ b/examples/qml/cppextensions/referenceexamples/extended/lineedit.h
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp b/examples/qml/cppextensions/referenceexamples/extended/main.cpp
index 3c580396f2..de7c450169 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/extended/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include <QLineEdit>
 #include "lineedit.h"
@@ -50,8 +50,8 @@ int main(int argc, char ** argv)
 
     qmlRegisterExtendedType<QLineEdit, LineEditExtension>("People", 1,0, "QLineEdit");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     QLineEdit *edit = qobject_cast<QLineEdit *>(component.create());
 
     if (edit) {
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
index 1859ca9461..d697ac22b6 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
@@ -54,9 +54,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h
index 491903adc5..5ca0e9b982 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h
@@ -41,14 +41,14 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include "person.h"
 
 class BirthdayParty : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -56,7 +56,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml b/examples/qml/cppextensions/referenceexamples/grouped/example.qml
index 9ae80f222e..9ae80f222e 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/grouped/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/qml/cppextensions/referenceexamples/grouped/grouped.pro
index aab0c8469a..d32a98f79b 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
+++ b/examples/qml/cppextensions/referenceexamples/grouped/grouped.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/grouped
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/grouped
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/grouped
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/grouped
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc b/examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
+++ b/examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp b/examples/qml/cppextensions/referenceexamples/grouped/main.cpp
index de7d714c52..55be3b715b 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -54,8 +54,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Boy>("People", 1,0, "Boy");
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp b/examples/qml/cppextensions/referenceexamples/grouped/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/person.h b/examples/qml/cppextensions/referenceexamples/grouped/person.h
index dea715bacb..dea715bacb 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/person.h
+++ b/examples/qml/cppextensions/referenceexamples/grouped/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
index 35444f505a..0935d708a7 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h
index e49afdb78d..df8a859972 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h
@@ -41,21 +41,21 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include "person.h"
 
 class BirthdayParty : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
 public:
     BirthdayParty(QObject *parent = 0);
 
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/example.qml b/examples/qml/cppextensions/referenceexamples/methods/example.qml
index 9119835e04..9119835e04 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/methods/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/main.cpp b/examples/qml/cppextensions/referenceexamples/methods/main.cpp
index d037d88f20..1e502c3943 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -51,8 +51,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<BirthdayParty>("People", 1,0, "BirthdayParty");
     qmlRegisterType<Person>("People", 1,0, "Person");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/qml/cppextensions/referenceexamples/methods/methods.pro
index ee28355188..f4c63bfa29 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
+++ b/examples/qml/cppextensions/referenceexamples/methods/methods.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += methods.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/methods
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/methods
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/methods
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/methods
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.qrc b/examples/qml/cppextensions/referenceexamples/methods/methods.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.qrc
+++ b/examples/qml/cppextensions/referenceexamples/methods/methods.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/person.cpp b/examples/qml/cppextensions/referenceexamples/methods/person.cpp
index 30d1e46e5a..30d1e46e5a 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/person.h b/examples/qml/cppextensions/referenceexamples/methods/person.h
index dd3ad4d188..dd3ad4d188 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/person.h
+++ b/examples/qml/cppextensions/referenceexamples/methods/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
index 0038cd0a41..f7280560ab 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h
index 2c3d128b6d..84eefa52ae 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h
@@ -41,7 +41,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include "person.h"
 
 // ![0]
@@ -53,7 +53,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(Person *host READ host WRITE setHost)
 // ![1]
 // ![2]
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
 // ![2]
 // ![3]
 public:
@@ -62,7 +62,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/example.qml b/examples/qml/cppextensions/referenceexamples/properties/example.qml
index 36ee952243..36ee952243 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/properties/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp b/examples/qml/cppextensions/referenceexamples/properties/main.cpp
index 421ce9fbaa..cc0de89221 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -53,8 +53,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Person>("People", 1,0, "Person");
 //![register list]
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/person.cpp b/examples/qml/cppextensions/referenceexamples/properties/person.cpp
index 30d1e46e5a..30d1e46e5a 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/person.h b/examples/qml/cppextensions/referenceexamples/properties/person.h
index dd3ad4d188..dd3ad4d188 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/person.h
+++ b/examples/qml/cppextensions/referenceexamples/properties/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/qml/cppextensions/referenceexamples/properties/properties.pro
index 936d0ea429..e079b1f79e 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
+++ b/examples/qml/cppextensions/referenceexamples/properties/properties.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/properties
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/properties
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/properties
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/properties
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc b/examples/qml/cppextensions/referenceexamples/properties/properties.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
+++ b/examples/qml/cppextensions/referenceexamples/properties/properties.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro b/examples/qml/cppextensions/referenceexamples/referenceexamples.pro
index 505cefd331..505cefd331 100644
--- a/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
+++ b/examples/qml/cppextensions/referenceexamples/referenceexamples.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject b/examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
+++ b/examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
index d576c2a278..078c5f9a2d 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
@@ -70,9 +70,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h
index 45ad4f0acf..3f1b020b5a 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h
@@ -42,7 +42,7 @@
 
 #include <QObject>
 #include <QDate>
-#include <qdeclarative.h>
+#include <qqml.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -63,7 +63,7 @@ class BirthdayParty : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -71,7 +71,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/example.qml b/examples/qml/cppextensions/referenceexamples/signal/example.qml
index 796c2f32a1..796c2f32a1 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/signal/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp b/examples/qml/cppextensions/referenceexamples/signal/main.cpp
index 5800cf450f..21a26d9b67 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -55,8 +55,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Boy>("People", 1,0, "Boy");
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/person.cpp b/examples/qml/cppextensions/referenceexamples/signal/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/person.h b/examples/qml/cppextensions/referenceexamples/signal/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/person.h
+++ b/examples/qml/cppextensions/referenceexamples/signal/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/qml/cppextensions/referenceexamples/signal/signal.pro
index 8ffdb50f90..d426e398a5 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
+++ b/examples/qml/cppextensions/referenceexamples/signal/signal.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/signal
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/signal
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/signal
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/signal
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc b/examples/qml/cppextensions/referenceexamples/signal/signal.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
+++ b/examples/qml/cppextensions/referenceexamples/signal/signal.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
index 09137c41a8..a69a58557e 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
@@ -70,9 +70,9 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QDeclarativeListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests() 
 {
-    return QDeclarativeListProperty<Person>(this, m_guests);
+    return QQmlListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h
index 5d561da807..f3635e899b 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h
@@ -43,7 +43,7 @@
 #include <QObject>
 #include <QDate>
 #include <QDebug>
-#include <qdeclarative.h>
+#include <qqml.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -64,7 +64,7 @@ class BirthdayParty : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
+    Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
 // ![0]
     Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
 // ![0]
@@ -75,7 +75,7 @@ public:
     Person *host() const;
     void setHost(Person *);
 
-    QDeclarativeListProperty<Person> guests();
+    QQmlListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml b/examples/qml/cppextensions/referenceexamples/valuesource/example.qml
index 04c3048e9e..04c3048e9e 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
index 629c354543..d69154b57a 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
@@ -49,7 +49,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
     timer->start(1000);
 }
 
-void HappyBirthdaySong::setTarget(const QDeclarativeProperty &p)
+void HappyBirthdaySong::setTarget(const QQmlProperty &p)
 {
     m_target = p;
 }
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
index 9721350435..19e47c28ac 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
@@ -40,24 +40,24 @@
 #ifndef HAPPYBIRTHDAYSONG_H
 #define HAPPYBIRTHDAYSONG_H
 
-#include <QDeclarativePropertyValueSource>
-#include <QDeclarativeProperty>
-#include <qdeclarative.h>
+#include <QQmlPropertyValueSource>
+#include <QQmlProperty>
+#include <qqml.h>
 
 #include <QStringList>
 
 // ![0]
-class HappyBirthdaySong : public QObject, public QDeclarativePropertyValueSource
+class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_INTERFACES(QQmlPropertyValueSource)
 // ![0]
     Q_PROPERTY(QString name READ name WRITE setName)
 // ![1]
 public:
     HappyBirthdaySong(QObject *parent = 0);
 
-    virtual void setTarget(const QDeclarativeProperty &);
+    virtual void setTarget(const QQmlProperty &);
 // ![1]
 
     QString name() const;
@@ -69,7 +69,7 @@ private slots:
 private:
     int m_line;
     QStringList m_lyrics;
-    QDeclarativeProperty m_target;
+    QQmlProperty m_target;
     QString m_name;
 // ![2]
 };
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/main.cpp
index 53d676dfbe..e119e719af 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "happybirthdaysong.h"
@@ -57,8 +57,8 @@ int main(int argc, char ** argv)
     qmlRegisterType<Boy>("People", 1,0, "Boy");
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
+    QQmlEngine engine;
+    QQmlComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/person.h b/examples/qml/cppextensions/referenceexamples/valuesource/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro
index a978d8452a..afc1784d71 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 SOURCES += main.cpp \
            person.cpp \
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += valuesource.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/valuesource
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/valuesource
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/valuesource
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/valuesource
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc
diff --git a/examples/declarative/draganddrop/dragtarget.qmlproject b/examples/qml/draganddrop/dragtarget.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/draganddrop/dragtarget.qmlproject
+++ b/examples/qml/draganddrop/dragtarget.qmlproject
diff --git a/examples/declarative/draganddrop/tiles/DragTile.qml b/examples/qml/draganddrop/tiles/DragTile.qml
index 2813fa8caf..2813fa8caf 100644
--- a/examples/declarative/draganddrop/tiles/DragTile.qml
+++ b/examples/qml/draganddrop/tiles/DragTile.qml
diff --git a/examples/declarative/draganddrop/tiles/DropTile.qml b/examples/qml/draganddrop/tiles/DropTile.qml
index e8566f04cc..e8566f04cc 100644
--- a/examples/declarative/draganddrop/tiles/DropTile.qml
+++ b/examples/qml/draganddrop/tiles/DropTile.qml
diff --git a/examples/declarative/draganddrop/tiles/tiles.qml b/examples/qml/draganddrop/tiles/tiles.qml
index 31c87f8244..31c87f8244 100644
--- a/examples/declarative/draganddrop/tiles/tiles.qml
+++ b/examples/qml/draganddrop/tiles/tiles.qml
diff --git a/examples/declarative/draganddrop/views/gridview.qml b/examples/qml/draganddrop/views/gridview.qml
index 375f3d2824..375f3d2824 100644
--- a/examples/declarative/draganddrop/views/gridview.qml
+++ b/examples/qml/draganddrop/views/gridview.qml
diff --git a/examples/declarative/flickr/content/Button.qml b/examples/qml/flickr/content/Button.qml
index d6a8d3e001..57f846aec3 100644
--- a/examples/declarative/flickr/content/Button.qml
+++ b/examples/qml/flickr/content/Button.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/examples/declarative/flickr/content/GridDelegate.qml b/examples/qml/flickr/content/GridDelegate.qml
index 794d768c74..f8838bd609 100644
--- a/examples/declarative/flickr/content/GridDelegate.qml
+++ b/examples/qml/flickr/content/GridDelegate.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/examples/declarative/flickr/content/ImageDetails.qml b/examples/qml/flickr/content/ImageDetails.qml
index 83f2537d65..42b5e845ea 100644
--- a/examples/declarative/flickr/content/ImageDetails.qml
+++ b/examples/qml/flickr/content/ImageDetails.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/examples/declarative/flickr/content/ListDelegate.qml b/examples/qml/flickr/content/ListDelegate.qml
index 9c239151f1..00f837f862 100644
--- a/examples/declarative/flickr/content/ListDelegate.qml
+++ b/examples/qml/flickr/content/ListDelegate.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/examples/declarative/flickr/content/Progress.qml b/examples/qml/flickr/content/Progress.qml
index 81f1e79ed6..ed2629b48a 100644
--- a/examples/declarative/flickr/content/Progress.qml
+++ b/examples/qml/flickr/content/Progress.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/examples/declarative/flickr/content/RssModel.qml b/examples/qml/flickr/content/RssModel.qml
index f28a23d502..51cea498e6 100644
--- a/examples/declarative/flickr/content/RssModel.qml
+++ b/examples/qml/flickr/content/RssModel.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/examples/declarative/flickr/content/ScrollBar.qml b/examples/qml/flickr/content/ScrollBar.qml
index 388e43dc2d..7c62ad088f 100644
--- a/examples/declarative/flickr/content/ScrollBar.qml
+++ b/examples/qml/flickr/content/ScrollBar.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/examples/declarative/flickr/content/Slider.qml b/examples/qml/flickr/content/Slider.qml
index 0f9e8b20f2..c4e743641f 100644
--- a/examples/declarative/flickr/content/Slider.qml
+++ b/examples/qml/flickr/content/Slider.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/examples/declarative/flickr/content/TitleBar.qml b/examples/qml/flickr/content/TitleBar.qml
index 3dab005a11..223939f81a 100644
--- a/examples/declarative/flickr/content/TitleBar.qml
+++ b/examples/qml/flickr/content/TitleBar.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/examples/declarative/flickr/content/ToolBar.qml b/examples/qml/flickr/content/ToolBar.qml
index e82be63e7e..356993b41a 100644
--- a/examples/declarative/flickr/content/ToolBar.qml
+++ b/examples/qml/flickr/content/ToolBar.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/examples/declarative/flickr/content/UnifiedDelegate.qml b/examples/qml/flickr/content/UnifiedDelegate.qml
index 00a777b0a1..0b068c0abe 100644
--- a/examples/declarative/flickr/content/UnifiedDelegate.qml
+++ b/examples/qml/flickr/content/UnifiedDelegate.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/examples/declarative/flickr/content/images/gloss.png b/examples/qml/flickr/content/images/gloss.png
index 5d370cd93d..5d370cd93d 100644
--- a/examples/declarative/flickr/content/images/gloss.png
+++ b/examples/qml/flickr/content/images/gloss.png
diff --git a/examples/declarative/flickr/content/images/lineedit.png b/examples/qml/flickr/content/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100644
--- a/examples/declarative/flickr/content/images/lineedit.png
+++ b/examples/qml/flickr/content/images/lineedit.png
diff --git a/examples/declarative/flickr/content/images/lineedit.sci b/examples/qml/flickr/content/images/lineedit.sci
index 054bff78be..054bff78be 100644
--- a/examples/declarative/flickr/content/images/lineedit.sci
+++ b/examples/qml/flickr/content/images/lineedit.sci
diff --git a/examples/declarative/flickr/content/images/noise.png b/examples/qml/flickr/content/images/noise.png
index c5a5ba0053..c5a5ba0053 100644
--- a/examples/declarative/flickr/content/images/noise.png
+++ b/examples/qml/flickr/content/images/noise.png
diff --git a/examples/declarative/flickr/content/images/particle.png b/examples/qml/flickr/content/images/particle.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/flickr/content/images/particle.png
+++ b/examples/qml/flickr/content/images/particle.png
diff --git a/examples/declarative/flickr/content/images/quit.png b/examples/qml/flickr/content/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100644
--- a/examples/declarative/flickr/content/images/quit.png
+++ b/examples/qml/flickr/content/images/quit.png
diff --git a/examples/declarative/flickr/content/images/squareParticle.png b/examples/qml/flickr/content/images/squareParticle.png
index faf85c24e0..faf85c24e0 100644
--- a/examples/declarative/flickr/content/images/squareParticle.png
+++ b/examples/qml/flickr/content/images/squareParticle.png
diff --git a/examples/declarative/flickr/content/images/stripes.png b/examples/qml/flickr/content/images/stripes.png
index 9f36727ea4..9f36727ea4 100644
--- a/examples/declarative/flickr/content/images/stripes.png
+++ b/examples/qml/flickr/content/images/stripes.png
diff --git a/examples/declarative/flickr/content/images/titlebar.png b/examples/qml/flickr/content/images/titlebar.png
index 51c90082d0..51c90082d0 100644
--- a/examples/declarative/flickr/content/images/titlebar.png
+++ b/examples/qml/flickr/content/images/titlebar.png
diff --git a/examples/declarative/flickr/content/images/titlebar.sci b/examples/qml/flickr/content/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100644
--- a/examples/declarative/flickr/content/images/titlebar.sci
+++ b/examples/qml/flickr/content/images/titlebar.sci
diff --git a/examples/declarative/flickr/content/images/toolbutton.png b/examples/qml/flickr/content/images/toolbutton.png
index 11310013ee..11310013ee 100644
--- a/examples/declarative/flickr/content/images/toolbutton.png
+++ b/examples/qml/flickr/content/images/toolbutton.png
diff --git a/examples/declarative/flickr/content/images/toolbutton.sci b/examples/qml/flickr/content/images/toolbutton.sci
index 9e4f965307..9e4f965307 100644
--- a/examples/declarative/flickr/content/images/toolbutton.sci
+++ b/examples/qml/flickr/content/images/toolbutton.sci
diff --git a/examples/declarative/flickr/content/qmldir b/examples/qml/flickr/content/qmldir
index adc2479b9f..adc2479b9f 100644
--- a/examples/declarative/flickr/content/qmldir
+++ b/examples/qml/flickr/content/qmldir
diff --git a/examples/declarative/flickr/flickr-90.qml b/examples/qml/flickr/flickr-90.qml
index ae06957649..b95b1c9872 100644
--- a/examples/declarative/flickr/flickr-90.qml
+++ b/examples/qml/flickr/flickr-90.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/examples/declarative/flickr/flickr.qml b/examples/qml/flickr/flickr.qml
index 74c41f185b..98ca5197ab 100644
--- a/examples/declarative/flickr/flickr.qml
+++ b/examples/qml/flickr/flickr.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/examples/declarative/flickr/flickr.qmlproject b/examples/qml/flickr/flickr.qmlproject
index af5179d84b..af5179d84b 100644
--- a/examples/declarative/flickr/flickr.qmlproject
+++ b/examples/qml/flickr/flickr.qmlproject
diff --git a/examples/declarative/i18n/i18n.qml b/examples/qml/i18n/i18n.qml
index f8bf30d0f0..f8bf30d0f0 100644
--- a/examples/declarative/i18n/i18n.qml
+++ b/examples/qml/i18n/i18n.qml
diff --git a/examples/declarative/i18n/i18n/base.ts b/examples/qml/i18n/i18n/base.ts
index 82547a1f93..82547a1f93 100644
--- a/examples/declarative/i18n/i18n/base.ts
+++ b/examples/qml/i18n/i18n/base.ts
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.ts b/examples/qml/i18n/i18n/qml_en_AU.ts
index e991affe7f..e991affe7f 100644
--- a/examples/declarative/i18n/i18n/qml_en_AU.ts
+++ b/examples/qml/i18n/i18n/qml_en_AU.ts
diff --git a/examples/declarative/i18n/i18n/qml_fr.ts b/examples/qml/i18n/i18n/qml_fr.ts
index 365abd95c2..365abd95c2 100644
--- a/examples/declarative/i18n/i18n/qml_fr.ts
+++ b/examples/qml/i18n/i18n/qml_fr.ts
diff --git a/examples/declarative/imageelements/borderimage.qml b/examples/qml/imageelements/borderimage.qml
index 3dd5d1d9bb..3dd5d1d9bb 100644
--- a/examples/declarative/imageelements/borderimage.qml
+++ b/examples/qml/imageelements/borderimage.qml
diff --git a/examples/declarative/imageelements/content/BearSheet.png b/examples/qml/imageelements/content/BearSheet.png
index a084bf0f1e..a084bf0f1e 100644
--- a/examples/declarative/imageelements/content/BearSheet.png
+++ b/examples/qml/imageelements/content/BearSheet.png
diff --git a/examples/declarative/imageelements/content/ImageCell.qml b/examples/qml/imageelements/content/ImageCell.qml
index fcc6b47af5..fcc6b47af5 100644
--- a/examples/declarative/imageelements/content/ImageCell.qml
+++ b/examples/qml/imageelements/content/ImageCell.qml
diff --git a/examples/declarative/imageelements/content/MyBorderImage.qml b/examples/qml/imageelements/content/MyBorderImage.qml
index 178e3706db..178e3706db 100644
--- a/examples/declarative/imageelements/content/MyBorderImage.qml
+++ b/examples/qml/imageelements/content/MyBorderImage.qml
diff --git a/examples/declarative/imageelements/content/ShadowRectangle.qml b/examples/qml/imageelements/content/ShadowRectangle.qml
index e6fd13bb26..e6fd13bb26 100644
--- a/examples/declarative/imageelements/content/ShadowRectangle.qml
+++ b/examples/qml/imageelements/content/ShadowRectangle.qml
diff --git a/examples/declarative/imageelements/content/bw.png b/examples/qml/imageelements/content/bw.png
index 486eaae96e..486eaae96e 100644
--- a/examples/declarative/imageelements/content/bw.png
+++ b/examples/qml/imageelements/content/bw.png
diff --git a/examples/declarative/imageelements/content/colors-round.sci b/examples/qml/imageelements/content/colors-round.sci
index 506f6f5f99..506f6f5f99 100644
--- a/examples/declarative/imageelements/content/colors-round.sci
+++ b/examples/qml/imageelements/content/colors-round.sci
diff --git a/examples/declarative/imageelements/content/colors-stretch.sci b/examples/qml/imageelements/content/colors-stretch.sci
index e4989a723c..e4989a723c 100644
--- a/examples/declarative/imageelements/content/colors-stretch.sci
+++ b/examples/qml/imageelements/content/colors-stretch.sci
diff --git a/examples/declarative/imageelements/content/colors.png b/examples/qml/imageelements/content/colors.png
index dfb62f3d64..dfb62f3d64 100644
--- a/examples/declarative/imageelements/content/colors.png
+++ b/examples/qml/imageelements/content/colors.png
diff --git a/examples/declarative/imageelements/content/qt-logo.png b/examples/qml/imageelements/content/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/declarative/imageelements/content/qt-logo.png
+++ b/examples/qml/imageelements/content/qt-logo.png
diff --git a/examples/declarative/imageelements/content/shadow.png b/examples/qml/imageelements/content/shadow.png
index 431af8545d..431af8545d 100644
--- a/examples/declarative/imageelements/content/shadow.png
+++ b/examples/qml/imageelements/content/shadow.png
diff --git a/examples/declarative/imageelements/content/speaker.png b/examples/qml/imageelements/content/speaker.png
index fb0e857859..fb0e857859 100644
--- a/examples/declarative/imageelements/content/speaker.png
+++ b/examples/qml/imageelements/content/speaker.png
diff --git a/examples/declarative/imageelements/image.qml b/examples/qml/imageelements/image.qml
index 4ca26c1630..4ca26c1630 100644
--- a/examples/declarative/imageelements/image.qml
+++ b/examples/qml/imageelements/image.qml
diff --git a/examples/declarative/imageelements/imageelements.qml b/examples/qml/imageelements/imageelements.qml
index 2ef5154968..2ef5154968 100644
--- a/examples/declarative/imageelements/imageelements.qml
+++ b/examples/qml/imageelements/imageelements.qml
diff --git a/examples/declarative/imageelements/imageelements.qmlproject b/examples/qml/imageelements/imageelements.qmlproject
index 4292a0c112..4292a0c112 100644
--- a/examples/declarative/imageelements/imageelements.qmlproject
+++ b/examples/qml/imageelements/imageelements.qmlproject
diff --git a/examples/declarative/imageelements/shadows.qml b/examples/qml/imageelements/shadows.qml
index aa5022ab36..aa5022ab36 100644
--- a/examples/declarative/imageelements/shadows.qml
+++ b/examples/qml/imageelements/shadows.qml
diff --git a/examples/declarative/imageelements/simplesprite.qml b/examples/qml/imageelements/simplesprite.qml
index f619913bfc..f619913bfc 100644
--- a/examples/declarative/imageelements/simplesprite.qml
+++ b/examples/qml/imageelements/simplesprite.qml
diff --git a/examples/declarative/imageelements/spriteimage.qml b/examples/qml/imageelements/spriteimage.qml
index 559bb10a50..559bb10a50 100644
--- a/examples/declarative/imageelements/spriteimage.qml
+++ b/examples/qml/imageelements/spriteimage.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/qml/keyinteraction/focus/Core/ContextMenu.qml
index dc68aa2b30..dc68aa2b30 100644
--- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
+++ b/examples/qml/keyinteraction/focus/Core/ContextMenu.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/qml/keyinteraction/focus/Core/GridMenu.qml
index 75bbe682af..75bbe682af 100644
--- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
+++ b/examples/qml/keyinteraction/focus/Core/GridMenu.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml b/examples/qml/keyinteraction/focus/Core/ListMenu.qml
index 7a62f33428..7a62f33428 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
+++ b/examples/qml/keyinteraction/focus/Core/ListMenu.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/qml/keyinteraction/focus/Core/ListViewDelegate.qml
index b28b02616d..b28b02616d 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
+++ b/examples/qml/keyinteraction/focus/Core/ListViewDelegate.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/images/arrow.png b/examples/qml/keyinteraction/focus/Core/images/arrow.png
index 14978c2e56..14978c2e56 100644
--- a/examples/declarative/keyinteraction/focus/Core/images/arrow.png
+++ b/examples/qml/keyinteraction/focus/Core/images/arrow.png
diff --git a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png b/examples/qml/keyinteraction/focus/Core/images/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png
+++ b/examples/qml/keyinteraction/focus/Core/images/qt-logo.png
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/qml/keyinteraction/focus/focus.qml
index 9300ad4f6e..9300ad4f6e 100644
--- a/examples/declarative/keyinteraction/focus/focus.qml
+++ b/examples/qml/keyinteraction/focus/focus.qml
diff --git a/examples/declarative/locale/locale.qml b/examples/qml/locale/locale.qml
index 08d08d6bbd..08d08d6bbd 100644
--- a/examples/declarative/locale/locale.qml
+++ b/examples/qml/locale/locale.qml
diff --git a/examples/declarative/minehunt/MinehuntCore/Explosion.qml b/examples/qml/minehunt/MinehuntCore/Explosion.qml
index 0983b68db4..a1b4292bcf 100644
--- a/examples/declarative/minehunt/MinehuntCore/Explosion.qml
+++ b/examples/qml/minehunt/MinehuntCore/Explosion.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/examples/declarative/minehunt/MinehuntCore/Tile.qml b/examples/qml/minehunt/MinehuntCore/Tile.qml
index 14c1f51f9e..1180b6f584 100644
--- a/examples/declarative/minehunt/MinehuntCore/Tile.qml
+++ b/examples/qml/minehunt/MinehuntCore/Tile.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/examples/declarative/minehunt/MinehuntCore/pics/back.png b/examples/qml/minehunt/MinehuntCore/pics/back.png
index f6b3f0b4d7..f6b3f0b4d7 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/back.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/back.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/background.png b/examples/qml/minehunt/MinehuntCore/pics/background.png
index 3734a27744..3734a27744 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/background.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/background.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png b/examples/qml/minehunt/MinehuntCore/pics/bomb-color.png
index 61ad0a928f..61ad0a928f 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/bomb-color.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/bomb.png b/examples/qml/minehunt/MinehuntCore/pics/bomb.png
index a992575518..a992575518 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/bomb.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/bomb.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png b/examples/qml/minehunt/MinehuntCore/pics/face-sad.png
index cf00aafe1f..cf00aafe1f 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/face-sad.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/qml/minehunt/MinehuntCore/pics/face-smile-big.png
index f9c2335df5..f9c2335df5 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/face-smile-big.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png b/examples/qml/minehunt/MinehuntCore/pics/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/face-smile.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png b/examples/qml/minehunt/MinehuntCore/pics/flag-color.png
index aadad0f11a..aadad0f11a 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/flag-color.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/flag.png b/examples/qml/minehunt/MinehuntCore/pics/flag.png
index 39cde4df82..39cde4df82 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/flag.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/flag.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/front.png b/examples/qml/minehunt/MinehuntCore/pics/front.png
index 834331bd49..834331bd49 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/front.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/front.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/quit.png b/examples/qml/minehunt/MinehuntCore/pics/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/quit.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/quit.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/star.png b/examples/qml/minehunt/MinehuntCore/pics/star.png
index 3772359188..3772359188 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/star.png
+++ b/examples/qml/minehunt/MinehuntCore/pics/star.png
diff --git a/examples/declarative/minehunt/MinehuntCore/qmldir b/examples/qml/minehunt/MinehuntCore/qmldir
index a0213a19c4..a0213a19c4 100644
--- a/examples/declarative/minehunt/MinehuntCore/qmldir
+++ b/examples/qml/minehunt/MinehuntCore/qmldir
diff --git a/examples/declarative/minehunt/README b/examples/qml/minehunt/README
index 3849ca5fbf..3849ca5fbf 100644
--- a/examples/declarative/minehunt/README
+++ b/examples/qml/minehunt/README
diff --git a/examples/declarative/minehunt/main.cpp b/examples/qml/minehunt/main.cpp
index 47c0436969..0aa11a1d7a 100644
--- a/examples/declarative/minehunt/main.cpp
+++ b/examples/qml/minehunt/main.cpp
@@ -41,8 +41,8 @@
 
 #include <QtGui/QGuiApplication>
 #include <QtQuick/qquickview.h>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
 
 #include "minehunt.h"
 
diff --git a/examples/declarative/minehunt/minehunt.cpp b/examples/qml/minehunt/minehunt.cpp
index facbec375a..cde30278b3 100644
--- a/examples/declarative/minehunt/minehunt.cpp
+++ b/examples/qml/minehunt/minehunt.cpp
@@ -45,25 +45,25 @@
 
 #include "minehunt.h"
 
-void tilesPropAppend(QDeclarativeListProperty<TileData>* prop, TileData* value)
+void tilesPropAppend(QQmlListProperty<TileData>* prop, TileData* value)
 {
     Q_UNUSED(prop);
     Q_UNUSED(value);
     return; //Append not supported
 }
 
-int tilesPropCount(QDeclarativeListProperty<TileData>* prop)
+int tilesPropCount(QQmlListProperty<TileData>* prop)
 {
     return static_cast<QList<TileData*>*>(prop->data)->count();
 }
 
-TileData* tilesPropAt(QDeclarativeListProperty<TileData>* prop, int index)
+TileData* tilesPropAt(QQmlListProperty<TileData>* prop, int index)
 {
     return static_cast<QList<TileData*>*>(prop->data)->at(index);
 }
 
-QDeclarativeListProperty<TileData> MinehuntGame::tiles(){
-    return QDeclarativeListProperty<TileData>(this, &_tiles, &tilesPropAppend,
+QQmlListProperty<TileData> MinehuntGame::tiles(){
+    return QQmlListProperty<TileData>(this, &_tiles, &tilesPropAppend,
             &tilesPropCount, &tilesPropAt, 0);
 }
 
diff --git a/examples/declarative/minehunt/minehunt.h b/examples/qml/minehunt/minehunt.h
index a0ae23fa8a..34bab71218 100644
--- a/examples/declarative/minehunt/minehunt.h
+++ b/examples/qml/minehunt/minehunt.h
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 class TileData : public QObject
 {
@@ -85,8 +85,8 @@ class MinehuntGame : public QObject
 public:
     MinehuntGame();
 
-    Q_PROPERTY(QDeclarativeListProperty<TileData> tiles READ tiles CONSTANT)
-    QDeclarativeListProperty<TileData> tiles();
+    Q_PROPERTY(QQmlListProperty<TileData> tiles READ tiles CONSTANT)
+    QQmlListProperty<TileData> tiles();
 
     Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
     bool isPlaying() {return playing;}
diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/qml/minehunt/minehunt.pro
index 81b6b80486..78e874d805 100644
--- a/examples/declarative/minehunt/minehunt.pro
+++ b/examples/qml/minehunt/minehunt.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += minehunt.h
 SOURCES += main.cpp minehunt.cpp
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/qml/minehunt/minehunt.qml
index 7c4948a3bb..42dc408fff 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/qml/minehunt/minehunt.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/examples/declarative/minehunt/minehunt.qmlproject b/examples/qml/minehunt/minehunt.qmlproject
index 5aeb78f1ea..5aeb78f1ea 100644
--- a/examples/declarative/minehunt/minehunt.qmlproject
+++ b/examples/qml/minehunt/minehunt.qmlproject
diff --git a/examples/declarative/minehunt/minehunt.qrc b/examples/qml/minehunt/minehunt.qrc
index fa8e27d383..fa8e27d383 100644
--- a/examples/declarative/minehunt/minehunt.qrc
+++ b/examples/qml/minehunt/minehunt.qrc
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/qml/modelviews/abstractitemmodel/abstractitemmodel.pro
index eaf2b30c89..f786d9356f 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/qml/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = abstractitemmodel
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative quick
+QT += qml quick
 
 HEADERS = model.h
 SOURCES = main.cpp \
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/qml/modelviews/abstractitemmodel/abstractitemmodel.qrc
index 4ae861cb3d..4ae861cb3d 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc
+++ b/examples/qml/modelviews/abstractitemmodel/abstractitemmodel.qrc
diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/qml/modelviews/abstractitemmodel/main.cpp
index b6ca2df26e..f5930ce840 100644
--- a/examples/declarative/modelviews/abstractitemmodel/main.cpp
+++ b/examples/qml/modelviews/abstractitemmodel/main.cpp
@@ -40,9 +40,9 @@
 #include "model.h"
 
 #include <QGuiApplication>
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarative.h>
+#include <qqmlengine.h>
+#include <qqmlcontext.h>
+#include <qqml.h>
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
 
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
 
     QQuickView view;
     view.setResizeMode(QQuickView::SizeRootObjectToView);
-    QDeclarativeContext *ctxt = view.rootContext();
+    QQmlContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", &model);
 //![0]
 
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.cpp b/examples/qml/modelviews/abstractitemmodel/model.cpp
index 8f7649c0d4..8f7649c0d4 100644
--- a/examples/declarative/modelviews/abstractitemmodel/model.cpp
+++ b/examples/qml/modelviews/abstractitemmodel/model.cpp
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.h b/examples/qml/modelviews/abstractitemmodel/model.h
index 1378c4487e..1378c4487e 100644
--- a/examples/declarative/modelviews/abstractitemmodel/model.h
+++ b/examples/qml/modelviews/abstractitemmodel/model.h
diff --git a/examples/declarative/modelviews/abstractitemmodel/view.qml b/examples/qml/modelviews/abstractitemmodel/view.qml
index 64f5871d4b..64f5871d4b 100644
--- a/examples/declarative/modelviews/abstractitemmodel/view.qml
+++ b/examples/qml/modelviews/abstractitemmodel/view.qml
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/qml/modelviews/gridview/gridview-example.qml
index ea3bb5cec9..ea3bb5cec9 100644
--- a/examples/declarative/modelviews/gridview/gridview-example.qml
+++ b/examples/qml/modelviews/gridview/gridview-example.qml
diff --git a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png b/examples/qml/modelviews/gridview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png
+++ b/examples/qml/modelviews/gridview/pics/AddressBook_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png b/examples/qml/modelviews/gridview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png
+++ b/examples/qml/modelviews/gridview/pics/AudioPlayer_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/Camera_48.png b/examples/qml/modelviews/gridview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/declarative/modelviews/gridview/pics/Camera_48.png
+++ b/examples/qml/modelviews/gridview/pics/Camera_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/DateBook_48.png b/examples/qml/modelviews/gridview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/declarative/modelviews/gridview/pics/DateBook_48.png
+++ b/examples/qml/modelviews/gridview/pics/DateBook_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/EMail_48.png b/examples/qml/modelviews/gridview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/declarative/modelviews/gridview/pics/EMail_48.png
+++ b/examples/qml/modelviews/gridview/pics/EMail_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/TodoList_48.png b/examples/qml/modelviews/gridview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/declarative/modelviews/gridview/pics/TodoList_48.png
+++ b/examples/qml/modelviews/gridview/pics/TodoList_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png b/examples/qml/modelviews/gridview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png
+++ b/examples/qml/modelviews/gridview/pics/VideoPlayer_48.png
diff --git a/examples/declarative/modelviews/listview/content/PetsModel.qml b/examples/qml/modelviews/listview/content/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/modelviews/listview/content/PetsModel.qml
+++ b/examples/qml/modelviews/listview/content/PetsModel.qml
diff --git a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml b/examples/qml/modelviews/listview/content/PressAndHoldButton.qml
index b20d8f64f1..b20d8f64f1 100644
--- a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/qml/modelviews/listview/content/PressAndHoldButton.qml
diff --git a/examples/declarative/modelviews/listview/content/RecipesModel.qml b/examples/qml/modelviews/listview/content/RecipesModel.qml
index 86210ba436..86210ba436 100644
--- a/examples/declarative/modelviews/listview/content/RecipesModel.qml
+++ b/examples/qml/modelviews/listview/content/RecipesModel.qml
diff --git a/examples/declarative/modelviews/listview/content/TextButton.qml b/examples/qml/modelviews/listview/content/TextButton.qml
index 980ee21553..980ee21553 100644
--- a/examples/declarative/modelviews/listview/content/TextButton.qml
+++ b/examples/qml/modelviews/listview/content/TextButton.qml
diff --git a/examples/declarative/modelviews/listview/content/ToggleButton.qml b/examples/qml/modelviews/listview/content/ToggleButton.qml
index 0754d9849b..52f4988f03 100644
--- a/examples/declarative/modelviews/listview/content/ToggleButton.qml
+++ b/examples/qml/modelviews/listview/content/ToggleButton.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/declarative/modelviews/listview/content/pics/arrow-down.png b/examples/qml/modelviews/listview/content/pics/arrow-down.png
index 29d1d4439a..29d1d4439a 100644
--- a/examples/declarative/modelviews/listview/content/pics/arrow-down.png
+++ b/examples/qml/modelviews/listview/content/pics/arrow-down.png
diff --git a/examples/declarative/modelviews/listview/content/pics/arrow-up.png b/examples/qml/modelviews/listview/content/pics/arrow-up.png
index e437312217..e437312217 100644
--- a/examples/declarative/modelviews/listview/content/pics/arrow-up.png
+++ b/examples/qml/modelviews/listview/content/pics/arrow-up.png
diff --git a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg b/examples/qml/modelviews/listview/content/pics/fruit-salad.jpg
index da5a6b10a2..da5a6b10a2 100644
--- a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg
+++ b/examples/qml/modelviews/listview/content/pics/fruit-salad.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg b/examples/qml/modelviews/listview/content/pics/hamburger.jpg
index d0a15be1bf..d0a15be1bf 100644
--- a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg
+++ b/examples/qml/modelviews/listview/content/pics/hamburger.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg b/examples/qml/modelviews/listview/content/pics/lemonade.jpg
index db445c9ac8..db445c9ac8 100644
--- a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg
+++ b/examples/qml/modelviews/listview/content/pics/lemonade.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/list-delete.png b/examples/qml/modelviews/listview/content/pics/list-delete.png
index df2a147d24..df2a147d24 100644
--- a/examples/declarative/modelviews/listview/content/pics/list-delete.png
+++ b/examples/qml/modelviews/listview/content/pics/list-delete.png
diff --git a/examples/declarative/modelviews/listview/content/pics/minus-sign.png b/examples/qml/modelviews/listview/content/pics/minus-sign.png
index d6f233d739..d6f233d739 100644
--- a/examples/declarative/modelviews/listview/content/pics/minus-sign.png
+++ b/examples/qml/modelviews/listview/content/pics/minus-sign.png
diff --git a/examples/declarative/modelviews/listview/content/pics/moreDown.png b/examples/qml/modelviews/listview/content/pics/moreDown.png
index 31a35d5c20..31a35d5c20 100644
--- a/examples/declarative/modelviews/listview/content/pics/moreDown.png
+++ b/examples/qml/modelviews/listview/content/pics/moreDown.png
diff --git a/examples/declarative/modelviews/listview/content/pics/moreUp.png b/examples/qml/modelviews/listview/content/pics/moreUp.png
index fefb9c9098..fefb9c9098 100644
--- a/examples/declarative/modelviews/listview/content/pics/moreUp.png
+++ b/examples/qml/modelviews/listview/content/pics/moreUp.png
diff --git a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg b/examples/qml/modelviews/listview/content/pics/pancakes.jpg
index 60c439638e..60c439638e 100644
--- a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg
+++ b/examples/qml/modelviews/listview/content/pics/pancakes.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/plus-sign.png b/examples/qml/modelviews/listview/content/pics/plus-sign.png
index 40df1134f8..40df1134f8 100644
--- a/examples/declarative/modelviews/listview/content/pics/plus-sign.png
+++ b/examples/qml/modelviews/listview/content/pics/plus-sign.png
diff --git a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg b/examples/qml/modelviews/listview/content/pics/vegetable-soup.jpg
index 9dce332041..9dce332041 100644
--- a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg
+++ b/examples/qml/modelviews/listview/content/pics/vegetable-soup.jpg
diff --git a/examples/declarative/modelviews/listview/dynamiclist.qml b/examples/qml/modelviews/listview/dynamiclist.qml
index ee7c6329bc..ee7c6329bc 100644
--- a/examples/declarative/modelviews/listview/dynamiclist.qml
+++ b/examples/qml/modelviews/listview/dynamiclist.qml
diff --git a/examples/declarative/modelviews/listview/expandingdelegates.qml b/examples/qml/modelviews/listview/expandingdelegates.qml
index 43a9662422..43a9662422 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates.qml
+++ b/examples/qml/modelviews/listview/expandingdelegates.qml
diff --git a/examples/declarative/modelviews/listview/highlight.qml b/examples/qml/modelviews/listview/highlight.qml
index d8f76080e6..d8f76080e6 100644
--- a/examples/declarative/modelviews/listview/highlight.qml
+++ b/examples/qml/modelviews/listview/highlight.qml
diff --git a/examples/declarative/modelviews/listview/highlightranges.qml b/examples/qml/modelviews/listview/highlightranges.qml
index a536ddcbb2..a536ddcbb2 100644
--- a/examples/declarative/modelviews/listview/highlightranges.qml
+++ b/examples/qml/modelviews/listview/highlightranges.qml
diff --git a/examples/declarative/modelviews/listview/sections.qml b/examples/qml/modelviews/listview/sections.qml
index 2e63a86bb6..2e63a86bb6 100644
--- a/examples/declarative/modelviews/listview/sections.qml
+++ b/examples/qml/modelviews/listview/sections.qml
diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/qml/modelviews/modelviews.pro
index 7748da0471..7748da0471 100644
--- a/examples/declarative/modelviews/modelviews.pro
+++ b/examples/qml/modelviews/modelviews.pro
diff --git a/examples/declarative/modelviews/modelviews.qml b/examples/qml/modelviews/modelviews.qml
index 86b10ca4ba..86b10ca4ba 100644
--- a/examples/declarative/modelviews/modelviews.qml
+++ b/examples/qml/modelviews/modelviews.qml
diff --git a/examples/declarative/modelviews/modelviews.qmlproject b/examples/qml/modelviews/modelviews.qmlproject
index 40f9e568fd..40f9e568fd 100644
--- a/examples/declarative/modelviews/modelviews.qmlproject
+++ b/examples/qml/modelviews/modelviews.qmlproject
diff --git a/examples/declarative/modelviews/objectlistmodel/dataobject.cpp b/examples/qml/modelviews/objectlistmodel/dataobject.cpp
index 7216283616..7216283616 100644
--- a/examples/declarative/modelviews/objectlistmodel/dataobject.cpp
+++ b/examples/qml/modelviews/objectlistmodel/dataobject.cpp
diff --git a/examples/declarative/modelviews/objectlistmodel/dataobject.h b/examples/qml/modelviews/objectlistmodel/dataobject.h
index bea92a273c..bea92a273c 100644
--- a/examples/declarative/modelviews/objectlistmodel/dataobject.h
+++ b/examples/qml/modelviews/objectlistmodel/dataobject.h
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/qml/modelviews/objectlistmodel/main.cpp
index c8542976c3..bb3895f7c0 100644
--- a/examples/declarative/modelviews/objectlistmodel/main.cpp
+++ b/examples/qml/modelviews/objectlistmodel/main.cpp
@@ -40,9 +40,9 @@
 
 #include <QGuiApplication>
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarative.h>
+#include <qqmlengine.h>
+#include <qqmlcontext.h>
+#include <qqml.h>
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
 
@@ -66,7 +66,7 @@ int main(int argc, char ** argv)
 
     QQuickView view;
     view.setResizeMode(QQuickView::SizeRootObjectToView);
-    QDeclarativeContext *ctxt = view.rootContext();
+    QQmlContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 //![0]
 
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/qml/modelviews/objectlistmodel/objectlistmodel.pro
index 74dc5b1016..7f323c3999 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/qml/modelviews/objectlistmodel/objectlistmodel.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 SOURCES += main.cpp \
            dataobject.cpp
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject b/examples/qml/modelviews/objectlistmodel/objectlistmodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject
+++ b/examples/qml/modelviews/objectlistmodel/objectlistmodel.qmlproject
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc b/examples/qml/modelviews/objectlistmodel/objectlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
+++ b/examples/qml/modelviews/objectlistmodel/objectlistmodel.qrc
diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/qml/modelviews/objectlistmodel/view.qml
index 3954e79829..3954e79829 100644
--- a/examples/declarative/modelviews/objectlistmodel/view.qml
+++ b/examples/qml/modelviews/objectlistmodel/view.qml
diff --git a/examples/declarative/modelviews/package/Delegate.qml b/examples/qml/modelviews/package/Delegate.qml
index 97c7840cb4..97c7840cb4 100644
--- a/examples/declarative/modelviews/package/Delegate.qml
+++ b/examples/qml/modelviews/package/Delegate.qml
diff --git a/examples/declarative/modelviews/package/view.qml b/examples/qml/modelviews/package/view.qml
index 5b2fd9481c..5b2fd9481c 100644
--- a/examples/declarative/modelviews/package/view.qml
+++ b/examples/qml/modelviews/package/view.qml
diff --git a/examples/declarative/modelviews/parallax/content/ParallaxView.qml b/examples/qml/modelviews/parallax/content/ParallaxView.qml
index 2acf50dcef..2acf50dcef 100644
--- a/examples/declarative/modelviews/parallax/content/ParallaxView.qml
+++ b/examples/qml/modelviews/parallax/content/ParallaxView.qml
diff --git a/examples/declarative/modelviews/parallax/content/Smiley.qml b/examples/qml/modelviews/parallax/content/Smiley.qml
index 982b6c5d2b..982b6c5d2b 100644
--- a/examples/declarative/modelviews/parallax/content/Smiley.qml
+++ b/examples/qml/modelviews/parallax/content/Smiley.qml
diff --git a/examples/declarative/modelviews/parallax/content/pics/background.jpg b/examples/qml/modelviews/parallax/content/pics/background.jpg
index 61cca2f138..61cca2f138 100644
--- a/examples/declarative/modelviews/parallax/content/pics/background.jpg
+++ b/examples/qml/modelviews/parallax/content/pics/background.jpg
diff --git a/examples/declarative/modelviews/parallax/content/pics/face-smile.png b/examples/qml/modelviews/parallax/content/pics/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/modelviews/parallax/content/pics/face-smile.png
+++ b/examples/qml/modelviews/parallax/content/pics/face-smile.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/home-page.png b/examples/qml/modelviews/parallax/content/pics/home-page.png
index bd090c3708..bd090c3708 100644
--- a/examples/declarative/modelviews/parallax/content/pics/home-page.png
+++ b/examples/qml/modelviews/parallax/content/pics/home-page.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/home-page.svg b/examples/qml/modelviews/parallax/content/pics/home-page.svg
index 4f16958844..4f16958844 100644
--- a/examples/declarative/modelviews/parallax/content/pics/home-page.svg
+++ b/examples/qml/modelviews/parallax/content/pics/home-page.svg
diff --git a/examples/declarative/modelviews/parallax/content/pics/shadow.png b/examples/qml/modelviews/parallax/content/pics/shadow.png
index 8270565e87..8270565e87 100644
--- a/examples/declarative/modelviews/parallax/content/pics/shadow.png
+++ b/examples/qml/modelviews/parallax/content/pics/shadow.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/yast-joystick.png b/examples/qml/modelviews/parallax/content/pics/yast-joystick.png
index 858cea0301..858cea0301 100644
--- a/examples/declarative/modelviews/parallax/content/pics/yast-joystick.png
+++ b/examples/qml/modelviews/parallax/content/pics/yast-joystick.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/yast-wol.png b/examples/qml/modelviews/parallax/content/pics/yast-wol.png
index 7712180a3b..7712180a3b 100644
--- a/examples/declarative/modelviews/parallax/content/pics/yast-wol.png
+++ b/examples/qml/modelviews/parallax/content/pics/yast-wol.png
diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/qml/modelviews/parallax/parallax.qml
index 6981095a80..6981095a80 100644
--- a/examples/declarative/modelviews/parallax/parallax.qml
+++ b/examples/qml/modelviews/parallax/parallax.qml
diff --git a/examples/declarative/modelviews/pathview/pathview-example.qml b/examples/qml/modelviews/pathview/pathview-example.qml
index 6161343830..6161343830 100644
--- a/examples/declarative/modelviews/pathview/pathview-example.qml
+++ b/examples/qml/modelviews/pathview/pathview-example.qml
diff --git a/examples/declarative/modelviews/pathview/pics/AddressBook_48.png b/examples/qml/modelviews/pathview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/declarative/modelviews/pathview/pics/AddressBook_48.png
+++ b/examples/qml/modelviews/pathview/pics/AddressBook_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png b/examples/qml/modelviews/pathview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png
+++ b/examples/qml/modelviews/pathview/pics/AudioPlayer_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/Camera_48.png b/examples/qml/modelviews/pathview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/declarative/modelviews/pathview/pics/Camera_48.png
+++ b/examples/qml/modelviews/pathview/pics/Camera_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/DateBook_48.png b/examples/qml/modelviews/pathview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/declarative/modelviews/pathview/pics/DateBook_48.png
+++ b/examples/qml/modelviews/pathview/pics/DateBook_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/EMail_48.png b/examples/qml/modelviews/pathview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/declarative/modelviews/pathview/pics/EMail_48.png
+++ b/examples/qml/modelviews/pathview/pics/EMail_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/TodoList_48.png b/examples/qml/modelviews/pathview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/declarative/modelviews/pathview/pics/TodoList_48.png
+++ b/examples/qml/modelviews/pathview/pics/TodoList_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png b/examples/qml/modelviews/pathview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png
+++ b/examples/qml/modelviews/pathview/pics/VideoPlayer_48.png
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/qml/modelviews/stringlistmodel/main.cpp
index 47d7fdaa8c..12859316a3 100644
--- a/examples/declarative/modelviews/stringlistmodel/main.cpp
+++ b/examples/qml/modelviews/stringlistmodel/main.cpp
@@ -41,9 +41,9 @@
 #include <QGuiApplication>
 #include <QStringList>
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarative.h>
+#include <qqmlengine.h>
+#include <qqmlcontext.h>
+#include <qqml.h>
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
 
@@ -65,7 +65,7 @@ int main(int argc, char ** argv)
     dataList.append("Item 4");
 
     QQuickView view;
-    QDeclarativeContext *ctxt = view.rootContext();
+    QQmlContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 //![0]
 
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/qml/modelviews/stringlistmodel/stringlistmodel.pro
index 540d8c71f0..19e62cd1b7 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/qml/modelviews/stringlistmodel/stringlistmodel.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 SOURCES += main.cpp 
 RESOURCES += stringlistmodel.qrc
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc b/examples/qml/modelviews/stringlistmodel/stringlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
+++ b/examples/qml/modelviews/stringlistmodel/stringlistmodel.qrc
diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/qml/modelviews/stringlistmodel/view.qml
index 945763c295..945763c295 100644
--- a/examples/declarative/modelviews/stringlistmodel/view.qml
+++ b/examples/qml/modelviews/stringlistmodel/view.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/dragselection.qml b/examples/qml/modelviews/visualdatamodel/dragselection.qml
index c3186a5ad8..c3186a5ad8 100644
--- a/examples/declarative/modelviews/visualdatamodel/dragselection.qml
+++ b/examples/qml/modelviews/visualdatamodel/dragselection.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/slideshow.qml b/examples/qml/modelviews/visualdatamodel/slideshow.qml
index 040c6be307..040c6be307 100644
--- a/examples/declarative/modelviews/visualdatamodel/slideshow.qml
+++ b/examples/qml/modelviews/visualdatamodel/slideshow.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/sortedmodel.qml b/examples/qml/modelviews/visualdatamodel/sortedmodel.qml
index 8d3b0a58e5..8d3b0a58e5 100644
--- a/examples/declarative/modelviews/visualdatamodel/sortedmodel.qml
+++ b/examples/qml/modelviews/visualdatamodel/sortedmodel.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/visualdatamodel.qmlproject b/examples/qml/modelviews/visualdatamodel/visualdatamodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/modelviews/visualdatamodel/visualdatamodel.qmlproject
+++ b/examples/qml/modelviews/visualdatamodel/visualdatamodel.qmlproject
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml b/examples/qml/modelviews/visualitemmodel/visualitemmodel.qml
index 3425150d9a..3425150d9a 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/qml/modelviews/visualitemmodel/visualitemmodel.qml
diff --git a/examples/declarative/openglunderqml/main.cpp b/examples/qml/openglunderqml/main.cpp
index 3b682deaec..3b682deaec 100644
--- a/examples/declarative/openglunderqml/main.cpp
+++ b/examples/qml/openglunderqml/main.cpp
diff --git a/examples/declarative/openglunderqml/main.qml b/examples/qml/openglunderqml/main.qml
index 1485cbbdb8..1485cbbdb8 100644
--- a/examples/declarative/openglunderqml/main.qml
+++ b/examples/qml/openglunderqml/main.qml
diff --git a/examples/declarative/openglunderqml/openglunderqml.pro b/examples/qml/openglunderqml/openglunderqml.pro
index 117ad0c33e..64a58b3729 100644
--- a/examples/declarative/openglunderqml/openglunderqml.pro
+++ b/examples/qml/openglunderqml/openglunderqml.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += squircle.h
 SOURCES += squircle.cpp main.cpp
diff --git a/examples/declarative/openglunderqml/squircle.cpp b/examples/qml/openglunderqml/squircle.cpp
index b56f0baaf6..b56f0baaf6 100644
--- a/examples/declarative/openglunderqml/squircle.cpp
+++ b/examples/qml/openglunderqml/squircle.cpp
diff --git a/examples/declarative/openglunderqml/squircle.h b/examples/qml/openglunderqml/squircle.h
index 283131a662..283131a662 100644
--- a/examples/declarative/openglunderqml/squircle.h
+++ b/examples/qml/openglunderqml/squircle.h
diff --git a/examples/declarative/painteditem/painteditem.pro b/examples/qml/painteditem/painteditem.pro
index e3afd6b0f0..e3afd6b0f0 100644
--- a/examples/declarative/painteditem/painteditem.pro
+++ b/examples/qml/painteditem/painteditem.pro
diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/qml/painteditem/smile/main.cpp
index 1e6b42351d..1c7888b10b 100644
--- a/examples/declarative/painteditem/smile/main.cpp
+++ b/examples/qml/painteditem/smile/main.cpp
@@ -40,7 +40,7 @@
 
 #include <QGuiApplication>
 #include <QPainter>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtQuick/qquickview.h>
 #include <QtQuick/qquickpainteditem.h>
 class MyPaintItem : public QQuickPaintedItem
diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/qml/painteditem/smile/smile.pro
index 780d351fe6..b1af4ee0ad 100644
--- a/examples/declarative/painteditem/smile/smile.pro
+++ b/examples/qml/painteditem/smile/smile.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = painteditem
 
-QT += declarative quick
+QT += qml quick
 
 macx: CONFIG -= app_bundle
 
diff --git a/examples/declarative/painteditem/smile/smile.qml b/examples/qml/painteditem/smile/smile.qml
index 33919bc04f..33919bc04f 100644
--- a/examples/declarative/painteditem/smile/smile.qml
+++ b/examples/qml/painteditem/smile/smile.qml
diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h b/examples/qml/painteditem/textballoons/TextBalloonPlugin/plugin.h
index 6be8611dfd..e6523e15a9 100644
--- a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
+++ b/examples/qml/painteditem/textballoons/TextBalloonPlugin/plugin.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QDeclarativeExtensionPlugin>
+#include <QQmlExtensionPlugin>
 
 #include "../textballoon.h"
 
-class TextBalloonPlugin : public QDeclarativeExtensionPlugin
+class TextBalloonPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir b/examples/qml/painteditem/textballoons/TextBalloonPlugin/qmldir
index e8a08ae9d3..e8a08ae9d3 100644
--- a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir
+++ b/examples/qml/painteditem/textballoons/TextBalloonPlugin/qmldir
diff --git a/examples/declarative/painteditem/textballoons/textballoon.cpp b/examples/qml/painteditem/textballoons/textballoon.cpp
index d097adfe1b..d097adfe1b 100644
--- a/examples/declarative/painteditem/textballoons/textballoon.cpp
+++ b/examples/qml/painteditem/textballoons/textballoon.cpp
diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/qml/painteditem/textballoons/textballoon.h
index 93ed0a7105..93ed0a7105 100644
--- a/examples/declarative/painteditem/textballoons/textballoon.h
+++ b/examples/qml/painteditem/textballoons/textballoon.h
diff --git a/examples/qml/painteditem/textballoons/textballoons.pro b/examples/qml/painteditem/textballoons/textballoons.pro
new file mode 100644
index 0000000000..9bc0f3c04a
--- /dev/null
+++ b/examples/qml/painteditem/textballoons/textballoons.pro
@@ -0,0 +1,23 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+QT += qml quick
+
+TARGET = qmltextballoonplugin
+
+HEADERS += TextBalloonPlugin/plugin.h \
+    textballoon.h
+
+SOURCES += textballoon.cpp
+
+DESTDIR = TextBalloonPlugin
+
+qqmlsources.files += \
+    TextBalloonPlugin/qmldir
+
+qqmlsources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/textballoons/TextBalloonPlugin
+ 
+sources.files = textballoons.qml
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/textballoons
+target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/textballoons/TextBalloonPlugin
+
+INSTALLS = qqmlsources sources target
diff --git a/examples/declarative/painteditem/textballoons/textballoons.qml b/examples/qml/painteditem/textballoons/textballoons.qml
index b00ce2bfed..b00ce2bfed 100644
--- a/examples/declarative/painteditem/textballoons/textballoons.qml
+++ b/examples/qml/painteditem/textballoons/textballoons.qml
diff --git a/examples/declarative/particles/affectors/age.qml b/examples/qml/particles/affectors/age.qml
index 1e7774b63b..1e7774b63b 100644
--- a/examples/declarative/particles/affectors/age.qml
+++ b/examples/qml/particles/affectors/age.qml
diff --git a/examples/declarative/particles/affectors/attractor.qml b/examples/qml/particles/affectors/attractor.qml
index 460a497a92..460a497a92 100644
--- a/examples/declarative/particles/affectors/attractor.qml
+++ b/examples/qml/particles/affectors/attractor.qml
diff --git a/examples/declarative/particles/affectors/customaffector.qml b/examples/qml/particles/affectors/customaffector.qml
index 3f98cd5b43..3f98cd5b43 100644
--- a/examples/declarative/particles/affectors/customaffector.qml
+++ b/examples/qml/particles/affectors/customaffector.qml
diff --git a/examples/declarative/particles/affectors/friction.qml b/examples/qml/particles/affectors/friction.qml
index 4161fd9f02..4161fd9f02 100644
--- a/examples/declarative/particles/affectors/friction.qml
+++ b/examples/qml/particles/affectors/friction.qml
diff --git a/examples/declarative/particles/affectors/gravity.qml b/examples/qml/particles/affectors/gravity.qml
index b90d83e1c8..b90d83e1c8 100644
--- a/examples/declarative/particles/affectors/gravity.qml
+++ b/examples/qml/particles/affectors/gravity.qml
diff --git a/examples/declarative/particles/affectors/groupgoal.qml b/examples/qml/particles/affectors/groupgoal.qml
index 273ec1a30c..273ec1a30c 100644
--- a/examples/declarative/particles/affectors/groupgoal.qml
+++ b/examples/qml/particles/affectors/groupgoal.qml
diff --git a/examples/declarative/particles/affectors/move.qml b/examples/qml/particles/affectors/move.qml
index f290173ca8..f290173ca8 100644
--- a/examples/declarative/particles/affectors/move.qml
+++ b/examples/qml/particles/affectors/move.qml
diff --git a/examples/declarative/particles/affectors/spritegoal.qml b/examples/qml/particles/affectors/spritegoal.qml
index 1ea61442aa..1ea61442aa 100644
--- a/examples/declarative/particles/affectors/spritegoal.qml
+++ b/examples/qml/particles/affectors/spritegoal.qml
diff --git a/examples/declarative/particles/affectors/turbulence.qml b/examples/qml/particles/affectors/turbulence.qml
index f3ad13431f..f3ad13431f 100644
--- a/examples/declarative/particles/affectors/turbulence.qml
+++ b/examples/qml/particles/affectors/turbulence.qml
diff --git a/examples/declarative/particles/affectors/wander.qml b/examples/qml/particles/affectors/wander.qml
index 31a0b4a796..31a0b4a796 100644
--- a/examples/declarative/particles/affectors/wander.qml
+++ b/examples/qml/particles/affectors/wander.qml
diff --git a/examples/declarative/particles/customparticle/blurparticles.qml b/examples/qml/particles/customparticle/blurparticles.qml
index 3d72425655..3d72425655 100644
--- a/examples/declarative/particles/customparticle/blurparticles.qml
+++ b/examples/qml/particles/customparticle/blurparticles.qml
diff --git a/examples/declarative/particles/customparticle/fragmentshader.qml b/examples/qml/particles/customparticle/fragmentshader.qml
index 34acb1bd7c..34acb1bd7c 100644
--- a/examples/declarative/particles/customparticle/fragmentshader.qml
+++ b/examples/qml/particles/customparticle/fragmentshader.qml
diff --git a/examples/declarative/particles/customparticle/imagecolors.qml b/examples/qml/particles/customparticle/imagecolors.qml
index 94e5123a0c..94e5123a0c 100644
--- a/examples/declarative/particles/customparticle/imagecolors.qml
+++ b/examples/qml/particles/customparticle/imagecolors.qml
diff --git a/examples/declarative/particles/emitters/burstandpulse.qml b/examples/qml/particles/emitters/burstandpulse.qml
index 1b1c2a60c9..1b1c2a60c9 100644
--- a/examples/declarative/particles/emitters/burstandpulse.qml
+++ b/examples/qml/particles/emitters/burstandpulse.qml
diff --git a/examples/declarative/particles/emitters/customemitter.qml b/examples/qml/particles/emitters/customemitter.qml
index 757c836106..757c836106 100644
--- a/examples/declarative/particles/emitters/customemitter.qml
+++ b/examples/qml/particles/emitters/customemitter.qml
diff --git a/examples/declarative/particles/emitters/emitmask.qml b/examples/qml/particles/emitters/emitmask.qml
index 9c02f6a213..9c02f6a213 100644
--- a/examples/declarative/particles/emitters/emitmask.qml
+++ b/examples/qml/particles/emitters/emitmask.qml
diff --git a/examples/declarative/particles/emitters/maximumemitted.qml b/examples/qml/particles/emitters/maximumemitted.qml
index 6dbdf8db61..6dbdf8db61 100644
--- a/examples/declarative/particles/emitters/maximumemitted.qml
+++ b/examples/qml/particles/emitters/maximumemitted.qml
diff --git a/examples/declarative/particles/emitters/shapeanddirection.qml b/examples/qml/particles/emitters/shapeanddirection.qml
index 43623427b6..43623427b6 100644
--- a/examples/declarative/particles/emitters/shapeanddirection.qml
+++ b/examples/qml/particles/emitters/shapeanddirection.qml
diff --git a/examples/declarative/particles/emitters/timedgroupchanges.qml b/examples/qml/particles/emitters/timedgroupchanges.qml
index 699e7eb066..699e7eb066 100644
--- a/examples/declarative/particles/emitters/timedgroupchanges.qml
+++ b/examples/qml/particles/emitters/timedgroupchanges.qml
diff --git a/examples/declarative/particles/emitters/trailemitter.qml b/examples/qml/particles/emitters/trailemitter.qml
index e896329ca1..e896329ca1 100644
--- a/examples/declarative/particles/emitters/trailemitter.qml
+++ b/examples/qml/particles/emitters/trailemitter.qml
diff --git a/examples/declarative/particles/emitters/velocityfrommotion.qml b/examples/qml/particles/emitters/velocityfrommotion.qml
index 7ad2b4d6c4..7ad2b4d6c4 100644
--- a/examples/declarative/particles/emitters/velocityfrommotion.qml
+++ b/examples/qml/particles/emitters/velocityfrommotion.qml
diff --git a/examples/declarative/particles/exampleslauncher/content/Button.qml b/examples/qml/particles/exampleslauncher/content/Button.qml
index e51a9be003..e51a9be003 100644
--- a/examples/declarative/particles/exampleslauncher/content/Button.qml
+++ b/examples/qml/particles/exampleslauncher/content/Button.qml
diff --git a/examples/declarative/particles/exampleslauncher/content/Shell.qml b/examples/qml/particles/exampleslauncher/content/Shell.qml
index afab77485f..afab77485f 100644
--- a/examples/declarative/particles/exampleslauncher/content/Shell.qml
+++ b/examples/qml/particles/exampleslauncher/content/Shell.qml
diff --git a/examples/declarative/particles/exampleslauncher/content/launcher.js b/examples/qml/particles/exampleslauncher/content/launcher.js
index a296dbd6a6..a296dbd6a6 100644
--- a/examples/declarative/particles/exampleslauncher/content/launcher.js
+++ b/examples/qml/particles/exampleslauncher/content/launcher.js
diff --git a/examples/declarative/particles/exampleslauncher/exampleslauncher.qml b/examples/qml/particles/exampleslauncher/exampleslauncher.qml
index 22914343ba..22914343ba 100644
--- a/examples/declarative/particles/exampleslauncher/exampleslauncher.qml
+++ b/examples/qml/particles/exampleslauncher/exampleslauncher.qml
diff --git a/examples/declarative/particles/imageparticle/allatonce.qml b/examples/qml/particles/imageparticle/allatonce.qml
index fbc634ec9a..fbc634ec9a 100644
--- a/examples/declarative/particles/imageparticle/allatonce.qml
+++ b/examples/qml/particles/imageparticle/allatonce.qml
diff --git a/examples/declarative/particles/imageparticle/colored.qml b/examples/qml/particles/imageparticle/colored.qml
index ac760b6219..ac760b6219 100644
--- a/examples/declarative/particles/imageparticle/colored.qml
+++ b/examples/qml/particles/imageparticle/colored.qml
diff --git a/examples/declarative/particles/imageparticle/colortable.qml b/examples/qml/particles/imageparticle/colortable.qml
index 623029dae0..623029dae0 100644
--- a/examples/declarative/particles/imageparticle/colortable.qml
+++ b/examples/qml/particles/imageparticle/colortable.qml
diff --git a/examples/declarative/particles/imageparticle/deformation.qml b/examples/qml/particles/imageparticle/deformation.qml
index e282927e78..e282927e78 100644
--- a/examples/declarative/particles/imageparticle/deformation.qml
+++ b/examples/qml/particles/imageparticle/deformation.qml
diff --git a/examples/declarative/particles/imageparticle/rotation.qml b/examples/qml/particles/imageparticle/rotation.qml
index 3a75c379ed..3a75c379ed 100644
--- a/examples/declarative/particles/imageparticle/rotation.qml
+++ b/examples/qml/particles/imageparticle/rotation.qml
diff --git a/examples/declarative/particles/imageparticle/sharing.qml b/examples/qml/particles/imageparticle/sharing.qml
index 27e08322d9..27e08322d9 100644
--- a/examples/declarative/particles/imageparticle/sharing.qml
+++ b/examples/qml/particles/imageparticle/sharing.qml
diff --git a/examples/declarative/particles/imageparticle/sprites.qml b/examples/qml/particles/imageparticle/sprites.qml
index 0fe4f31ea3..0fe4f31ea3 100644
--- a/examples/declarative/particles/imageparticle/sprites.qml
+++ b/examples/qml/particles/imageparticle/sprites.qml
diff --git a/examples/declarative/particles/images/_explo.png b/examples/qml/particles/images/_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/declarative/particles/images/_explo.png
+++ b/examples/qml/particles/images/_explo.png
diff --git a/examples/declarative/particles/images/backgroundLeaves.jpg b/examples/qml/particles/images/backgroundLeaves.jpg
index 08be16751d..08be16751d 100755
--- a/examples/declarative/particles/images/backgroundLeaves.jpg
+++ b/examples/qml/particles/images/backgroundLeaves.jpg
diff --git a/examples/declarative/particles/images/bear_tiles.png b/examples/qml/particles/images/bear_tiles.png
index 6bbb2a9b6d..6bbb2a9b6d 100644
--- a/examples/declarative/particles/images/bear_tiles.png
+++ b/examples/qml/particles/images/bear_tiles.png
diff --git a/examples/declarative/particles/images/candle.png b/examples/qml/particles/images/candle.png
index 8fa3193719..8fa3193719 100644
--- a/examples/declarative/particles/images/candle.png
+++ b/examples/qml/particles/images/candle.png
diff --git a/examples/declarative/particles/images/colortable.png b/examples/qml/particles/images/colortable.png
index a62ceeb4a0..a62ceeb4a0 100644
--- a/examples/declarative/particles/images/colortable.png
+++ b/examples/qml/particles/images/colortable.png
diff --git a/examples/declarative/particles/images/finalfrontier.png b/examples/qml/particles/images/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/declarative/particles/images/finalfrontier.png
+++ b/examples/qml/particles/images/finalfrontier.png
diff --git a/examples/declarative/particles/images/flower.png b/examples/qml/particles/images/flower.png
index b5c606210e..b5c606210e 100644
--- a/examples/declarative/particles/images/flower.png
+++ b/examples/qml/particles/images/flower.png
diff --git a/examples/declarative/particles/images/launcherIcons/allatonce.png b/examples/qml/particles/images/launcherIcons/allatonce.png
index b61d2d50d8..b61d2d50d8 100644
--- a/examples/declarative/particles/images/launcherIcons/allatonce.png
+++ b/examples/qml/particles/images/launcherIcons/allatonce.png
diff --git a/examples/declarative/particles/images/launcherIcons/attractor.png b/examples/qml/particles/images/launcherIcons/attractor.png
index 4bd8040c3b..4bd8040c3b 100644
--- a/examples/declarative/particles/images/launcherIcons/attractor.png
+++ b/examples/qml/particles/images/launcherIcons/attractor.png
diff --git a/examples/declarative/particles/images/launcherIcons/blurparticles.png b/examples/qml/particles/images/launcherIcons/blurparticles.png
index 4337f979cb..4337f979cb 100644
--- a/examples/declarative/particles/images/launcherIcons/blurparticles.png
+++ b/examples/qml/particles/images/launcherIcons/blurparticles.png
diff --git a/examples/declarative/particles/images/launcherIcons/close.png b/examples/qml/particles/images/launcherIcons/close.png
index c37714ee8f..c37714ee8f 100644
--- a/examples/declarative/particles/images/launcherIcons/close.png
+++ b/examples/qml/particles/images/launcherIcons/close.png
diff --git a/examples/declarative/particles/images/launcherIcons/colortable.png b/examples/qml/particles/images/launcherIcons/colortable.png
index 8841ea30f9..8841ea30f9 100644
--- a/examples/declarative/particles/images/launcherIcons/colortable.png
+++ b/examples/qml/particles/images/launcherIcons/colortable.png
diff --git a/examples/declarative/particles/images/launcherIcons/customaffector.png b/examples/qml/particles/images/launcherIcons/customaffector.png
index d02e7918fa..d02e7918fa 100644
--- a/examples/declarative/particles/images/launcherIcons/customaffector.png
+++ b/examples/qml/particles/images/launcherIcons/customaffector.png
diff --git a/examples/declarative/particles/images/launcherIcons/customemitter.png b/examples/qml/particles/images/launcherIcons/customemitter.png
index 6d492573d1..6d492573d1 100644
--- a/examples/declarative/particles/images/launcherIcons/customemitter.png
+++ b/examples/qml/particles/images/launcherIcons/customemitter.png
diff --git a/examples/declarative/particles/images/launcherIcons/deformation.png b/examples/qml/particles/images/launcherIcons/deformation.png
index d1b722df01..d1b722df01 100644
--- a/examples/declarative/particles/images/launcherIcons/deformation.png
+++ b/examples/qml/particles/images/launcherIcons/deformation.png
diff --git a/examples/declarative/particles/images/launcherIcons/delegates.png b/examples/qml/particles/images/launcherIcons/delegates.png
index 929414cd0e..929414cd0e 100644
--- a/examples/declarative/particles/images/launcherIcons/delegates.png
+++ b/examples/qml/particles/images/launcherIcons/delegates.png
diff --git a/examples/declarative/particles/images/launcherIcons/dynamicemitters.png b/examples/qml/particles/images/launcherIcons/dynamicemitters.png
index 0cdef9d21e..0cdef9d21e 100644
--- a/examples/declarative/particles/images/launcherIcons/dynamicemitters.png
+++ b/examples/qml/particles/images/launcherIcons/dynamicemitters.png
diff --git a/examples/declarative/particles/images/launcherIcons/emitmask.png b/examples/qml/particles/images/launcherIcons/emitmask.png
index e943a4adb9..e943a4adb9 100644
--- a/examples/declarative/particles/images/launcherIcons/emitmask.png
+++ b/examples/qml/particles/images/launcherIcons/emitmask.png
diff --git a/examples/declarative/particles/images/launcherIcons/flickr.png b/examples/qml/particles/images/launcherIcons/flickr.png
index 4de2650280..4de2650280 100644
--- a/examples/declarative/particles/images/launcherIcons/flickr.png
+++ b/examples/qml/particles/images/launcherIcons/flickr.png
diff --git a/examples/declarative/particles/images/launcherIcons/fragmentshader.png b/examples/qml/particles/images/launcherIcons/fragmentshader.png
index 7c6de498d5..7c6de498d5 100644
--- a/examples/declarative/particles/images/launcherIcons/fragmentshader.png
+++ b/examples/qml/particles/images/launcherIcons/fragmentshader.png
diff --git a/examples/declarative/particles/images/launcherIcons/gridsplosion.png b/examples/qml/particles/images/launcherIcons/gridsplosion.png
index ec75453df6..ec75453df6 100644
--- a/examples/declarative/particles/images/launcherIcons/gridsplosion.png
+++ b/examples/qml/particles/images/launcherIcons/gridsplosion.png
diff --git a/examples/declarative/particles/images/launcherIcons/groupgoal.png b/examples/qml/particles/images/launcherIcons/groupgoal.png
index 69c6f64e54..69c6f64e54 100644
--- a/examples/declarative/particles/images/launcherIcons/groupgoal.png
+++ b/examples/qml/particles/images/launcherIcons/groupgoal.png
diff --git a/examples/declarative/particles/images/launcherIcons/imagecolors.png b/examples/qml/particles/images/launcherIcons/imagecolors.png
index 0ff13a346e..0ff13a346e 100644
--- a/examples/declarative/particles/images/launcherIcons/imagecolors.png
+++ b/examples/qml/particles/images/launcherIcons/imagecolors.png
diff --git a/examples/declarative/particles/images/launcherIcons/list.png b/examples/qml/particles/images/launcherIcons/list.png
index bc13263cff..bc13263cff 100644
--- a/examples/declarative/particles/images/launcherIcons/list.png
+++ b/examples/qml/particles/images/launcherIcons/list.png
diff --git a/examples/declarative/particles/images/launcherIcons/maximumemitted.png b/examples/qml/particles/images/launcherIcons/maximumemitted.png
index 4ef0435991..4ef0435991 100644
--- a/examples/declarative/particles/images/launcherIcons/maximumemitted.png
+++ b/examples/qml/particles/images/launcherIcons/maximumemitted.png
diff --git a/examples/declarative/particles/images/launcherIcons/multiplepainters.png b/examples/qml/particles/images/launcherIcons/multiplepainters.png
index a28e3c4f02..a28e3c4f02 100644
--- a/examples/declarative/particles/images/launcherIcons/multiplepainters.png
+++ b/examples/qml/particles/images/launcherIcons/multiplepainters.png
diff --git a/examples/declarative/particles/images/launcherIcons/package.png b/examples/qml/particles/images/launcherIcons/package.png
index eba8951c26..eba8951c26 100644
--- a/examples/declarative/particles/images/launcherIcons/package.png
+++ b/examples/qml/particles/images/launcherIcons/package.png
diff --git a/examples/declarative/particles/images/launcherIcons/particleview.png b/examples/qml/particles/images/launcherIcons/particleview.png
index a74f9a0340..a74f9a0340 100644
--- a/examples/declarative/particles/images/launcherIcons/particleview.png
+++ b/examples/qml/particles/images/launcherIcons/particleview.png
diff --git a/examples/declarative/particles/images/launcherIcons/plasmapatrol.png b/examples/qml/particles/images/launcherIcons/plasmapatrol.png
index fda852b420..fda852b420 100644
--- a/examples/declarative/particles/images/launcherIcons/plasmapatrol.png
+++ b/examples/qml/particles/images/launcherIcons/plasmapatrol.png
diff --git a/examples/declarative/particles/images/launcherIcons/remove.png b/examples/qml/particles/images/launcherIcons/remove.png
index c37714ee8f..c37714ee8f 100644
--- a/examples/declarative/particles/images/launcherIcons/remove.png
+++ b/examples/qml/particles/images/launcherIcons/remove.png
diff --git a/examples/declarative/particles/images/launcherIcons/rotation.png b/examples/qml/particles/images/launcherIcons/rotation.png
index 6a8dbea236..6a8dbea236 100644
--- a/examples/declarative/particles/images/launcherIcons/rotation.png
+++ b/examples/qml/particles/images/launcherIcons/rotation.png
diff --git a/examples/declarative/particles/images/launcherIcons/samegame.png b/examples/qml/particles/images/launcherIcons/samegame.png
index d00698264b..d00698264b 100644
--- a/examples/declarative/particles/images/launcherIcons/samegame.png
+++ b/examples/qml/particles/images/launcherIcons/samegame.png
diff --git a/examples/declarative/particles/images/launcherIcons/shapeanddirection.png b/examples/qml/particles/images/launcherIcons/shapeanddirection.png
index 9c1f910d0c..9c1f910d0c 100644
--- a/examples/declarative/particles/images/launcherIcons/shapeanddirection.png
+++ b/examples/qml/particles/images/launcherIcons/shapeanddirection.png
diff --git a/examples/declarative/particles/images/launcherIcons/spaceexplorer.png b/examples/qml/particles/images/launcherIcons/spaceexplorer.png
index 770584a0fa..770584a0fa 100644
--- a/examples/declarative/particles/images/launcherIcons/spaceexplorer.png
+++ b/examples/qml/particles/images/launcherIcons/spaceexplorer.png
diff --git a/examples/declarative/particles/images/launcherIcons/spritegoal.png b/examples/qml/particles/images/launcherIcons/spritegoal.png
index 77480c6f09..77480c6f09 100644
--- a/examples/declarative/particles/images/launcherIcons/spritegoal.png
+++ b/examples/qml/particles/images/launcherIcons/spritegoal.png
diff --git a/examples/declarative/particles/images/launcherIcons/sprites.png b/examples/qml/particles/images/launcherIcons/sprites.png
index 144216ac7c..144216ac7c 100644
--- a/examples/declarative/particles/images/launcherIcons/sprites.png
+++ b/examples/qml/particles/images/launcherIcons/sprites.png
diff --git a/examples/declarative/particles/images/launcherIcons/spritevariedparticles.png b/examples/qml/particles/images/launcherIcons/spritevariedparticles.png
index 495bb6beee..495bb6beee 100644
--- a/examples/declarative/particles/images/launcherIcons/spritevariedparticles.png
+++ b/examples/qml/particles/images/launcherIcons/spritevariedparticles.png
diff --git a/examples/declarative/particles/images/launcherIcons/startstop.png b/examples/qml/particles/images/launcherIcons/startstop.png
index 0ff53196a6..0ff53196a6 100644
--- a/examples/declarative/particles/images/launcherIcons/startstop.png
+++ b/examples/qml/particles/images/launcherIcons/startstop.png
diff --git a/examples/declarative/particles/images/launcherIcons/timedgroupchanges.png b/examples/qml/particles/images/launcherIcons/timedgroupchanges.png
index ec9f826495..ec9f826495 100644
--- a/examples/declarative/particles/images/launcherIcons/timedgroupchanges.png
+++ b/examples/qml/particles/images/launcherIcons/timedgroupchanges.png
diff --git a/examples/declarative/particles/images/launcherIcons/trailemitter.png b/examples/qml/particles/images/launcherIcons/trailemitter.png
index 39acf8b40d..39acf8b40d 100644
--- a/examples/declarative/particles/images/launcherIcons/trailemitter.png
+++ b/examples/qml/particles/images/launcherIcons/trailemitter.png
diff --git a/examples/declarative/particles/images/launcherIcons/trails.png b/examples/qml/particles/images/launcherIcons/trails.png
index 0337ebcfd8..0337ebcfd8 100644
--- a/examples/declarative/particles/images/launcherIcons/trails.png
+++ b/examples/qml/particles/images/launcherIcons/trails.png
diff --git a/examples/declarative/particles/images/launcherIcons/turbulence.png b/examples/qml/particles/images/launcherIcons/turbulence.png
index 2b9446ea90..2b9446ea90 100644
--- a/examples/declarative/particles/images/launcherIcons/turbulence.png
+++ b/examples/qml/particles/images/launcherIcons/turbulence.png
diff --git a/examples/declarative/particles/images/launcherIcons/velocityfrommotion.png b/examples/qml/particles/images/launcherIcons/velocityfrommotion.png
index 79baa08293..79baa08293 100644
--- a/examples/declarative/particles/images/launcherIcons/velocityfrommotion.png
+++ b/examples/qml/particles/images/launcherIcons/velocityfrommotion.png
diff --git a/examples/declarative/particles/images/launcherIcons/wander.png b/examples/qml/particles/images/launcherIcons/wander.png
index d98e14b8ae..d98e14b8ae 100644
--- a/examples/declarative/particles/images/launcherIcons/wander.png
+++ b/examples/qml/particles/images/launcherIcons/wander.png
diff --git a/examples/declarative/particles/images/matchmask.png b/examples/qml/particles/images/matchmask.png
index e575875c55..e575875c55 100644
--- a/examples/declarative/particles/images/matchmask.png
+++ b/examples/qml/particles/images/matchmask.png
diff --git a/examples/declarative/particles/images/meteor.png b/examples/qml/particles/images/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/declarative/particles/images/meteor.png
+++ b/examples/qml/particles/images/meteor.png
diff --git a/examples/declarative/particles/images/meteor_explo.png b/examples/qml/particles/images/meteor_explo.png
index e659bfe2cf..e659bfe2cf 100644
--- a/examples/declarative/particles/images/meteor_explo.png
+++ b/examples/qml/particles/images/meteor_explo.png
diff --git a/examples/declarative/particles/images/meteors.png b/examples/qml/particles/images/meteors.png
index bada8a1407..bada8a1407 100644
--- a/examples/declarative/particles/images/meteors.png
+++ b/examples/qml/particles/images/meteors.png
diff --git a/examples/declarative/particles/images/nullRock.png b/examples/qml/particles/images/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/declarative/particles/images/nullRock.png
+++ b/examples/qml/particles/images/nullRock.png
diff --git a/examples/declarative/particles/images/particle.png b/examples/qml/particles/images/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/particles/images/particle.png
+++ b/examples/qml/particles/images/particle.png
diff --git a/examples/declarative/particles/images/particle2.png b/examples/qml/particles/images/particle2.png
index 36349c6c6e..36349c6c6e 100644
--- a/examples/declarative/particles/images/particle2.png
+++ b/examples/qml/particles/images/particle2.png
diff --git a/examples/declarative/particles/images/particle3.png b/examples/qml/particles/images/particle3.png
index 905d8f37b8..905d8f37b8 100644
--- a/examples/declarative/particles/images/particle3.png
+++ b/examples/qml/particles/images/particle3.png
diff --git a/examples/declarative/particles/images/particle4.png b/examples/qml/particles/images/particle4.png
index bc95b703c1..bc95b703c1 100644
--- a/examples/declarative/particles/images/particle4.png
+++ b/examples/qml/particles/images/particle4.png
diff --git a/examples/declarative/particles/images/particleA.png b/examples/qml/particles/images/particleA.png
index c63acdee1f..c63acdee1f 100644
--- a/examples/declarative/particles/images/particleA.png
+++ b/examples/qml/particles/images/particleA.png
diff --git a/examples/declarative/particles/images/portal_bg.png b/examples/qml/particles/images/portal_bg.png
index 3c59eeabb9..3c59eeabb9 100644
--- a/examples/declarative/particles/images/portal_bg.png
+++ b/examples/qml/particles/images/portal_bg.png
diff --git a/examples/declarative/particles/images/realLeaf1.png b/examples/qml/particles/images/realLeaf1.png
index 6cabf29efd..6cabf29efd 100644
--- a/examples/declarative/particles/images/realLeaf1.png
+++ b/examples/qml/particles/images/realLeaf1.png
diff --git a/examples/declarative/particles/images/realLeaf2.png b/examples/qml/particles/images/realLeaf2.png
index bfeca861d5..bfeca861d5 100644
--- a/examples/declarative/particles/images/realLeaf2.png
+++ b/examples/qml/particles/images/realLeaf2.png
diff --git a/examples/declarative/particles/images/realLeaf3.png b/examples/qml/particles/images/realLeaf3.png
index b1071e862b..b1071e862b 100644
--- a/examples/declarative/particles/images/realLeaf3.png
+++ b/examples/qml/particles/images/realLeaf3.png
diff --git a/examples/declarative/particles/images/realLeaf4.png b/examples/qml/particles/images/realLeaf4.png
index d61d53d10e..d61d53d10e 100644
--- a/examples/declarative/particles/images/realLeaf4.png
+++ b/examples/qml/particles/images/realLeaf4.png
diff --git a/examples/declarative/particles/images/rocket.png b/examples/qml/particles/images/rocket.png
index a171610b03..a171610b03 100644
--- a/examples/declarative/particles/images/rocket.png
+++ b/examples/qml/particles/images/rocket.png
diff --git a/examples/declarative/particles/images/rocket2.png b/examples/qml/particles/images/rocket2.png
index 7110f8fdc6..7110f8fdc6 100644
--- a/examples/declarative/particles/images/rocket2.png
+++ b/examples/qml/particles/images/rocket2.png
diff --git a/examples/declarative/particles/images/sizeInOut.png b/examples/qml/particles/images/sizeInOut.png
index 0a306ea21a..0a306ea21a 100644
--- a/examples/declarative/particles/images/sizeInOut.png
+++ b/examples/qml/particles/images/sizeInOut.png
diff --git a/examples/declarative/particles/images/snowflake.png b/examples/qml/particles/images/snowflake.png
index 490887a82f..490887a82f 100644
--- a/examples/declarative/particles/images/snowflake.png
+++ b/examples/qml/particles/images/snowflake.png
diff --git a/examples/declarative/particles/images/sparkleSize.png b/examples/qml/particles/images/sparkleSize.png
index 752056541b..752056541b 100644
--- a/examples/declarative/particles/images/sparkleSize.png
+++ b/examples/qml/particles/images/sparkleSize.png
diff --git a/examples/declarative/particles/images/star.png b/examples/qml/particles/images/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/declarative/particles/images/star.png
+++ b/examples/qml/particles/images/star.png
diff --git a/examples/declarative/particles/images/starfish_0.png b/examples/qml/particles/images/starfish_0.png
index 8747f0236e..8747f0236e 100644
--- a/examples/declarative/particles/images/starfish_0.png
+++ b/examples/qml/particles/images/starfish_0.png
diff --git a/examples/declarative/particles/images/starfish_1.png b/examples/qml/particles/images/starfish_1.png
index 1f3f159d5e..1f3f159d5e 100644
--- a/examples/declarative/particles/images/starfish_1.png
+++ b/examples/qml/particles/images/starfish_1.png
diff --git a/examples/declarative/particles/images/starfish_2.png b/examples/qml/particles/images/starfish_2.png
index c6c7e5a676..c6c7e5a676 100644
--- a/examples/declarative/particles/images/starfish_2.png
+++ b/examples/qml/particles/images/starfish_2.png
diff --git a/examples/declarative/particles/images/starfish_3.png b/examples/qml/particles/images/starfish_3.png
index 307a89f815..307a89f815 100644
--- a/examples/declarative/particles/images/starfish_3.png
+++ b/examples/qml/particles/images/starfish_3.png
diff --git a/examples/declarative/particles/images/starfish_4.png b/examples/qml/particles/images/starfish_4.png
index d61c26545a..d61c26545a 100644
--- a/examples/declarative/particles/images/starfish_4.png
+++ b/examples/qml/particles/images/starfish_4.png
diff --git a/examples/declarative/particles/images/starfish_mask.png b/examples/qml/particles/images/starfish_mask.png
index 2ef74f902b..2ef74f902b 100644
--- a/examples/declarative/particles/images/starfish_mask.png
+++ b/examples/qml/particles/images/starfish_mask.png
diff --git a/examples/declarative/particles/itemparticle/content/Delegate.qml b/examples/qml/particles/itemparticle/content/Delegate.qml
index 97c7840cb4..97c7840cb4 100644
--- a/examples/declarative/particles/itemparticle/content/Delegate.qml
+++ b/examples/qml/particles/itemparticle/content/Delegate.qml
diff --git a/examples/declarative/particles/itemparticle/content/Delegate2.qml b/examples/qml/particles/itemparticle/content/Delegate2.qml
index cf60d43dc2..cf60d43dc2 100644
--- a/examples/declarative/particles/itemparticle/content/Delegate2.qml
+++ b/examples/qml/particles/itemparticle/content/Delegate2.qml
diff --git a/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml b/examples/qml/particles/itemparticle/content/ExpandingDelegate.qml
index 87f723d3f7..87f723d3f7 100644
--- a/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml
+++ b/examples/qml/particles/itemparticle/content/ExpandingDelegate.qml
diff --git a/examples/declarative/particles/itemparticle/content/RssModel.qml b/examples/qml/particles/itemparticle/content/RssModel.qml
index 46027600b3..46027600b3 100644
--- a/examples/declarative/particles/itemparticle/content/RssModel.qml
+++ b/examples/qml/particles/itemparticle/content/RssModel.qml
diff --git a/examples/declarative/particles/itemparticle/content/bubble.png b/examples/qml/particles/itemparticle/content/bubble.png
index c7f479e9e3..c7f479e9e3 100644
--- a/examples/declarative/particles/itemparticle/content/bubble.png
+++ b/examples/qml/particles/itemparticle/content/bubble.png
diff --git a/examples/declarative/particles/itemparticle/content/script.js b/examples/qml/particles/itemparticle/content/script.js
index e8ef93a847..e8ef93a847 100644
--- a/examples/declarative/particles/itemparticle/content/script.js
+++ b/examples/qml/particles/itemparticle/content/script.js
diff --git a/examples/declarative/particles/itemparticle/delegates.qml b/examples/qml/particles/itemparticle/delegates.qml
index 58734d320a..58734d320a 100644
--- a/examples/declarative/particles/itemparticle/delegates.qml
+++ b/examples/qml/particles/itemparticle/delegates.qml
diff --git a/examples/declarative/particles/itemparticle/particleview.qml b/examples/qml/particles/itemparticle/particleview.qml
index 774539a958..774539a958 100644
--- a/examples/declarative/particles/itemparticle/particleview.qml
+++ b/examples/qml/particles/itemparticle/particleview.qml
diff --git a/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject b/examples/qml/particles/plasmapatrol/PlasmaPatrol.qmlproject
index 548295243d..548295243d 100644
--- a/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
+++ b/examples/qml/particles/plasmapatrol/PlasmaPatrol.qmlproject
diff --git a/examples/declarative/particles/plasmapatrol/TODO b/examples/qml/particles/plasmapatrol/TODO
index ef9d21a73d..ef9d21a73d 100644
--- a/examples/declarative/particles/plasmapatrol/TODO
+++ b/examples/qml/particles/plasmapatrol/TODO
diff --git a/examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml b/examples/qml/particles/plasmapatrol/content/BlasterHardpoint.qml
index 4ac30d0202..10c50d43c8 100644
--- a/examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml
+++ b/examples/qml/particles/plasmapatrol/content/BlasterHardpoint.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/examples/declarative/particles/plasmapatrol/content/Button.qml b/examples/qml/particles/plasmapatrol/content/Button.qml
index 405b99304f..992be295fc 100644
--- a/examples/declarative/particles/plasmapatrol/content/Button.qml
+++ b/examples/qml/particles/plasmapatrol/content/Button.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/examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml b/examples/qml/particles/plasmapatrol/content/CannonHardpoint.qml
index c4aa412760..48eb9d171a 100644
--- a/examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml
+++ b/examples/qml/particles/plasmapatrol/content/CannonHardpoint.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/examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml b/examples/qml/particles/plasmapatrol/content/ChoiceBox.qml
index a678bc9dd4..6e21101f2e 100644
--- a/examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml
+++ b/examples/qml/particles/plasmapatrol/content/ChoiceBox.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/examples/declarative/particles/plasmapatrol/content/Cruiser.qml b/examples/qml/particles/plasmapatrol/content/Cruiser.qml
index c689879dce..c469eb46d2 100644
--- a/examples/declarative/particles/plasmapatrol/content/Cruiser.qml
+++ b/examples/qml/particles/plasmapatrol/content/Cruiser.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/examples/declarative/particles/plasmapatrol/content/Frigate.qml b/examples/qml/particles/plasmapatrol/content/Frigate.qml
index de099bed72..92c63b87d1 100644
--- a/examples/declarative/particles/plasmapatrol/content/Frigate.qml
+++ b/examples/qml/particles/plasmapatrol/content/Frigate.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/examples/declarative/particles/plasmapatrol/content/Hardpoint.qml b/examples/qml/particles/plasmapatrol/content/Hardpoint.qml
index 5c7fb5521b..9e6057057d 100644
--- a/examples/declarative/particles/plasmapatrol/content/Hardpoint.qml
+++ b/examples/qml/particles/plasmapatrol/content/Hardpoint.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/examples/declarative/particles/plasmapatrol/content/HelpScreens.qml b/examples/qml/particles/plasmapatrol/content/HelpScreens.qml
index 9297f86f31..db70c6ee90 100644
--- a/examples/declarative/particles/plasmapatrol/content/HelpScreens.qml
+++ b/examples/qml/particles/plasmapatrol/content/HelpScreens.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/examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml b/examples/qml/particles/plasmapatrol/content/LaserHardpoint.qml
index 87ac3e9e62..a7baed604b 100644
--- a/examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml
+++ b/examples/qml/particles/plasmapatrol/content/LaserHardpoint.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/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/qml/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
index 95d4bcd2b9..87809965b2 100644
--- a/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
+++ b/examples/qml/particles/plasmapatrol/content/PlasmaPatrolParticles.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/examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml b/examples/qml/particles/plasmapatrol/content/SequentialLoader.qml
index eaef87fe57..3707759ce3 100644
--- a/examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml
+++ b/examples/qml/particles/plasmapatrol/content/SequentialLoader.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/examples/declarative/particles/plasmapatrol/content/Ship.qml b/examples/qml/particles/plasmapatrol/content/Ship.qml
index a928cd2a2e..bd023b1dc2 100644
--- a/examples/declarative/particles/plasmapatrol/content/Ship.qml
+++ b/examples/qml/particles/plasmapatrol/content/Ship.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/examples/declarative/particles/plasmapatrol/content/Sloop.qml b/examples/qml/particles/plasmapatrol/content/Sloop.qml
index c6b1183162..3bc58a28b0 100644
--- a/examples/declarative/particles/plasmapatrol/content/Sloop.qml
+++ b/examples/qml/particles/plasmapatrol/content/Sloop.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/examples/declarative/particles/plasmapatrol/content/pics/TitleText.png b/examples/qml/particles/plasmapatrol/content/pics/TitleText.png
index dc3acebe39..dc3acebe39 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/TitleText.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/TitleText.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png b/examples/qml/particles/plasmapatrol/content/pics/blur-circle2.png
index f7c9f3e98e..f7c9f3e98e 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/blur-circle2.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png b/examples/qml/particles/plasmapatrol/content/pics/blur-circle3.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/blur-circle3.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png b/examples/qml/particles/plasmapatrol/content/pics/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/finalfrontier.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/meteor.png b/examples/qml/particles/plasmapatrol/content/pics/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/meteor.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/meteor.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png b/examples/qml/particles/plasmapatrol/content/pics/meteor_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/meteor_explo.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/nullRock.png b/examples/qml/particles/plasmapatrol/content/pics/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/nullRock.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/nullRock.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/particle.png b/examples/qml/particles/plasmapatrol/content/pics/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/particle.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/particle.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/star.png b/examples/qml/particles/plasmapatrol/content/pics/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/star.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/star.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/star2.png b/examples/qml/particles/plasmapatrol/content/pics/star2.png
index bb55c44788..bb55c44788 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/star2.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/star2.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/star3.png b/examples/qml/particles/plasmapatrol/content/pics/star3.png
index 636a25f480..636a25f480 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/star3.png
+++ b/examples/qml/particles/plasmapatrol/content/pics/star3.png
diff --git a/examples/declarative/particles/plasmapatrol/plasmapatrol.qml b/examples/qml/particles/plasmapatrol/plasmapatrol.qml
index 45f81c7222..b14ac6385b 100644
--- a/examples/declarative/particles/plasmapatrol/plasmapatrol.qml
+++ b/examples/qml/particles/plasmapatrol/plasmapatrol.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/examples/declarative/particles/simple/dynamiccomparison.qml b/examples/qml/particles/simple/dynamiccomparison.qml
index a7cdb9b32a..a7cdb9b32a 100644
--- a/examples/declarative/particles/simple/dynamiccomparison.qml
+++ b/examples/qml/particles/simple/dynamiccomparison.qml
diff --git a/examples/declarative/particles/simple/dynamicemitters.qml b/examples/qml/particles/simple/dynamicemitters.qml
index 4431ebe82e..4431ebe82e 100644
--- a/examples/declarative/particles/simple/dynamicemitters.qml
+++ b/examples/qml/particles/simple/dynamicemitters.qml
diff --git a/examples/declarative/particles/simple/multiplepainters.qml b/examples/qml/particles/simple/multiplepainters.qml
index c1b85caa2d..c1b85caa2d 100644
--- a/examples/declarative/particles/simple/multiplepainters.qml
+++ b/examples/qml/particles/simple/multiplepainters.qml
diff --git a/examples/declarative/particles/simple/startstop.qml b/examples/qml/particles/simple/startstop.qml
index 62105b28a0..62105b28a0 100644
--- a/examples/declarative/particles/simple/startstop.qml
+++ b/examples/qml/particles/simple/startstop.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index f183c4b2a0..164f47faa9 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/AlbumDelegate.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/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
index 2b1a75f369..867c268399 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/BusyIndicator.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/examples/declarative/photoviewer/PhotoViewerCore/Button.qml b/examples/qml/photoviewer/PhotoViewerCore/Button.qml
index fcce969fbd..8f4177c097 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/Button.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/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/qml/photoviewer/PhotoViewerCore/EditableButton.qml
index 5d845938c7..435ad2644f 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/EditableButton.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/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index b972c938eb..5d4e5aee5d 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/PhotoDelegate.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/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
index 43c936e342..58beef57f3 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/ProgressBar.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/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/examples/qml/photoviewer/PhotoViewerCore/RssModel.qml
index ab818924ac..1598977bb1 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/RssModel.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/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml b/examples/qml/photoviewer/PhotoViewerCore/Tag.qml
index 2b546a3ac6..ed4a248a7b 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml
+++ b/examples/qml/photoviewer/PhotoViewerCore/Tag.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/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/qml/photoviewer/PhotoViewerCore/images/box-shadow.png
index 431af8545d..431af8545d 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png
+++ b/examples/qml/photoviewer/PhotoViewerCore/images/box-shadow.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png b/examples/qml/photoviewer/PhotoViewerCore/images/busy.png
index 664c2b1491..664c2b1491 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png
+++ b/examples/qml/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/qml/photoviewer/PhotoViewerCore/images/cardboard.png
index 1847ab528d..1847ab528d 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png
+++ b/examples/qml/photoviewer/PhotoViewerCore/images/cardboard.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/qmldir b/examples/qml/photoviewer/PhotoViewerCore/qmldir
index d3c247f21a..d3c247f21a 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/qmldir
+++ b/examples/qml/photoviewer/PhotoViewerCore/qmldir
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/script/script.js b/examples/qml/photoviewer/PhotoViewerCore/script/script.js
index e8ef93a847..e8ef93a847 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/script/script.js
+++ b/examples/qml/photoviewer/PhotoViewerCore/script/script.js
diff --git a/examples/declarative/photoviewer/i18n/base.ts b/examples/qml/photoviewer/i18n/base.ts
index 1accfd2f90..1accfd2f90 100644
--- a/examples/declarative/photoviewer/i18n/base.ts
+++ b/examples/qml/photoviewer/i18n/base.ts
diff --git a/examples/declarative/photoviewer/i18n/qml_fr.qm b/examples/qml/photoviewer/i18n/qml_fr.qm
index c24fcbc46c..c24fcbc46c 100644
--- a/examples/declarative/photoviewer/i18n/qml_fr.qm
+++ b/examples/qml/photoviewer/i18n/qml_fr.qm
diff --git a/examples/declarative/photoviewer/i18n/qml_fr.ts b/examples/qml/photoviewer/i18n/qml_fr.ts
index 9f892db616..9f892db616 100644
--- a/examples/declarative/photoviewer/i18n/qml_fr.ts
+++ b/examples/qml/photoviewer/i18n/qml_fr.ts
diff --git a/examples/declarative/photoviewer/photoviewer.qml b/examples/qml/photoviewer/photoviewer.qml
index 918438832b..208720b9e6 100644
--- a/examples/declarative/photoviewer/photoviewer.qml
+++ b/examples/qml/photoviewer/photoviewer.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/examples/declarative/photoviewer/photoviewer.qmlproject b/examples/qml/photoviewer/photoviewer.qmlproject
index 600bdb10f4..600bdb10f4 100644
--- a/examples/declarative/photoviewer/photoviewer.qmlproject
+++ b/examples/qml/photoviewer/photoviewer.qmlproject
diff --git a/examples/declarative/positioners/content/Button.qml b/examples/qml/positioners/content/Button.qml
index ee3aa9057e..ee3aa9057e 100644
--- a/examples/declarative/positioners/content/Button.qml
+++ b/examples/qml/positioners/content/Button.qml
diff --git a/examples/declarative/positioners/content/add.png b/examples/qml/positioners/content/add.png
index 1ee45423e3..1ee45423e3 100644
--- a/examples/declarative/positioners/content/add.png
+++ b/examples/qml/positioners/content/add.png
diff --git a/examples/declarative/positioners/content/del.png b/examples/qml/positioners/content/del.png
index 8d2eaed523..8d2eaed523 100644
--- a/examples/declarative/positioners/content/del.png
+++ b/examples/qml/positioners/content/del.png
diff --git a/examples/declarative/positioners/positioners-attachedproperties.qml b/examples/qml/positioners/positioners-attachedproperties.qml
index a05927f5ea..a05927f5ea 100644
--- a/examples/declarative/positioners/positioners-attachedproperties.qml
+++ b/examples/qml/positioners/positioners-attachedproperties.qml
diff --git a/examples/declarative/positioners/positioners.qml b/examples/qml/positioners/positioners.qml
index d9d16649ff..d9d16649ff 100644
--- a/examples/declarative/positioners/positioners.qml
+++ b/examples/qml/positioners/positioners.qml
diff --git a/examples/declarative/declarative.pro b/examples/qml/qml.pro
index 883c0afe2d..23d33bd653 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/qml/qml.pro
@@ -34,5 +34,5 @@ sources.files = \
    xml
 
 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml
 INSTALLS += sources
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml b/examples/qml/righttoleft/layoutdirection/layoutdirection.qml
index 0c65647d5b..0c65647d5b 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml
+++ b/examples/qml/righttoleft/layoutdirection/layoutdirection.qml
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject b/examples/qml/righttoleft/layoutdirection/layoutdirection.qmlproject
index 33cbb3c9e2..33cbb3c9e2 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject
+++ b/examples/qml/righttoleft/layoutdirection/layoutdirection.qmlproject
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml b/examples/qml/righttoleft/layoutmirroring/layoutmirroring.qml
index 5c4739bd57..5c4739bd57 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml
+++ b/examples/qml/righttoleft/layoutmirroring/layoutmirroring.qml
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject b/examples/qml/righttoleft/layoutmirroring/layoutmirroring.qmlproject
index 72bc04a8a9..72bc04a8a9 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject
+++ b/examples/qml/righttoleft/layoutmirroring/layoutmirroring.qmlproject
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qml b/examples/qml/righttoleft/textalignment/textalignment.qml
index ef5b97bb1a..ef5b97bb1a 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.qml
+++ b/examples/qml/righttoleft/textalignment/textalignment.qml
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qmlproject b/examples/qml/righttoleft/textalignment/textalignment.qmlproject
index e4b5061364..e4b5061364 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.qmlproject
+++ b/examples/qml/righttoleft/textalignment/textalignment.qmlproject
diff --git a/examples/declarative/rssnews/content/BusyIndicator.qml b/examples/qml/rssnews/content/BusyIndicator.qml
index b6264ead92..f1abd1119c 100644
--- a/examples/declarative/rssnews/content/BusyIndicator.qml
+++ b/examples/qml/rssnews/content/BusyIndicator.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/examples/declarative/rssnews/content/CategoryDelegate.qml b/examples/qml/rssnews/content/CategoryDelegate.qml
index 1a56184489..fe64238adb 100644
--- a/examples/declarative/rssnews/content/CategoryDelegate.qml
+++ b/examples/qml/rssnews/content/CategoryDelegate.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/examples/declarative/rssnews/content/NewsDelegate.qml b/examples/qml/rssnews/content/NewsDelegate.qml
index 84019a9179..59ab269d3b 100644
--- a/examples/declarative/rssnews/content/NewsDelegate.qml
+++ b/examples/qml/rssnews/content/NewsDelegate.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/examples/declarative/rssnews/content/RssFeeds.qml b/examples/qml/rssnews/content/RssFeeds.qml
index 278f05752c..ed58ef3852 100644
--- a/examples/declarative/rssnews/content/RssFeeds.qml
+++ b/examples/qml/rssnews/content/RssFeeds.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/examples/declarative/rssnews/content/ScrollBar.qml b/examples/qml/rssnews/content/ScrollBar.qml
index 4ca4132c6b..7b1a2ac3e5 100644
--- a/examples/declarative/rssnews/content/ScrollBar.qml
+++ b/examples/qml/rssnews/content/ScrollBar.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/examples/declarative/rssnews/content/images/busy.png b/examples/qml/rssnews/content/images/busy.png
index 664c2b1491..664c2b1491 100644
--- a/examples/declarative/rssnews/content/images/busy.png
+++ b/examples/qml/rssnews/content/images/busy.png
diff --git a/examples/declarative/rssnews/content/images/scrollbar.png b/examples/qml/rssnews/content/images/scrollbar.png
index 0228dcf9eb..0228dcf9eb 100644
--- a/examples/declarative/rssnews/content/images/scrollbar.png
+++ b/examples/qml/rssnews/content/images/scrollbar.png
diff --git a/examples/declarative/rssnews/rssnews.qml b/examples/qml/rssnews/rssnews.qml
index 491cefda07..d26b94b6d3 100644
--- a/examples/declarative/rssnews/rssnews.qml
+++ b/examples/qml/rssnews/rssnews.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/examples/declarative/rssnews/rssnews.qmlproject b/examples/qml/rssnews/rssnews.qmlproject
index 5becbdaed0..5becbdaed0 100644
--- a/examples/declarative/rssnews/rssnews.qmlproject
+++ b/examples/qml/rssnews/rssnews.qmlproject
diff --git a/examples/declarative/samegame/content/BoomBlock.qml b/examples/qml/samegame/content/BoomBlock.qml
index 47f86bd81b..a348368ae1 100644
--- a/examples/declarative/samegame/content/BoomBlock.qml
+++ b/examples/qml/samegame/content/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/examples/declarative/samegame/content/Button.qml b/examples/qml/samegame/content/Button.qml
index b305455c92..2d1a993226 100644
--- a/examples/declarative/samegame/content/Button.qml
+++ b/examples/qml/samegame/content/Button.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/examples/declarative/samegame/content/Dialog.qml b/examples/qml/samegame/content/Dialog.qml
index 80e5984bfe..c81580e6a5 100644
--- a/examples/declarative/samegame/content/Dialog.qml
+++ b/examples/qml/samegame/content/Dialog.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/examples/declarative/samegame/content/GameArea.qml b/examples/qml/samegame/content/GameArea.qml
index a43d55117a..3422582b21 100644
--- a/examples/declarative/samegame/content/GameArea.qml
+++ b/examples/qml/samegame/content/GameArea.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/examples/declarative/samegame/content/NameInputDialog.qml b/examples/qml/samegame/content/NameInputDialog.qml
index 602e69789a..7c3bfa274a 100644
--- a/examples/declarative/samegame/content/NameInputDialog.qml
+++ b/examples/qml/samegame/content/NameInputDialog.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/examples/declarative/samegame/content/pics/background.png b/examples/qml/samegame/content/pics/background.png
index 3734a27744..3734a27744 100644
--- a/examples/declarative/samegame/content/pics/background.png
+++ b/examples/qml/samegame/content/pics/background.png
diff --git a/examples/declarative/samegame/content/pics/blueStone.png b/examples/qml/samegame/content/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/declarative/samegame/content/pics/blueStone.png
+++ b/examples/qml/samegame/content/pics/blueStone.png
diff --git a/examples/declarative/samegame/content/pics/greenStone.png b/examples/qml/samegame/content/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/declarative/samegame/content/pics/greenStone.png
+++ b/examples/qml/samegame/content/pics/greenStone.png
diff --git a/examples/declarative/samegame/content/pics/particle.png b/examples/qml/samegame/content/pics/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/samegame/content/pics/particle.png
+++ b/examples/qml/samegame/content/pics/particle.png
diff --git a/examples/declarative/samegame/content/pics/redStone.png b/examples/qml/samegame/content/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/declarative/samegame/content/pics/redStone.png
+++ b/examples/qml/samegame/content/pics/redStone.png
diff --git a/examples/declarative/samegame/content/pics/yellowStone.png b/examples/qml/samegame/content/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/examples/declarative/samegame/content/pics/yellowStone.png
+++ b/examples/qml/samegame/content/pics/yellowStone.png
diff --git a/examples/declarative/samegame/content/samegame.js b/examples/qml/samegame/content/samegame.js
index 611767584b..611767584b 100755
--- a/examples/declarative/samegame/content/samegame.js
+++ b/examples/qml/samegame/content/samegame.js
diff --git a/examples/declarative/samegame/samegame.qml b/examples/qml/samegame/samegame.qml
index 201f826a29..b98b6a0074 100644
--- a/examples/declarative/samegame/samegame.qml
+++ b/examples/qml/samegame/samegame.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/examples/declarative/samegame/samegame.qmlproject b/examples/qml/samegame/samegame.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/samegame/samegame.qmlproject
+++ b/examples/qml/samegame/samegame.qmlproject
diff --git a/examples/declarative/script/script.pro b/examples/qml/script/script.pro
index 98c1bbc5ee..98c1bbc5ee 100644
--- a/examples/declarative/script/script.pro
+++ b/examples/qml/script/script.pro
diff --git a/examples/declarative/script/shell/main.cpp b/examples/qml/script/shell/main.cpp
index 9f0edf4a25..a4059122bf 100644
--- a/examples/declarative/script/shell/main.cpp
+++ b/examples/qml/script/shell/main.cpp
@@ -46,7 +46,7 @@
 
 #include <QtGui/QGuiApplication>
 
-#include <QtDeclarative/qjsengine.h>
+#include <QtQml/qjsengine.h>
 
 #include <stdlib.h>
 
diff --git a/examples/declarative/script/shell/shell.pro b/examples/qml/script/shell/shell.pro
index 00191ab3d0..5f6b23862b 100644
--- a/examples/declarative/script/shell/shell.pro
+++ b/examples/qml/script/shell/shell.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += qml
 
 win32: CONFIG += console
 mac:CONFIG -= app_bundle
diff --git a/examples/declarative/shadereffects/content/Slider.qml b/examples/qml/shadereffects/content/Slider.qml
index 4ddc6d3432..4ddc6d3432 100644
--- a/examples/declarative/shadereffects/content/Slider.qml
+++ b/examples/qml/shadereffects/content/Slider.qml
diff --git a/examples/declarative/shadereffects/content/face-smile.png b/examples/qml/shadereffects/content/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/shadereffects/content/face-smile.png
+++ b/examples/qml/shadereffects/content/face-smile.png
diff --git a/examples/declarative/shadereffects/content/qt-logo.png b/examples/qml/shadereffects/content/qt-logo.png
index 7d3e97eb36..7d3e97eb36 100644
--- a/examples/declarative/shadereffects/content/qt-logo.png
+++ b/examples/qml/shadereffects/content/qt-logo.png
diff --git a/examples/declarative/shadereffects/shadereffects.qml b/examples/qml/shadereffects/shadereffects.qml
index 842e42b89f..842e42b89f 100644
--- a/examples/declarative/shadereffects/shadereffects.qml
+++ b/examples/qml/shadereffects/shadereffects.qml
diff --git a/examples/declarative/shared/Button.qml b/examples/qml/shared/Button.qml
index a899a1410b..a899a1410b 100644
--- a/examples/declarative/shared/Button.qml
+++ b/examples/qml/shared/Button.qml
diff --git a/examples/declarative/shared/LauncherList.qml b/examples/qml/shared/LauncherList.qml
index 782fcc7ddd..782fcc7ddd 100644
--- a/examples/declarative/shared/LauncherList.qml
+++ b/examples/qml/shared/LauncherList.qml
diff --git a/examples/declarative/shared/README b/examples/qml/shared/README
index bf16f238c7..bf16f238c7 100644
--- a/examples/declarative/shared/README
+++ b/examples/qml/shared/README
diff --git a/examples/declarative/shared/SimpleLauncherDelegate.qml b/examples/qml/shared/SimpleLauncherDelegate.qml
index c3708fe259..c3708fe259 100644
--- a/examples/declarative/shared/SimpleLauncherDelegate.qml
+++ b/examples/qml/shared/SimpleLauncherDelegate.qml
diff --git a/examples/declarative/shared/back.png b/examples/qml/shared/back.png
index 506ac42fcf..506ac42fcf 100644
--- a/examples/declarative/shared/back.png
+++ b/examples/qml/shared/back.png
diff --git a/examples/declarative/snake/content/Button.qml b/examples/qml/snake/content/Button.qml
index dfac45049a..4f294556b3 100644
--- a/examples/declarative/snake/content/Button.qml
+++ b/examples/qml/snake/content/Button.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/examples/declarative/snake/content/Cookie.qml b/examples/qml/snake/content/Cookie.qml
index cae53af525..35ffe400b8 100644
--- a/examples/declarative/snake/content/Cookie.qml
+++ b/examples/qml/snake/content/Cookie.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/examples/declarative/snake/content/HighScoreModel.qml b/examples/qml/snake/content/HighScoreModel.qml
index af66b99ede..734a661f5b 100644
--- a/examples/declarative/snake/content/HighScoreModel.qml
+++ b/examples/qml/snake/content/HighScoreModel.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/examples/declarative/snake/content/Link.qml b/examples/qml/snake/content/Link.qml
index 891adafe5e..aab005afd5 100644
--- a/examples/declarative/snake/content/Link.qml
+++ b/examples/qml/snake/content/Link.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/examples/declarative/snake/content/Skull.qml b/examples/qml/snake/content/Skull.qml
index ce3d108e04..e3f77fdac6 100644
--- a/examples/declarative/snake/content/Skull.qml
+++ b/examples/qml/snake/content/Skull.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/examples/declarative/snake/content/pics/README b/examples/qml/snake/content/pics/README
index 0215132caa..0215132caa 100644
--- a/examples/declarative/snake/content/pics/README
+++ b/examples/qml/snake/content/pics/README
diff --git a/examples/declarative/snake/content/pics/background.png b/examples/qml/snake/content/pics/background.png
index 72dffaa843..72dffaa843 100644
--- a/examples/declarative/snake/content/pics/background.png
+++ b/examples/qml/snake/content/pics/background.png
diff --git a/examples/declarative/snake/content/pics/blueStar.png b/examples/qml/snake/content/pics/blueStar.png
index ba7acabd26..ba7acabd26 100644
--- a/examples/declarative/snake/content/pics/blueStar.png
+++ b/examples/qml/snake/content/pics/blueStar.png
diff --git a/examples/declarative/snake/content/pics/blueStone.png b/examples/qml/snake/content/pics/blueStone.png
index 356affdd95..356affdd95 100644
--- a/examples/declarative/snake/content/pics/blueStone.png
+++ b/examples/qml/snake/content/pics/blueStone.png
diff --git a/examples/declarative/snake/content/pics/cookie.png b/examples/qml/snake/content/pics/cookie.png
index aec2957f34..aec2957f34 100644
--- a/examples/declarative/snake/content/pics/cookie.png
+++ b/examples/qml/snake/content/pics/cookie.png
diff --git a/examples/declarative/snake/content/pics/eyes.svg b/examples/qml/snake/content/pics/eyes.svg
index 1078692725..1078692725 100644
--- a/examples/declarative/snake/content/pics/eyes.svg
+++ b/examples/qml/snake/content/pics/eyes.svg
diff --git a/examples/declarative/snake/content/pics/head.png b/examples/qml/snake/content/pics/head.png
index 550e002687..550e002687 100644
--- a/examples/declarative/snake/content/pics/head.png
+++ b/examples/qml/snake/content/pics/head.png
diff --git a/examples/declarative/snake/content/pics/pause.png b/examples/qml/snake/content/pics/pause.png
index 056d97dd17..056d97dd17 100644
--- a/examples/declarative/snake/content/pics/pause.png
+++ b/examples/qml/snake/content/pics/pause.png
diff --git a/examples/declarative/snake/content/pics/redStar.png b/examples/qml/snake/content/pics/redStar.png
index cd06854719..cd06854719 100644
--- a/examples/declarative/snake/content/pics/redStar.png
+++ b/examples/qml/snake/content/pics/redStar.png
diff --git a/examples/declarative/snake/content/pics/redStone.png b/examples/qml/snake/content/pics/redStone.png
index 9bb7fe4277..9bb7fe4277 100644
--- a/examples/declarative/snake/content/pics/redStone.png
+++ b/examples/qml/snake/content/pics/redStone.png
diff --git a/examples/declarative/snake/content/pics/skull.png b/examples/qml/snake/content/pics/skull.png
index 63186167bd..63186167bd 100644
--- a/examples/declarative/snake/content/pics/skull.png
+++ b/examples/qml/snake/content/pics/skull.png
diff --git a/examples/declarative/snake/content/pics/snake.jpg b/examples/qml/snake/content/pics/snake.jpg
index e91a784f71..e91a784f71 100644
--- a/examples/declarative/snake/content/pics/snake.jpg
+++ b/examples/qml/snake/content/pics/snake.jpg
diff --git a/examples/declarative/snake/content/pics/star.png b/examples/qml/snake/content/pics/star.png
index defbde53ca..defbde53ca 100644
--- a/examples/declarative/snake/content/pics/star.png
+++ b/examples/qml/snake/content/pics/star.png
diff --git a/examples/declarative/snake/content/pics/stoneShadow.png b/examples/qml/snake/content/pics/stoneShadow.png
index 1bd56afd04..1bd56afd04 100644
--- a/examples/declarative/snake/content/pics/stoneShadow.png
+++ b/examples/qml/snake/content/pics/stoneShadow.png
diff --git a/examples/declarative/snake/content/pics/yellowStar.png b/examples/qml/snake/content/pics/yellowStar.png
index 52fb9c4b78..52fb9c4b78 100644
--- a/examples/declarative/snake/content/pics/yellowStar.png
+++ b/examples/qml/snake/content/pics/yellowStar.png
diff --git a/examples/declarative/snake/content/pics/yellowStone.png b/examples/qml/snake/content/pics/yellowStone.png
index c56124a895..c56124a895 100644
--- a/examples/declarative/snake/content/pics/yellowStone.png
+++ b/examples/qml/snake/content/pics/yellowStone.png
diff --git a/examples/declarative/snake/content/snake.js b/examples/qml/snake/content/snake.js
index 107c9f4591..107c9f4591 100644
--- a/examples/declarative/snake/content/snake.js
+++ b/examples/qml/snake/content/snake.js
diff --git a/examples/declarative/snake/snake.qml b/examples/qml/snake/snake.qml
index f25b626d02..d389077bde 100644
--- a/examples/declarative/snake/snake.qml
+++ b/examples/qml/snake/snake.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/examples/declarative/snake/snake.qmlproject b/examples/qml/snake/snake.qmlproject
index fb015465d1..fb015465d1 100644
--- a/examples/declarative/snake/snake.qmlproject
+++ b/examples/qml/snake/snake.qmlproject
diff --git a/examples/declarative/sqllocalstorage/hello.qml b/examples/qml/sqllocalstorage/hello.qml
index 3496b86bd9..3496b86bd9 100644
--- a/examples/declarative/sqllocalstorage/hello.qml
+++ b/examples/qml/sqllocalstorage/hello.qml
diff --git a/examples/declarative/text/fonts/availableFonts.qml b/examples/qml/text/fonts/availableFonts.qml
index 0b87259556..0b87259556 100644
--- a/examples/declarative/text/fonts/availableFonts.qml
+++ b/examples/qml/text/fonts/availableFonts.qml
diff --git a/examples/declarative/text/fonts/banner.qml b/examples/qml/text/fonts/banner.qml
index 6c9aa25fa1..6c9aa25fa1 100644
--- a/examples/declarative/text/fonts/banner.qml
+++ b/examples/qml/text/fonts/banner.qml
diff --git a/examples/declarative/text/fonts/content/fonts/tarzeau_ocr_a.ttf b/examples/qml/text/fonts/content/fonts/tarzeau_ocr_a.ttf
index cf93f9651f..cf93f9651f 100644
--- a/examples/declarative/text/fonts/content/fonts/tarzeau_ocr_a.ttf
+++ b/examples/qml/text/fonts/content/fonts/tarzeau_ocr_a.ttf
diff --git a/examples/declarative/text/fonts/fonts.qml b/examples/qml/text/fonts/fonts.qml
index 78cef25eae..78cef25eae 100644
--- a/examples/declarative/text/fonts/fonts.qml
+++ b/examples/qml/text/fonts/fonts.qml
diff --git a/examples/declarative/text/fonts/hello.qml b/examples/qml/text/fonts/hello.qml
index d9479fb208..d9479fb208 100644
--- a/examples/declarative/text/fonts/hello.qml
+++ b/examples/qml/text/fonts/hello.qml
diff --git a/examples/declarative/text/imgtag/TextWithImage.qml b/examples/qml/text/imgtag/TextWithImage.qml
index bc09aa2a52..bc09aa2a52 100644
--- a/examples/declarative/text/imgtag/TextWithImage.qml
+++ b/examples/qml/text/imgtag/TextWithImage.qml
diff --git a/examples/declarative/text/imgtag/images/face-sad.png b/examples/qml/text/imgtag/images/face-sad.png
index 24188b7985..24188b7985 100644
--- a/examples/declarative/text/imgtag/images/face-sad.png
+++ b/examples/qml/text/imgtag/images/face-sad.png
diff --git a/examples/declarative/text/imgtag/images/face-smile-big.png b/examples/qml/text/imgtag/images/face-smile-big.png
index d05e0bf21e..d05e0bf21e 100644
--- a/examples/declarative/text/imgtag/images/face-smile-big.png
+++ b/examples/qml/text/imgtag/images/face-smile-big.png
diff --git a/examples/declarative/text/imgtag/images/face-smile.png b/examples/qml/text/imgtag/images/face-smile.png
index e5e1d1353c..e5e1d1353c 100644
--- a/examples/declarative/text/imgtag/images/face-smile.png
+++ b/examples/qml/text/imgtag/images/face-smile.png
diff --git a/examples/declarative/text/imgtag/images/heart200.png b/examples/qml/text/imgtag/images/heart200.png
index cedd3ea608..cedd3ea608 100644
--- a/examples/declarative/text/imgtag/images/heart200.png
+++ b/examples/qml/text/imgtag/images/heart200.png
diff --git a/examples/declarative/text/imgtag/images/qtlogo.png b/examples/qml/text/imgtag/images/qtlogo.png
index 996719a4c6..996719a4c6 100644
--- a/examples/declarative/text/imgtag/images/qtlogo.png
+++ b/examples/qml/text/imgtag/images/qtlogo.png
diff --git a/examples/declarative/text/imgtag/images/starfish_2.png b/examples/qml/text/imgtag/images/starfish_2.png
index 132c20ffd0..132c20ffd0 100644
--- a/examples/declarative/text/imgtag/images/starfish_2.png
+++ b/examples/qml/text/imgtag/images/starfish_2.png
diff --git a/examples/declarative/text/imgtag/imgtag.qml b/examples/qml/text/imgtag/imgtag.qml
index 9d181af2cb..9d181af2cb 100644
--- a/examples/declarative/text/imgtag/imgtag.qml
+++ b/examples/qml/text/imgtag/imgtag.qml
diff --git a/examples/declarative/text/styledtext-layout.qml b/examples/qml/text/styledtext-layout.qml
index 4571330568..4571330568 100644
--- a/examples/declarative/text/styledtext-layout.qml
+++ b/examples/qml/text/styledtext-layout.qml
diff --git a/examples/declarative/text/text.qml b/examples/qml/text/text.qml
index 14a88d2e91..14a88d2e91 100644
--- a/examples/declarative/text/text.qml
+++ b/examples/qml/text/text.qml
diff --git a/examples/declarative/text/text.qmlproject b/examples/qml/text/text.qmlproject
index c08d9b9a89..c08d9b9a89 100644
--- a/examples/declarative/text/text.qmlproject
+++ b/examples/qml/text/text.qmlproject
diff --git a/examples/declarative/text/textselection/pics/endHandle.png b/examples/qml/text/textselection/pics/endHandle.png
index 1a4bc5d7a0..1a4bc5d7a0 100644
--- a/examples/declarative/text/textselection/pics/endHandle.png
+++ b/examples/qml/text/textselection/pics/endHandle.png
diff --git a/examples/declarative/text/textselection/pics/endHandle.sci b/examples/qml/text/textselection/pics/endHandle.sci
index 4f51f24278..4f51f24278 100644
--- a/examples/declarative/text/textselection/pics/endHandle.sci
+++ b/examples/qml/text/textselection/pics/endHandle.sci
diff --git a/examples/declarative/text/textselection/pics/startHandle.png b/examples/qml/text/textselection/pics/startHandle.png
index deedcd5c91..deedcd5c91 100644
--- a/examples/declarative/text/textselection/pics/startHandle.png
+++ b/examples/qml/text/textselection/pics/startHandle.png
diff --git a/examples/declarative/text/textselection/pics/startHandle.sci b/examples/qml/text/textselection/pics/startHandle.sci
index f9eae204c1..f9eae204c1 100644
--- a/examples/declarative/text/textselection/pics/startHandle.sci
+++ b/examples/qml/text/textselection/pics/startHandle.sci
diff --git a/examples/declarative/text/textselection/textselection.qml b/examples/qml/text/textselection/textselection.qml
index 7938ce5bf7..7938ce5bf7 100644
--- a/examples/declarative/text/textselection/textselection.qml
+++ b/examples/qml/text/textselection/textselection.qml
diff --git a/examples/declarative/threading/threadedlistmodel/dataloader.js b/examples/qml/threading/threadedlistmodel/dataloader.js
index 4d2aab323d..4d2aab323d 100644
--- a/examples/declarative/threading/threadedlistmodel/dataloader.js
+++ b/examples/qml/threading/threadedlistmodel/dataloader.js
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject b/examples/qml/threading/threadedlistmodel/threadedlistmodel.qmlproject
index e7c8e69f14..e7c8e69f14 100644
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
+++ b/examples/qml/threading/threadedlistmodel/threadedlistmodel.qmlproject
diff --git a/examples/declarative/threading/threadedlistmodel/timedisplay.qml b/examples/qml/threading/threadedlistmodel/timedisplay.qml
index 48d0f659e5..48d0f659e5 100644
--- a/examples/declarative/threading/threadedlistmodel/timedisplay.qml
+++ b/examples/qml/threading/threadedlistmodel/timedisplay.qml
diff --git a/examples/declarative/threading/workerscript/workerscript.js b/examples/qml/threading/workerscript/workerscript.js
index f76471f920..f76471f920 100644
--- a/examples/declarative/threading/workerscript/workerscript.js
+++ b/examples/qml/threading/workerscript/workerscript.js
diff --git a/examples/declarative/threading/workerscript/workerscript.qml b/examples/qml/threading/workerscript/workerscript.qml
index 7fced8166c..7fced8166c 100644
--- a/examples/declarative/threading/workerscript/workerscript.qml
+++ b/examples/qml/threading/workerscript/workerscript.qml
diff --git a/examples/declarative/threading/workerscript/workerscript.qmlproject b/examples/qml/threading/workerscript/workerscript.qmlproject
index 6d7a91feeb..6d7a91feeb 100644
--- a/examples/declarative/threading/workerscript/workerscript.qmlproject
+++ b/examples/qml/threading/workerscript/workerscript.qmlproject
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml b/examples/qml/touchinteraction/mousearea/mousearea-example.qml
index 30e3e62864..30e3e62864 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
+++ b/examples/qml/touchinteraction/mousearea/mousearea-example.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/bearwhack.qml b/examples/qml/touchinteraction/multipointtouch/bearwhack.qml
index db46473c05..db46473c05 100644
--- a/examples/declarative/touchinteraction/multipointtouch/bearwhack.qml
+++ b/examples/qml/touchinteraction/multipointtouch/bearwhack.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml b/examples/qml/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
index aede1a8f4e..aede1a8f4e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
+++ b/examples/qml/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear0.png b/examples/qml/touchinteraction/multipointtouch/content/Bear0.png
index 64a02cec8e..64a02cec8e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear0.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/Bear0.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear1.png b/examples/qml/touchinteraction/multipointtouch/content/Bear1.png
index 3b88f3b32e..3b88f3b32e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear1.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/Bear1.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear2.png b/examples/qml/touchinteraction/multipointtouch/content/Bear2.png
index 337b636070..337b636070 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear2.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/Bear2.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear3.png b/examples/qml/touchinteraction/multipointtouch/content/Bear3.png
index f0e68590f4..f0e68590f4 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear3.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/Bear3.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/BearB.png b/examples/qml/touchinteraction/multipointtouch/content/BearB.png
index c9a84ae1d4..c9a84ae1d4 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/BearB.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/BearB.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml b/examples/qml/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
index 05d74ab0ea..05d74ab0ea 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
+++ b/examples/qml/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/ParticleFlame.qml b/examples/qml/touchinteraction/multipointtouch/content/ParticleFlame.qml
index 9788c5c665..9788c5c665 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/ParticleFlame.qml
+++ b/examples/qml/touchinteraction/multipointtouch/content/ParticleFlame.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle.png b/examples/qml/touchinteraction/multipointtouch/content/blur-circle.png
index 1b03cd0b2c..1b03cd0b2c 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/blur-circle.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle3.png b/examples/qml/touchinteraction/multipointtouch/content/blur-circle3.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle3.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/blur-circle3.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/heart-blur.png b/examples/qml/touchinteraction/multipointtouch/content/heart-blur.png
index dbc38804ee..dbc38804ee 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/heart-blur.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/heart-blur.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/title.png b/examples/qml/touchinteraction/multipointtouch/content/title.png
index d630ea2643..d630ea2643 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/title.png
+++ b/examples/qml/touchinteraction/multipointtouch/content/title.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/multiflame.qml b/examples/qml/touchinteraction/multipointtouch/multiflame.qml
index 72a0ce21f8..72a0ce21f8 100644
--- a/examples/declarative/touchinteraction/multipointtouch/multiflame.qml
+++ b/examples/qml/touchinteraction/multipointtouch/multiflame.qml
diff --git a/examples/declarative/touchinteraction/pincharea/flickresize.qml b/examples/qml/touchinteraction/pincharea/flickresize.qml
index 037766e4a0..037766e4a0 100644
--- a/examples/declarative/touchinteraction/pincharea/flickresize.qml
+++ b/examples/qml/touchinteraction/pincharea/flickresize.qml
diff --git a/examples/declarative/touchinteraction/pincharea/qt-logo.jpg b/examples/qml/touchinteraction/pincharea/qt-logo.jpg
index 4014b4659c..4014b4659c 100644
--- a/examples/declarative/touchinteraction/pincharea/qt-logo.jpg
+++ b/examples/qml/touchinteraction/pincharea/qt-logo.jpg
diff --git a/examples/declarative/touchinteraction/touchinteraction.qml b/examples/qml/touchinteraction/touchinteraction.qml
index ac0c8bfc55..ac0c8bfc55 100644
--- a/examples/declarative/touchinteraction/touchinteraction.qml
+++ b/examples/qml/touchinteraction/touchinteraction.qml
diff --git a/examples/declarative/touchinteraction/touchinteraction.qmlproject b/examples/qml/touchinteraction/touchinteraction.qmlproject
index a9aa9d2e81..a9aa9d2e81 100644
--- a/examples/declarative/touchinteraction/touchinteraction.qmlproject
+++ b/examples/qml/touchinteraction/touchinteraction.qmlproject
diff --git a/examples/declarative/toys/clocks/clocks.qml b/examples/qml/toys/clocks/clocks.qml
index 288e50c9eb..288e50c9eb 100644
--- a/examples/declarative/toys/clocks/clocks.qml
+++ b/examples/qml/toys/clocks/clocks.qml
diff --git a/examples/declarative/toys/clocks/content/Clock.qml b/examples/qml/toys/clocks/content/Clock.qml
index 7f0e8cba83..7f0e8cba83 100644
--- a/examples/declarative/toys/clocks/content/Clock.qml
+++ b/examples/qml/toys/clocks/content/Clock.qml
diff --git a/examples/declarative/toys/clocks/content/QuitButton.qml b/examples/qml/toys/clocks/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/declarative/toys/clocks/content/QuitButton.qml
+++ b/examples/qml/toys/clocks/content/QuitButton.qml
diff --git a/examples/declarative/toys/clocks/content/arrow.png b/examples/qml/toys/clocks/content/arrow.png
index e437312217..e437312217 100644
--- a/examples/declarative/toys/clocks/content/arrow.png
+++ b/examples/qml/toys/clocks/content/arrow.png
diff --git a/examples/declarative/toys/clocks/content/background.png b/examples/qml/toys/clocks/content/background.png
index a885950862..a885950862 100644
--- a/examples/declarative/toys/clocks/content/background.png
+++ b/examples/qml/toys/clocks/content/background.png
diff --git a/examples/declarative/toys/clocks/content/center.png b/examples/qml/toys/clocks/content/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/declarative/toys/clocks/content/center.png
+++ b/examples/qml/toys/clocks/content/center.png
diff --git a/examples/declarative/toys/clocks/content/clock-night.png b/examples/qml/toys/clocks/content/clock-night.png
index cc7151a397..cc7151a397 100644
--- a/examples/declarative/toys/clocks/content/clock-night.png
+++ b/examples/qml/toys/clocks/content/clock-night.png
diff --git a/examples/declarative/toys/clocks/content/clock.png b/examples/qml/toys/clocks/content/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/declarative/toys/clocks/content/clock.png
+++ b/examples/qml/toys/clocks/content/clock.png
diff --git a/examples/declarative/toys/clocks/content/hour.png b/examples/qml/toys/clocks/content/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/declarative/toys/clocks/content/hour.png
+++ b/examples/qml/toys/clocks/content/hour.png
diff --git a/examples/declarative/toys/clocks/content/minute.png b/examples/qml/toys/clocks/content/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/declarative/toys/clocks/content/minute.png
+++ b/examples/qml/toys/clocks/content/minute.png
diff --git a/examples/declarative/toys/clocks/content/quit.png b/examples/qml/toys/clocks/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/toys/clocks/content/quit.png
+++ b/examples/qml/toys/clocks/content/quit.png
diff --git a/examples/declarative/toys/clocks/content/second.png b/examples/qml/toys/clocks/content/second.png
index 4aa9fb5e8e..4aa9fb5e8e 100644
--- a/examples/declarative/toys/clocks/content/second.png
+++ b/examples/qml/toys/clocks/content/second.png
diff --git a/examples/declarative/toys/corkboards/content/Day.qml b/examples/qml/toys/corkboards/content/Day.qml
index 7fe625c305..7fe625c305 100644
--- a/examples/declarative/toys/corkboards/content/Day.qml
+++ b/examples/qml/toys/corkboards/content/Day.qml
diff --git a/examples/declarative/toys/corkboards/content/cork.jpg b/examples/qml/toys/corkboards/content/cork.jpg
index 160bc002bf..160bc002bf 100644
--- a/examples/declarative/toys/corkboards/content/cork.jpg
+++ b/examples/qml/toys/corkboards/content/cork.jpg
diff --git a/examples/declarative/toys/corkboards/content/note-yellow.png b/examples/qml/toys/corkboards/content/note-yellow.png
index 8ddecc8b03..8ddecc8b03 100644
--- a/examples/declarative/toys/corkboards/content/note-yellow.png
+++ b/examples/qml/toys/corkboards/content/note-yellow.png
diff --git a/examples/declarative/toys/corkboards/content/tack.png b/examples/qml/toys/corkboards/content/tack.png
index cef2d1cd23..cef2d1cd23 100644
--- a/examples/declarative/toys/corkboards/content/tack.png
+++ b/examples/qml/toys/corkboards/content/tack.png
diff --git a/examples/declarative/toys/corkboards/corkboards.qml b/examples/qml/toys/corkboards/corkboards.qml
index dc3aa6b378..dc3aa6b378 100644
--- a/examples/declarative/toys/corkboards/corkboards.qml
+++ b/examples/qml/toys/corkboards/corkboards.qml
diff --git a/examples/declarative/toys/dynamicscene/content/Button.qml b/examples/qml/toys/dynamicscene/content/Button.qml
index 014692274a..014692274a 100644
--- a/examples/declarative/toys/dynamicscene/content/Button.qml
+++ b/examples/qml/toys/dynamicscene/content/Button.qml
diff --git a/examples/declarative/toys/dynamicscene/content/GenericSceneItem.qml b/examples/qml/toys/dynamicscene/content/GenericSceneItem.qml
index 0408aa87fb..0408aa87fb 100644
--- a/examples/declarative/toys/dynamicscene/content/GenericSceneItem.qml
+++ b/examples/qml/toys/dynamicscene/content/GenericSceneItem.qml
diff --git a/examples/declarative/toys/dynamicscene/content/PaletteItem.qml b/examples/qml/toys/dynamicscene/content/PaletteItem.qml
index e993f89989..e993f89989 100644
--- a/examples/declarative/toys/dynamicscene/content/PaletteItem.qml
+++ b/examples/qml/toys/dynamicscene/content/PaletteItem.qml
diff --git a/examples/declarative/toys/dynamicscene/content/PerspectiveItem.qml b/examples/qml/toys/dynamicscene/content/PerspectiveItem.qml
index f651369452..f651369452 100644
--- a/examples/declarative/toys/dynamicscene/content/PerspectiveItem.qml
+++ b/examples/qml/toys/dynamicscene/content/PerspectiveItem.qml
diff --git a/examples/declarative/toys/dynamicscene/content/Sun.qml b/examples/qml/toys/dynamicscene/content/Sun.qml
index b84516eecc..b84516eecc 100644
--- a/examples/declarative/toys/dynamicscene/content/Sun.qml
+++ b/examples/qml/toys/dynamicscene/content/Sun.qml
diff --git a/examples/declarative/toys/dynamicscene/content/images/NOTE b/examples/qml/toys/dynamicscene/content/images/NOTE
index fcd87f9132..fcd87f9132 100644
--- a/examples/declarative/toys/dynamicscene/content/images/NOTE
+++ b/examples/qml/toys/dynamicscene/content/images/NOTE
diff --git a/examples/declarative/toys/dynamicscene/content/images/face-smile.png b/examples/qml/toys/dynamicscene/content/images/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/toys/dynamicscene/content/images/face-smile.png
+++ b/examples/qml/toys/dynamicscene/content/images/face-smile.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/moon.png b/examples/qml/toys/dynamicscene/content/images/moon.png
index 1c0d6066a8..1c0d6066a8 100644
--- a/examples/declarative/toys/dynamicscene/content/images/moon.png
+++ b/examples/qml/toys/dynamicscene/content/images/moon.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/rabbit_brown.png b/examples/qml/toys/dynamicscene/content/images/rabbit_brown.png
index ebfdeed332..ebfdeed332 100644
--- a/examples/declarative/toys/dynamicscene/content/images/rabbit_brown.png
+++ b/examples/qml/toys/dynamicscene/content/images/rabbit_brown.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/rabbit_bw.png b/examples/qml/toys/dynamicscene/content/images/rabbit_bw.png
index 7bff9b92ca..7bff9b92ca 100644
--- a/examples/declarative/toys/dynamicscene/content/images/rabbit_bw.png
+++ b/examples/qml/toys/dynamicscene/content/images/rabbit_bw.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/star.png b/examples/qml/toys/dynamicscene/content/images/star.png
index 27ef924267..27ef924267 100644
--- a/examples/declarative/toys/dynamicscene/content/images/star.png
+++ b/examples/qml/toys/dynamicscene/content/images/star.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/sun.png b/examples/qml/toys/dynamicscene/content/images/sun.png
index 7713ca5ce7..7713ca5ce7 100644
--- a/examples/declarative/toys/dynamicscene/content/images/sun.png
+++ b/examples/qml/toys/dynamicscene/content/images/sun.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/tree_s.png b/examples/qml/toys/dynamicscene/content/images/tree_s.png
index 6eac35a729..6eac35a729 100644
--- a/examples/declarative/toys/dynamicscene/content/images/tree_s.png
+++ b/examples/qml/toys/dynamicscene/content/images/tree_s.png
diff --git a/examples/declarative/toys/dynamicscene/content/itemCreation.js b/examples/qml/toys/dynamicscene/content/itemCreation.js
index 40f5415f9f..40f5415f9f 100644
--- a/examples/declarative/toys/dynamicscene/content/itemCreation.js
+++ b/examples/qml/toys/dynamicscene/content/itemCreation.js
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/qml/toys/dynamicscene/dynamicscene.qml
index e64eb0fd0f..e64eb0fd0f 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.qml
+++ b/examples/qml/toys/dynamicscene/dynamicscene.qml
diff --git a/examples/declarative/toys/tic-tac-toe/content/Button.qml b/examples/qml/toys/tic-tac-toe/content/Button.qml
index 6dd141f838..6dd141f838 100644
--- a/examples/declarative/toys/tic-tac-toe/content/Button.qml
+++ b/examples/qml/toys/tic-tac-toe/content/Button.qml
diff --git a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml b/examples/qml/toys/tic-tac-toe/content/TicTac.qml
index e74bc6bcda..e74bc6bcda 100644
--- a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
+++ b/examples/qml/toys/tic-tac-toe/content/TicTac.qml
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/board.png b/examples/qml/toys/tic-tac-toe/content/pics/board.png
index 7e5b7ba27c..7e5b7ba27c 100644
--- a/examples/declarative/toys/tic-tac-toe/content/pics/board.png
+++ b/examples/qml/toys/tic-tac-toe/content/pics/board.png
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/o.png b/examples/qml/toys/tic-tac-toe/content/pics/o.png
index abc7ee020b..abc7ee020b 100644
--- a/examples/declarative/toys/tic-tac-toe/content/pics/o.png
+++ b/examples/qml/toys/tic-tac-toe/content/pics/o.png
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/x.png b/examples/qml/toys/tic-tac-toe/content/pics/x.png
index ddc65c83b8..ddc65c83b8 100644
--- a/examples/declarative/toys/tic-tac-toe/content/pics/x.png
+++ b/examples/qml/toys/tic-tac-toe/content/pics/x.png
diff --git a/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js b/examples/qml/toys/tic-tac-toe/content/tic-tac-toe.js
index 5a166b750f..5a166b750f 100644
--- a/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
+++ b/examples/qml/toys/tic-tac-toe/content/tic-tac-toe.js
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/qml/toys/tic-tac-toe/tic-tac-toe.qml
index 8d15233eaa..8d15233eaa 100644
--- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
+++ b/examples/qml/toys/tic-tac-toe/tic-tac-toe.qml
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qml b/examples/qml/toys/tvtennis/tvtennis.qml
index 63866e3ce6..63866e3ce6 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.qml
+++ b/examples/qml/toys/tvtennis/tvtennis.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview1/PetsModel.qml b/examples/qml/tutorials/dynamicview/dynamicview1/PetsModel.qml
index f07613c968..f07613c968 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview1/PetsModel.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview1/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview1/dynamicview.qml b/examples/qml/tutorials/dynamicview/dynamicview1/dynamicview.qml
index 1a9dd453ce..1a9dd453ce 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview1/dynamicview.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview1/dynamicview.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview2/PetsModel.qml b/examples/qml/tutorials/dynamicview/dynamicview2/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview2/PetsModel.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview2/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview2/dynamicview.qml b/examples/qml/tutorials/dynamicview/dynamicview2/dynamicview.qml
index 9e654a685c..9e654a685c 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview2/dynamicview.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview2/dynamicview.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview3/PetsModel.qml b/examples/qml/tutorials/dynamicview/dynamicview3/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview3/PetsModel.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview3/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview3/dynamicview.qml b/examples/qml/tutorials/dynamicview/dynamicview3/dynamicview.qml
index 5a579f78d9..5a579f78d9 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview3/dynamicview.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview3/dynamicview.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview4/ListSelector.qml b/examples/qml/tutorials/dynamicview/dynamicview4/ListSelector.qml
index c6b8287beb..c6b8287beb 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview4/ListSelector.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview4/ListSelector.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview4/PetsModel.qml b/examples/qml/tutorials/dynamicview/dynamicview4/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview4/PetsModel.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview4/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/qml/tutorials/dynamicview/dynamicview4/dynamicview.qml
index 9bd4e0c438..9bd4e0c438 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview4/dynamicview.qml
+++ b/examples/qml/tutorials/dynamicview/dynamicview4/dynamicview.qml
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/app.qml b/examples/qml/tutorials/extending/chapter1-basics/app.qml
index 6f0c1d3a23..6f0c1d3a23 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/app.qml
+++ b/examples/qml/tutorials/extending/chapter1-basics/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro
index affc57ce1f..8ed66f8b66 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
+++ b/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += piechart.h
 SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/qml/tutorials/extending/chapter1-basics/main.cpp
index ed9e412bd6..ed9e412bd6 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
+++ b/examples/qml/tutorials/extending/chapter1-basics/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp b/examples/qml/tutorials/extending/chapter1-basics/piechart.cpp
index bc81d6a3a0..bc81d6a3a0 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp
+++ b/examples/qml/tutorials/extending/chapter1-basics/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h b/examples/qml/tutorials/extending/chapter1-basics/piechart.h
index 71a8786e7d..71a8786e7d 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h
+++ b/examples/qml/tutorials/extending/chapter1-basics/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/app.qml b/examples/qml/tutorials/extending/chapter2-methods/app.qml
index eee0933734..eee0933734 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/app.qml
+++ b/examples/qml/tutorials/extending/chapter2-methods/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro
index affc57ce1f..8ed66f8b66 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
+++ b/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += piechart.h
 SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/qml/tutorials/extending/chapter2-methods/main.cpp
index ed9e412bd6..ed9e412bd6 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
+++ b/examples/qml/tutorials/extending/chapter2-methods/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp b/examples/qml/tutorials/extending/chapter2-methods/piechart.cpp
index 71be74e943..71be74e943 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp
+++ b/examples/qml/tutorials/extending/chapter2-methods/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h b/examples/qml/tutorials/extending/chapter2-methods/piechart.h
index 7650d6e8d7..7650d6e8d7 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h
+++ b/examples/qml/tutorials/extending/chapter2-methods/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml b/examples/qml/tutorials/extending/chapter3-bindings/app.qml
index 4ad929132c..4ad929132c 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
+++ b/examples/qml/tutorials/extending/chapter3-bindings/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
index affc57ce1f..8ed66f8b66 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
+++ b/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += piechart.h
 SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/qml/tutorials/extending/chapter3-bindings/main.cpp
index ed9e412bd6..ed9e412bd6 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
+++ b/examples/qml/tutorials/extending/chapter3-bindings/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/qml/tutorials/extending/chapter3-bindings/piechart.cpp
index 2a392125da..2a392125da 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp
+++ b/examples/qml/tutorials/extending/chapter3-bindings/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h b/examples/qml/tutorials/extending/chapter3-bindings/piechart.h
index 77075b5727..77075b5727 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h
+++ b/examples/qml/tutorials/extending/chapter3-bindings/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml
index 06490773f4..06490773f4 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
index 6724fa0375..23eb222ea3 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += piechart.h \
            pieslice.h 
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp
index 537ea766fc..537ea766fc 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
index 3cf9bdc00c..3cf9bdc00c 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.h
index b89db5a2b1..b89db5a2b1 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
index 654a46fc8d..654a46fc8d 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
index 8fc445d471..8fc445d471 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
+++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml b/examples/qml/tutorials/extending/chapter5-listproperties/app.qml
index 37b0626948..37b0626948 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
index 6724fa0375..23eb222ea3 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 HEADERS += piechart.h \
            pieslice.h 
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp
index 59587733eb..59587733eb 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/qml/tutorials/extending/chapter5-listproperties/piechart.cpp
index bfcb607e60..9c2c6accf3 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/piechart.cpp
@@ -56,12 +56,12 @@ void PieChart::setName(const QString &name)
 }
 
 //![0]
-QDeclarativeListProperty<PieSlice> PieChart::slices() 
+QQmlListProperty<PieSlice> PieChart::slices() 
 {
-    return QDeclarativeListProperty<PieSlice>(this, 0, &PieChart::append_slice);
+    return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice);
 }
 
-void PieChart::append_slice(QDeclarativeListProperty<PieSlice> *list, PieSlice *slice)
+void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
 {
     PieChart *chart = qobject_cast<PieChart *>(list->object);
     if (chart) {
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h b/examples/qml/tutorials/extending/chapter5-listproperties/piechart.h
index 9beabda5f3..6c17bc1258 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/piechart.h
@@ -48,7 +48,7 @@ class PieSlice;
 class PieChart : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<PieSlice> slices READ slices)
+    Q_PROPERTY(QQmlListProperty<PieSlice> slices READ slices)
 //![0]
     Q_PROPERTY(QString name READ name WRITE setName)
 
@@ -61,10 +61,10 @@ public:
     void setName(const QString &name);
 
 //![2]
-    QDeclarativeListProperty<PieSlice> slices();
+    QQmlListProperty<PieSlice> slices();
 
 private:
-    static void append_slice(QDeclarativeListProperty<PieSlice> *list, PieSlice *slice);
+    static void append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice);
 
     QString m_name;
     QList<PieSlice *> m_slices;
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.cpp
index 5bca2d58d8..5bca2d58d8 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.cpp
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.h
index f6497fcbae..f6497fcbae 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h
+++ b/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir b/examples/qml/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
index 72650d8243..72650d8243 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
+++ b/examples/qml/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml b/examples/qml/tutorials/extending/chapter6-plugins/app.qml
index b6eac44e27..b6eac44e27 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
+++ b/examples/qml/tutorials/extending/chapter6-plugins/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index c243ec4572..75f88b2eaa 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative quick
+QT += qml quick
 
 DESTDIR = ChartsPlugin
 TARGET = chartsplugin
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.cpp
index 9c4027de8a..f95cf1003b 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp
+++ b/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.cpp
@@ -41,7 +41,7 @@
 //![0]
 #include "piechart.h"
 #include "pieslice.h"
-#include <qdeclarative.h>
+#include <qqml.h>
 
 void ChartsPlugin::registerTypes(const char *uri)
 {
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.h
index bffcf000fd..2dc477f794 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h
+++ b/examples/qml/tutorials/extending/chapter6-plugins/chartsplugin.h
@@ -41,9 +41,9 @@
 #define CHARTSPLUGIN_H
 
 //![0]
-#include <QDeclarativeExtensionPlugin>
+#include <QQmlExtensionPlugin>
 
-class ChartsPlugin : public QDeclarativeExtensionPlugin
+class ChartsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/qml/tutorials/extending/chapter6-plugins/piechart.cpp
index 2a8f40289e..b00f4139be 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp
+++ b/examples/qml/tutorials/extending/chapter6-plugins/piechart.cpp
@@ -55,12 +55,12 @@ void PieChart::setName(const QString &name)
     m_name = name;
 }
 
-QDeclarativeListProperty<PieSlice> PieChart::slices() 
+QQmlListProperty<PieSlice> PieChart::slices() 
 {
-    return QDeclarativeListProperty<PieSlice>(this, 0, &PieChart::append_slice);
+    return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice);
 }
 
-void PieChart::append_slice(QDeclarativeListProperty<PieSlice> *list, PieSlice *slice)
+void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
 {
     PieChart *chart = qobject_cast<PieChart *>(list->object);
     if (chart) {
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h b/examples/qml/tutorials/extending/chapter6-plugins/piechart.h
index fe6b96afdc..2ee8108784 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h
+++ b/examples/qml/tutorials/extending/chapter6-plugins/piechart.h
@@ -47,7 +47,7 @@ class PieSlice;
 class PieChart : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<PieSlice> slices READ slices)
+    Q_PROPERTY(QQmlListProperty<PieSlice> slices READ slices)
     Q_PROPERTY(QString name READ name WRITE setName)
 
 public:
@@ -56,10 +56,10 @@ public:
     QString name() const;
     void setName(const QString &name);
 
-    QDeclarativeListProperty<PieSlice> slices();
+    QQmlListProperty<PieSlice> slices();
 
 private:
-    static void append_slice(QDeclarativeListProperty<PieSlice> *list, PieSlice *slice);
+    static void append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice);
 
     QString m_name;
     QList<PieSlice *> m_slices;
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/qml/tutorials/extending/chapter6-plugins/pieslice.cpp
index 5bca2d58d8..5bca2d58d8 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp
+++ b/examples/qml/tutorials/extending/chapter6-plugins/pieslice.cpp
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h b/examples/qml/tutorials/extending/chapter6-plugins/pieslice.h
index 8a636fb3e7..8a636fb3e7 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h
+++ b/examples/qml/tutorials/extending/chapter6-plugins/pieslice.h
diff --git a/examples/declarative/tutorials/extending/extending.pro b/examples/qml/tutorials/extending/extending.pro
index 967473fda0..967473fda0 100644
--- a/examples/declarative/tutorials/extending/extending.pro
+++ b/examples/qml/tutorials/extending/extending.pro
diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/qml/tutorials/helloworld/Cell.qml
index 7140dcb2c1..7140dcb2c1 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/qml/tutorials/helloworld/Cell.qml
diff --git a/examples/declarative/tutorials/helloworld/tutorial1.qml b/examples/qml/tutorials/helloworld/tutorial1.qml
index f0eb42d696..f0eb42d696 100644
--- a/examples/declarative/tutorials/helloworld/tutorial1.qml
+++ b/examples/qml/tutorials/helloworld/tutorial1.qml
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/qml/tutorials/helloworld/tutorial2.qml
index c5c045aace..c5c045aace 100644
--- a/examples/declarative/tutorials/helloworld/tutorial2.qml
+++ b/examples/qml/tutorials/helloworld/tutorial2.qml
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/qml/tutorials/helloworld/tutorial3.qml
index c804bfca1d..c804bfca1d 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/qml/tutorials/helloworld/tutorial3.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/Block.qml b/examples/qml/tutorials/samegame/samegame1/Block.qml
index 32ef8c2bba..32ef8c2bba 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Block.qml
+++ b/examples/qml/tutorials/samegame/samegame1/Block.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/qml/tutorials/samegame/samegame1/Button.qml
index 6d1d1268de..6d1d1268de 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/qml/tutorials/samegame/samegame1/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/qml/tutorials/samegame/samegame1/samegame.qml
index 73e2cc31fd..73e2cc31fd 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/qml/tutorials/samegame/samegame1/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/qml/tutorials/samegame/samegame1/samegame1.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject
+++ b/examples/qml/tutorials/samegame/samegame1/samegame1.qmlproject
diff --git a/examples/declarative/tutorials/samegame/samegame2/Block.qml b/examples/qml/tutorials/samegame/samegame2/Block.qml
index 8056b39480..8056b39480 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Block.qml
+++ b/examples/qml/tutorials/samegame/samegame2/Block.qml
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/qml/tutorials/samegame/samegame2/Button.qml
index 248c20cf0f..248c20cf0f 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/qml/tutorials/samegame/samegame2/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/qml/tutorials/samegame/samegame2/samegame.js
index c749dc17b1..c749dc17b1 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.js
+++ b/examples/qml/tutorials/samegame/samegame2/samegame.js
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/qml/tutorials/samegame/samegame2/samegame.qml
index c50010e97d..c50010e97d 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/qml/tutorials/samegame/samegame2/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/qml/tutorials/samegame/samegame2/samegame2.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject
+++ b/examples/qml/tutorials/samegame/samegame2/samegame2.qmlproject
diff --git a/examples/declarative/tutorials/samegame/samegame3/Block.qml b/examples/qml/tutorials/samegame/samegame3/Block.qml
index 9c41048fcb..9c41048fcb 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Block.qml
+++ b/examples/qml/tutorials/samegame/samegame3/Block.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/qml/tutorials/samegame/samegame3/Button.qml
index 248c20cf0f..248c20cf0f 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/qml/tutorials/samegame/samegame3/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/qml/tutorials/samegame/samegame3/Dialog.qml
index df1fa37d6a..df1fa37d6a 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/qml/tutorials/samegame/samegame3/Dialog.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/qml/tutorials/samegame/samegame3/samegame.js
index df5bdfb049..df5bdfb049 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/qml/tutorials/samegame/samegame3/samegame.js
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/qml/tutorials/samegame/samegame3/samegame.qml
index f14829ef63..f14829ef63 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/qml/tutorials/samegame/samegame3/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/qml/tutorials/samegame/samegame3/samegame3.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject
+++ b/examples/qml/tutorials/samegame/samegame3/samegame3.qmlproject
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/qml/tutorials/samegame/samegame4/content/BoomBlock.qml
index 3786b9c0d1..3786b9c0d1 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/qml/tutorials/samegame/samegame4/content/BoomBlock.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/qml/tutorials/samegame/samegame4/content/Button.qml
index 248c20cf0f..248c20cf0f 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/qml/tutorials/samegame/samegame4/content/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/qml/tutorials/samegame/samegame4/content/Dialog.qml
index 984b3ddb6a..984b3ddb6a 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/qml/tutorials/samegame/samegame4/content/Dialog.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/qml/tutorials/samegame/samegame4/content/samegame.js
index 7bb7243914..7bb7243914 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/qml/tutorials/samegame/samegame4/content/samegame.js
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/README b/examples/qml/tutorials/samegame/samegame4/highscores/README
index eaa00fae37..eaa00fae37 100644
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/README
+++ b/examples/qml/tutorials/samegame/samegame4/highscores/README
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/qml/tutorials/samegame/samegame4/highscores/score_data.xml
index c3fd90d9cf..c3fd90d9cf 100755
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml
+++ b/examples/qml/tutorials/samegame/samegame4/highscores/score_data.xml
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/qml/tutorials/samegame/samegame4/highscores/score_style.xsl
index 670354c965..670354c965 100755
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl
+++ b/examples/qml/tutorials/samegame/samegame4/highscores/score_style.xsl
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php b/examples/qml/tutorials/samegame/samegame4/highscores/scores.php
index daf480e21b..daf480e21b 100755
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php
+++ b/examples/qml/tutorials/samegame/samegame4/highscores/scores.php
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/qml/tutorials/samegame/samegame4/samegame.qml
index c21b8de8bd..c21b8de8bd 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/qml/tutorials/samegame/samegame4/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/qml/tutorials/samegame/samegame4/samegame4.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject
+++ b/examples/qml/tutorials/samegame/samegame4/samegame4.qmlproject
diff --git a/examples/declarative/tutorials/samegame/shared/pics/background.jpg b/examples/qml/tutorials/samegame/shared/pics/background.jpg
index 903d395c8d..903d395c8d 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/background.jpg
+++ b/examples/qml/tutorials/samegame/shared/pics/background.jpg
diff --git a/examples/declarative/tutorials/samegame/shared/pics/blueStar.png b/examples/qml/tutorials/samegame/shared/pics/blueStar.png
index ff9588f80a..ff9588f80a 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/blueStar.png
+++ b/examples/qml/tutorials/samegame/shared/pics/blueStar.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/blueStone.png b/examples/qml/tutorials/samegame/shared/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/blueStone.png
+++ b/examples/qml/tutorials/samegame/shared/pics/blueStone.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/greenStar.png b/examples/qml/tutorials/samegame/shared/pics/greenStar.png
index cd06854719..cd06854719 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/greenStar.png
+++ b/examples/qml/tutorials/samegame/shared/pics/greenStar.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/greenStone.png b/examples/qml/tutorials/samegame/shared/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/greenStone.png
+++ b/examples/qml/tutorials/samegame/shared/pics/greenStone.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/redStar.png b/examples/qml/tutorials/samegame/shared/pics/redStar.png
index 0a4dffe583..0a4dffe583 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/redStar.png
+++ b/examples/qml/tutorials/samegame/shared/pics/redStar.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/redStone.png b/examples/qml/tutorials/samegame/shared/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/redStone.png
+++ b/examples/qml/tutorials/samegame/shared/pics/redStone.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/star.png b/examples/qml/tutorials/samegame/shared/pics/star.png
index defbde53ca..defbde53ca 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/star.png
+++ b/examples/qml/tutorials/samegame/shared/pics/star.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/yellowStone.png b/examples/qml/tutorials/samegame/shared/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/yellowStone.png
+++ b/examples/qml/tutorials/samegame/shared/pics/yellowStone.png
diff --git a/examples/declarative/tutorials/tutorials.pro b/examples/qml/tutorials/tutorials.pro
index 0a82c1e704..0a82c1e704 100644
--- a/examples/declarative/tutorials/tutorials.pro
+++ b/examples/qml/tutorials/tutorials.pro
diff --git a/examples/declarative/tutorials/tutorials.qmlproject b/examples/qml/tutorials/tutorials.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/tutorials/tutorials.qmlproject
+++ b/examples/qml/tutorials/tutorials.qmlproject
diff --git a/examples/declarative/twitter/TwitterCore/Button.qml b/examples/qml/twitter/TwitterCore/Button.qml
index 064fd4b277..353b993742 100644
--- a/examples/declarative/twitter/TwitterCore/Button.qml
+++ b/examples/qml/twitter/TwitterCore/Button.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/examples/declarative/twitter/TwitterCore/FatDelegate.qml b/examples/qml/twitter/TwitterCore/FatDelegate.qml
index 5fd0d1622b..4cb0dfc713 100644
--- a/examples/declarative/twitter/TwitterCore/FatDelegate.qml
+++ b/examples/qml/twitter/TwitterCore/FatDelegate.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/examples/declarative/twitter/TwitterCore/Input.qml b/examples/qml/twitter/TwitterCore/Input.qml
index 2987b9e5d8..68b1c6186a 100644
--- a/examples/declarative/twitter/TwitterCore/Input.qml
+++ b/examples/qml/twitter/TwitterCore/Input.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/examples/declarative/twitter/TwitterCore/Loading.qml b/examples/qml/twitter/TwitterCore/Loading.qml
index 8f7c868bee..566857b8b2 100644
--- a/examples/declarative/twitter/TwitterCore/Loading.qml
+++ b/examples/qml/twitter/TwitterCore/Loading.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/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml b/examples/qml/twitter/TwitterCore/MultiTitleBar.qml
index f52ce5be26..3920520b7a 100644
--- a/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml
+++ b/examples/qml/twitter/TwitterCore/MultiTitleBar.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/examples/declarative/twitter/TwitterCore/RssModel.qml b/examples/qml/twitter/TwitterCore/RssModel.qml
index c4050994e6..27f7495be2 100644
--- a/examples/declarative/twitter/TwitterCore/RssModel.qml
+++ b/examples/qml/twitter/TwitterCore/RssModel.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/examples/declarative/twitter/TwitterCore/SearchView.qml b/examples/qml/twitter/TwitterCore/SearchView.qml
index 82a8559889..7732e6f68d 100644
--- a/examples/declarative/twitter/TwitterCore/SearchView.qml
+++ b/examples/qml/twitter/TwitterCore/SearchView.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/examples/declarative/twitter/TwitterCore/TitleBar.qml b/examples/qml/twitter/TwitterCore/TitleBar.qml
index 3624048c4d..3e0818b0dd 100644
--- a/examples/declarative/twitter/TwitterCore/TitleBar.qml
+++ b/examples/qml/twitter/TwitterCore/TitleBar.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/examples/declarative/twitter/TwitterCore/ToolBar.qml b/examples/qml/twitter/TwitterCore/ToolBar.qml
index 06d3324ee3..d4265f3e98 100644
--- a/examples/declarative/twitter/TwitterCore/ToolBar.qml
+++ b/examples/qml/twitter/TwitterCore/ToolBar.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/examples/declarative/twitter/TwitterCore/UserModel.qml b/examples/qml/twitter/TwitterCore/UserModel.qml
index f88837c344..428089b539 100644
--- a/examples/declarative/twitter/TwitterCore/UserModel.qml
+++ b/examples/qml/twitter/TwitterCore/UserModel.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/examples/declarative/twitter/TwitterCore/images/gloss.png b/examples/qml/twitter/TwitterCore/images/gloss.png
index 5d370cd93d..5d370cd93d 100644
--- a/examples/declarative/twitter/TwitterCore/images/gloss.png
+++ b/examples/qml/twitter/TwitterCore/images/gloss.png
diff --git a/examples/declarative/twitter/TwitterCore/images/lineedit.png b/examples/qml/twitter/TwitterCore/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100644
--- a/examples/declarative/twitter/TwitterCore/images/lineedit.png
+++ b/examples/qml/twitter/TwitterCore/images/lineedit.png
diff --git a/examples/declarative/twitter/TwitterCore/images/lineedit.sci b/examples/qml/twitter/TwitterCore/images/lineedit.sci
index 054bff78be..054bff78be 100644
--- a/examples/declarative/twitter/TwitterCore/images/lineedit.sci
+++ b/examples/qml/twitter/TwitterCore/images/lineedit.sci
diff --git a/examples/declarative/twitter/TwitterCore/images/loading.png b/examples/qml/twitter/TwitterCore/images/loading.png
index 47a1589c5d..47a1589c5d 100644
--- a/examples/declarative/twitter/TwitterCore/images/loading.png
+++ b/examples/qml/twitter/TwitterCore/images/loading.png
diff --git a/examples/declarative/twitter/TwitterCore/images/quit.png b/examples/qml/twitter/TwitterCore/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100644
--- a/examples/declarative/twitter/TwitterCore/images/quit.png
+++ b/examples/qml/twitter/TwitterCore/images/quit.png
diff --git a/examples/declarative/twitter/TwitterCore/images/stripes.png b/examples/qml/twitter/TwitterCore/images/stripes.png
index 9f36727ea4..9f36727ea4 100644
--- a/examples/declarative/twitter/TwitterCore/images/stripes.png
+++ b/examples/qml/twitter/TwitterCore/images/stripes.png
diff --git a/examples/declarative/twitter/TwitterCore/images/titlebar.png b/examples/qml/twitter/TwitterCore/images/titlebar.png
index 51c90082d0..51c90082d0 100644
--- a/examples/declarative/twitter/TwitterCore/images/titlebar.png
+++ b/examples/qml/twitter/TwitterCore/images/titlebar.png
diff --git a/examples/declarative/twitter/TwitterCore/images/titlebar.sci b/examples/qml/twitter/TwitterCore/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100644
--- a/examples/declarative/twitter/TwitterCore/images/titlebar.sci
+++ b/examples/qml/twitter/TwitterCore/images/titlebar.sci
diff --git a/examples/declarative/twitter/TwitterCore/images/toolbutton.png b/examples/qml/twitter/TwitterCore/images/toolbutton.png
index 11310013ee..11310013ee 100644
--- a/examples/declarative/twitter/TwitterCore/images/toolbutton.png
+++ b/examples/qml/twitter/TwitterCore/images/toolbutton.png
diff --git a/examples/declarative/twitter/TwitterCore/images/toolbutton.sci b/examples/qml/twitter/TwitterCore/images/toolbutton.sci
index 9e4f965307..9e4f965307 100644
--- a/examples/declarative/twitter/TwitterCore/images/toolbutton.sci
+++ b/examples/qml/twitter/TwitterCore/images/toolbutton.sci
diff --git a/examples/declarative/twitter/TwitterCore/qmldir b/examples/qml/twitter/TwitterCore/qmldir
index 452a648b23..452a648b23 100644
--- a/examples/declarative/twitter/TwitterCore/qmldir
+++ b/examples/qml/twitter/TwitterCore/qmldir
diff --git a/examples/declarative/twitter/twitter.qml b/examples/qml/twitter/twitter.qml
index 26e4a7079b..aca0968cfb 100644
--- a/examples/declarative/twitter/twitter.qml
+++ b/examples/qml/twitter/twitter.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/examples/declarative/twitter/twitter.qmlproject b/examples/qml/twitter/twitter.qmlproject
index b14f71fdfd..b14f71fdfd 100644
--- a/examples/declarative/twitter/twitter.qmlproject
+++ b/examples/qml/twitter/twitter.qmlproject
diff --git a/examples/declarative/ui-components/dialcontrol/content/Dial.qml b/examples/qml/ui-components/dialcontrol/content/Dial.qml
index c61adee364..c61adee364 100644
--- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml
+++ b/examples/qml/ui-components/dialcontrol/content/Dial.qml
diff --git a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml b/examples/qml/ui-components/dialcontrol/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
+++ b/examples/qml/ui-components/dialcontrol/content/QuitButton.qml
diff --git a/examples/declarative/ui-components/dialcontrol/content/background.png b/examples/qml/ui-components/dialcontrol/content/background.png
index 75d555d7ab..75d555d7ab 100644
--- a/examples/declarative/ui-components/dialcontrol/content/background.png
+++ b/examples/qml/ui-components/dialcontrol/content/background.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/needle.png b/examples/qml/ui-components/dialcontrol/content/needle.png
index 2d19f75039..2d19f75039 100644
--- a/examples/declarative/ui-components/dialcontrol/content/needle.png
+++ b/examples/qml/ui-components/dialcontrol/content/needle.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png b/examples/qml/ui-components/dialcontrol/content/needle_shadow.png
index 8d8a928cc5..8d8a928cc5 100644
--- a/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png
+++ b/examples/qml/ui-components/dialcontrol/content/needle_shadow.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/overlay.png b/examples/qml/ui-components/dialcontrol/content/overlay.png
index 3860a7b590..3860a7b590 100644
--- a/examples/declarative/ui-components/dialcontrol/content/overlay.png
+++ b/examples/qml/ui-components/dialcontrol/content/overlay.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/quit.png b/examples/qml/ui-components/dialcontrol/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/ui-components/dialcontrol/content/quit.png
+++ b/examples/qml/ui-components/dialcontrol/content/quit.png
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/qml/ui-components/dialcontrol/dialcontrol.qml
index d645b34aa4..d645b34aa4 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/qml/ui-components/dialcontrol/dialcontrol.qml
diff --git a/examples/declarative/ui-components/flipable/content/5_heart.png b/examples/qml/ui-components/flipable/content/5_heart.png
index fb59d81453..fb59d81453 100644
--- a/examples/declarative/ui-components/flipable/content/5_heart.png
+++ b/examples/qml/ui-components/flipable/content/5_heart.png
diff --git a/examples/declarative/ui-components/flipable/content/9_club.png b/examples/qml/ui-components/flipable/content/9_club.png
index 2545001904..2545001904 100644
--- a/examples/declarative/ui-components/flipable/content/9_club.png
+++ b/examples/qml/ui-components/flipable/content/9_club.png
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/qml/ui-components/flipable/content/Card.qml
index 6006ea14fc..6006ea14fc 100644
--- a/examples/declarative/ui-components/flipable/content/Card.qml
+++ b/examples/qml/ui-components/flipable/content/Card.qml
diff --git a/examples/declarative/ui-components/flipable/content/back.png b/examples/qml/ui-components/flipable/content/back.png
index f715d7487e..f715d7487e 100644
--- a/examples/declarative/ui-components/flipable/content/back.png
+++ b/examples/qml/ui-components/flipable/content/back.png
diff --git a/examples/declarative/ui-components/flipable/flipable.qml b/examples/qml/ui-components/flipable/flipable.qml
index 4af64afc53..4af64afc53 100644
--- a/examples/declarative/ui-components/flipable/flipable.qml
+++ b/examples/qml/ui-components/flipable/flipable.qml
diff --git a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml b/examples/qml/ui-components/progressbar/content/ProgressBar.qml
index c9be8d7336..c9be8d7336 100644
--- a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
+++ b/examples/qml/ui-components/progressbar/content/ProgressBar.qml
diff --git a/examples/declarative/ui-components/progressbar/content/background.png b/examples/qml/ui-components/progressbar/content/background.png
index 9044226f85..9044226f85 100644
--- a/examples/declarative/ui-components/progressbar/content/background.png
+++ b/examples/qml/ui-components/progressbar/content/background.png
diff --git a/examples/declarative/ui-components/progressbar/main.qml b/examples/qml/ui-components/progressbar/main.qml
index 367e4c1265..367e4c1265 100644
--- a/examples/declarative/ui-components/progressbar/main.qml
+++ b/examples/qml/ui-components/progressbar/main.qml
diff --git a/examples/declarative/ui-components/scrollbar/ScrollBar.qml b/examples/qml/ui-components/scrollbar/ScrollBar.qml
index a3d0d3841c..a3d0d3841c 100644
--- a/examples/declarative/ui-components/scrollbar/ScrollBar.qml
+++ b/examples/qml/ui-components/scrollbar/ScrollBar.qml
diff --git a/examples/declarative/ui-components/scrollbar/main.qml b/examples/qml/ui-components/scrollbar/main.qml
index a7d602b437..a7d602b437 100644
--- a/examples/declarative/ui-components/scrollbar/main.qml
+++ b/examples/qml/ui-components/scrollbar/main.qml
diff --git a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg b/examples/qml/ui-components/scrollbar/pics/niagara_falls.jpg
index e625c0d3e6..e625c0d3e6 100644
--- a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg
+++ b/examples/qml/ui-components/scrollbar/pics/niagara_falls.jpg
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject b/examples/qml/ui-components/scrollbar/scrollbar.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
+++ b/examples/qml/ui-components/scrollbar/scrollbar.qmlproject
diff --git a/examples/declarative/ui-components/searchbox/SearchBox.qml b/examples/qml/ui-components/searchbox/SearchBox.qml
index 6f6f486412..6f6f486412 100644
--- a/examples/declarative/ui-components/searchbox/SearchBox.qml
+++ b/examples/qml/ui-components/searchbox/SearchBox.qml
diff --git a/examples/declarative/ui-components/searchbox/images/clear.png b/examples/qml/ui-components/searchbox/images/clear.png
index 91eb270695..91eb270695 100644
--- a/examples/declarative/ui-components/searchbox/images/clear.png
+++ b/examples/qml/ui-components/searchbox/images/clear.png
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png b/examples/qml/ui-components/searchbox/images/lineedit-bg-focus.png
index bbfac38d2d..bbfac38d2d 100644
--- a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png
+++ b/examples/qml/ui-components/searchbox/images/lineedit-bg-focus.png
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png b/examples/qml/ui-components/searchbox/images/lineedit-bg.png
index 9044226f85..9044226f85 100644
--- a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png
+++ b/examples/qml/ui-components/searchbox/images/lineedit-bg.png
diff --git a/examples/declarative/ui-components/searchbox/main.qml b/examples/qml/ui-components/searchbox/main.qml
index 6e9731cf9c..6e9731cf9c 100644
--- a/examples/declarative/ui-components/searchbox/main.qml
+++ b/examples/qml/ui-components/searchbox/main.qml
diff --git a/examples/declarative/ui-components/searchbox/searchbox.qmlproject b/examples/qml/ui-components/searchbox/searchbox.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/searchbox/searchbox.qmlproject
+++ b/examples/qml/ui-components/searchbox/searchbox.qmlproject
diff --git a/examples/declarative/ui-components/slideswitch/content/Switch.qml b/examples/qml/ui-components/slideswitch/content/Switch.qml
index 981fc16673..981fc16673 100644
--- a/examples/declarative/ui-components/slideswitch/content/Switch.qml
+++ b/examples/qml/ui-components/slideswitch/content/Switch.qml
diff --git a/examples/declarative/ui-components/slideswitch/content/background.png b/examples/qml/ui-components/slideswitch/content/background.png
index d736815870..d736815870 100644
--- a/examples/declarative/ui-components/slideswitch/content/background.png
+++ b/examples/qml/ui-components/slideswitch/content/background.png
diff --git a/examples/declarative/ui-components/slideswitch/content/background.svg b/examples/qml/ui-components/slideswitch/content/background.svg
index f920d3e47a..f920d3e47a 100644
--- a/examples/declarative/ui-components/slideswitch/content/background.svg
+++ b/examples/qml/ui-components/slideswitch/content/background.svg
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.png b/examples/qml/ui-components/slideswitch/content/knob.png
index ee0a436f84..ee0a436f84 100644
--- a/examples/declarative/ui-components/slideswitch/content/knob.png
+++ b/examples/qml/ui-components/slideswitch/content/knob.png
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.svg b/examples/qml/ui-components/slideswitch/content/knob.svg
index fb6933718e..fb6933718e 100644
--- a/examples/declarative/ui-components/slideswitch/content/knob.svg
+++ b/examples/qml/ui-components/slideswitch/content/knob.svg
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qml b/examples/qml/ui-components/slideswitch/slideswitch.qml
index 60a331407c..60a331407c 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.qml
+++ b/examples/qml/ui-components/slideswitch/slideswitch.qml
diff --git a/examples/declarative/ui-components/spinner/content/Spinner.qml b/examples/qml/ui-components/spinner/content/Spinner.qml
index d7bbeb33ee..d7bbeb33ee 100644
--- a/examples/declarative/ui-components/spinner/content/Spinner.qml
+++ b/examples/qml/ui-components/spinner/content/Spinner.qml
diff --git a/examples/declarative/ui-components/spinner/content/spinner-bg.png b/examples/qml/ui-components/spinner/content/spinner-bg.png
index b3556f1f9f..b3556f1f9f 100644
--- a/examples/declarative/ui-components/spinner/content/spinner-bg.png
+++ b/examples/qml/ui-components/spinner/content/spinner-bg.png
diff --git a/examples/declarative/ui-components/spinner/content/spinner-select.png b/examples/qml/ui-components/spinner/content/spinner-select.png
index 95a17a1fe2..95a17a1fe2 100644
--- a/examples/declarative/ui-components/spinner/content/spinner-select.png
+++ b/examples/qml/ui-components/spinner/content/spinner-select.png
diff --git a/examples/declarative/ui-components/spinner/main.qml b/examples/qml/ui-components/spinner/main.qml
index 7584c98396..7584c98396 100644
--- a/examples/declarative/ui-components/spinner/main.qml
+++ b/examples/qml/ui-components/spinner/main.qml
diff --git a/examples/declarative/ui-components/spinner/spinner.qmlproject b/examples/qml/ui-components/spinner/spinner.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/spinner/spinner.qmlproject
+++ b/examples/qml/ui-components/spinner/spinner.qmlproject
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/qml/ui-components/tabwidget/TabWidget.qml
index 560ed1f58a..560ed1f58a 100644
--- a/examples/declarative/ui-components/tabwidget/TabWidget.qml
+++ b/examples/qml/ui-components/tabwidget/TabWidget.qml
diff --git a/examples/declarative/ui-components/tabwidget/main.qml b/examples/qml/ui-components/tabwidget/main.qml
index df99c11b7d..df99c11b7d 100644
--- a/examples/declarative/ui-components/tabwidget/main.qml
+++ b/examples/qml/ui-components/tabwidget/main.qml
diff --git a/examples/declarative/ui-components/tabwidget/tab.png b/examples/qml/ui-components/tabwidget/tab.png
index ad8021605f..ad8021605f 100644
--- a/examples/declarative/ui-components/tabwidget/tab.png
+++ b/examples/qml/ui-components/tabwidget/tab.png
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject b/examples/qml/ui-components/tabwidget/tabwidget.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
+++ b/examples/qml/ui-components/tabwidget/tabwidget.qmlproject
diff --git a/examples/declarative/window/Window.qml b/examples/qml/window/Window.qml
index 48478458c6..48478458c6 100644
--- a/examples/declarative/window/Window.qml
+++ b/examples/qml/window/Window.qml
diff --git a/examples/declarative/window/screen/screenInfo.qml b/examples/qml/window/screen/screenInfo.qml
index 54299ba4e0..54299ba4e0 100644
--- a/examples/declarative/window/screen/screenInfo.qml
+++ b/examples/qml/window/screen/screenInfo.qml
diff --git a/examples/declarative/window/standalone.qml b/examples/qml/window/standalone.qml
index 335cf7b635..335cf7b635 100644
--- a/examples/declarative/window/standalone.qml
+++ b/examples/qml/window/standalone.qml
diff --git a/examples/declarative/window/window.cpp b/examples/qml/window/window.cpp
index 4854256190..2112ab8f45 100644
--- a/examples/declarative/window/window.cpp
+++ b/examples/qml/window/window.cpp
@@ -39,16 +39,16 @@
 ****************************************************************************/
 
 #include <QtGui/QGuiApplication>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeComponent>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlComponent>
 #include <QtCore/QUrl>
 #include <QDebug>
 
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine);
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
     component.loadUrl(QUrl::fromLocalFile("Window.qml"));
     if ( component.isReady() )
         component.create();
diff --git a/examples/declarative/window/window.pro b/examples/qml/window/window.pro
index 74804bd776..c4518418f6 100644
--- a/examples/declarative/window/window.pro
+++ b/examples/qml/window/window.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
 CONFIG += qt
-QT += declarative
+QT += qml
 
 SOURCES += window.cpp
diff --git a/examples/declarative/xml/xmlhttprequest/data.xml b/examples/qml/xml/xmlhttprequest/data.xml
index 8b7f1e116d..8b7f1e116d 100644
--- a/examples/declarative/xml/xmlhttprequest/data.xml
+++ b/examples/qml/xml/xmlhttprequest/data.xml
diff --git a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml b/examples/qml/xml/xmlhttprequest/xmlhttprequest-example.qml
index 28ba078160..28ba078160 100644
--- a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
+++ b/examples/qml/xml/xmlhttprequest/xmlhttprequest-example.qml
diff --git a/examples/tutorials/gettingStartedQml/core/Button.qml b/examples/tutorials/gettingStartedQml/core/Button.qml
index 41be4134bd..9ea8c6dfff 100644
--- a/examples/tutorials/gettingStartedQml/core/Button.qml
+++ b/examples/tutorials/gettingStartedQml/core/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/core/EditMenu.qml b/examples/tutorials/gettingStartedQml/core/EditMenu.qml
index 7471669a37..dcac7bd29a 100644
--- a/examples/tutorials/gettingStartedQml/core/EditMenu.qml
+++ b/examples/tutorials/gettingStartedQml/core/EditMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/core/FileDialog.qml b/examples/tutorials/gettingStartedQml/core/FileDialog.qml
index 2d08e19bcf..0a4341b868 100644
--- a/examples/tutorials/gettingStartedQml/core/FileDialog.qml
+++ b/examples/tutorials/gettingStartedQml/core/FileDialog.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/core/FileMenu.qml b/examples/tutorials/gettingStartedQml/core/FileMenu.qml
index 67d747d8fb..a4be5eff15 100644
--- a/examples/tutorials/gettingStartedQml/core/FileMenu.qml
+++ b/examples/tutorials/gettingStartedQml/core/FileMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/core/MenuBar.qml b/examples/tutorials/gettingStartedQml/core/MenuBar.qml
index 68e25899e3..8d7be29fdd 100644
--- a/examples/tutorials/gettingStartedQml/core/MenuBar.qml
+++ b/examples/tutorials/gettingStartedQml/core/MenuBar.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/core/TextArea.qml b/examples/tutorials/gettingStartedQml/core/TextArea.qml
index 2ca145260c..99fb5ca60c 100644
--- a/examples/tutorials/gettingStartedQml/core/TextArea.qml
+++ b/examples/tutorials/gettingStartedQml/core/TextArea.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
index 6bc3d4d006..c8538958ac 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
+++ b/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -41,7 +41,7 @@
 #include "dialogPlugin.h"
 #include "directory.h"
 #include "file.h"
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 void DialogPlugin::registerTypes(const char *uri)
 {
diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
index 03bdc1a6e4..1aed6abc8e 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
+++ b/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -41,14 +41,14 @@
 #ifndef DIALOGPLUGIN_H
 #define DIALOGPLUGIN_H
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtQml/QQmlExtensionPlugin>
 
-class DialogPlugin : public QDeclarativeExtensionPlugin
+class DialogPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 
     public:
-        //registerTypes is inherited from QDeclarativeExtensionPlugin
+        //registerTypes is inherited from QQmlExtensionPlugin
         void registerTypes(const char *uri);
 
 };
diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp b/examples/tutorials/gettingStartedQml/filedialog/directory.cpp
index 3253327cb4..eadc11e52f 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp
+++ b/examples/tutorials/gettingStartedQml/filedialog/directory.cpp
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -72,7 +72,7 @@ int Directory::filesCount() const
 /*
 Function called to append data onto list property
 */
-void appendFiles(QDeclarativeListProperty<File> * property, File * file)
+void appendFiles(QQmlListProperty<File> * property, File * file)
 {
     Q_UNUSED(property);
     Q_UNUSED(file);
@@ -82,7 +82,7 @@ void appendFiles(QDeclarativeListProperty<File> * property, File * file)
 /*
 Function called to retrieve file in the list using an index
 */
-File* fileAt(QDeclarativeListProperty<File> * property, int index)
+File* fileAt(QQmlListProperty<File> * property, int index)
 {
     return static_cast< QList<File *> *>(property->data)->at(index);
 }
@@ -90,7 +90,7 @@ File* fileAt(QDeclarativeListProperty<File> * property, int index)
 /*
 Returns the number of files in the list
 */
-int filesSize(QDeclarativeListProperty<File> * property) 
+int filesSize(QQmlListProperty<File> * property) 
 {
     return static_cast< QList<File *> *>(property->data)->size();
 }
@@ -98,18 +98,18 @@ int filesSize(QDeclarativeListProperty<File> * property)
 /*
 Function called to empty the list property contents
 */
-void clearFilesPtr(QDeclarativeListProperty<File> *property)
+void clearFilesPtr(QQmlListProperty<File> *property)
 {
     return static_cast< QList<File *> *>(property->data)->clear();
 }
 
 /*
-Returns the list of files as a QDeclarativeListProperty.
+Returns the list of files as a QQmlListProperty.
 */
-QDeclarativeListProperty<File> Directory::files()
+QQmlListProperty<File> Directory::files()
 {
     refresh();
-    return QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt,  &clearFilesPtr );
+    return QQmlListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt,  &clearFilesPtr );
 }
 
 /*
diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.h b/examples/tutorials/gettingStartedQml/filedialog/directory.h
index 04317707c3..30d6751bd2 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/directory.h
+++ b/examples/tutorials/gettingStartedQml/filedialog/directory.h
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -46,7 +46,7 @@
 #include <QDir>
 #include <QStringList>
 #include <QTextStream>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include <QObject>
 
 class Directory : public QObject {
@@ -57,7 +57,7 @@ class Directory : public QObject {
     Q_PROPERTY(int filesCount READ filesCount)
 
     //list property containing file names as QString
-    Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT )
+    Q_PROPERTY(QQmlListProperty<File> files READ files CONSTANT )
 
     //file name of the text file to read/write
     Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged)
@@ -72,7 +72,7 @@ class Directory : public QObject {
         int filesCount() const;
         QString filename() const;
         QString fileContent() const;
-        QDeclarativeListProperty<File> files();
+        QQmlListProperty<File> files();
 
         //properties' write functions
         void setFilename(const QString &str);
diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.cpp b/examples/tutorials/gettingStartedQml/filedialog/file.cpp
index 120486315b..e3b22027f5 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/file.cpp
+++ b/examples/tutorials/gettingStartedQml/filedialog/file.cpp
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.h b/examples/tutorials/gettingStartedQml/filedialog/file.h
index 6b8806ee32..d13638b414 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/file.h
+++ b/examples/tutorials/gettingStartedQml/filedialog/file.h
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
index d85787d00c..85edb40257 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += qml
 
 DESTDIR +=  ../plugins
 OBJECTS_DIR = tmp
diff --git a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml b/examples/tutorials/gettingStartedQml/parts/part0/Button.qml
index 3097a7615c..6cae3f3ab3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part0/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml b/examples/tutorials/gettingStartedQml/parts/part1/Button.qml
index 70f7508de3..118e6fc4d3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part1/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml b/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
index 5d14fc4f69..231a20a3a2 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml b/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
index ddb6df438c..c36f6d4734 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml b/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
index e0f377cfe5..f43a56ea7a 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml b/examples/tutorials/gettingStartedQml/parts/part2/Button.qml
index 65660b0cc1..aa178f8bf9 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part2/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml b/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
index 2a4c0a2834..fb2db7ade3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml b/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
index 3f60bc6c2a..b715298147 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml b/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
index 99151ff9b0..408b561022 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml b/examples/tutorials/gettingStartedQml/parts/part3/Button.qml
index 65660b0cc1..aa178f8bf9 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part3/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml b/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
index 2a4c0a2834..fb2db7ade3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml b/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
index 3f60bc6c2a..b715298147 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml b/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
index 99151ff9b0..408b561022 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml b/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml
index faee31e97c..279ae045c3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part3/TextArea.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml b/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
index c14437dcd0..54fa115aec 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml b/examples/tutorials/gettingStartedQml/parts/part4/Button.qml
index 5572989f5d..7fb4f1e536 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml b/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
index 07282733f7..cdfbd30a06 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml b/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
index 1aa98a9498..a1d95bf87a 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml b/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
index ba1697f6f8..024c60f87c 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml b/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
index 11864d337e..0216131819 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml b/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml
index b3b1e07294..de664a15fd 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/TextArea.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml b/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
index 13735b35c9..43a6bc0eea 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml b/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
index b517971c55..50501ddadc 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml
index 628af3a835..f6dd54ac9a 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/core/Button.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
index a92e51eb94..fe4bbf4cb2 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
index eeea0d2304..af83ef5e63 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
index 2a33a30d43..57555010b6 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
index 81898ea86b..4a13f59dac 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
index 0d77c30317..0882633c59 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
+++ b/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
index e4692b0a47..bd5c3f7428 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -41,7 +41,7 @@
 #include "dialogPlugin.h"
 #include "directory.h"
 #include "file.h"
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 void DialogPlugin::registerTypes(const char *uri){
     
@@ -49,7 +49,7 @@ void DialogPlugin::registerTypes(const char *uri){
     qmlRegisterType<Directory>(uri, 1, 0, "Directory");
     qmlRegisterType<File>(uri,1,0,"File");
     
-    //qRegisterMetaType<QDeclarativeListProperty<QString> > ("QDeclarativeListProperty<QString>");
+    //qRegisterMetaType<QQmlListProperty<QString> > ("QQmlListProperty<QString>");
         
 }
 
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
index b46d252616..8d5459a543 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -41,14 +41,14 @@
 #ifndef DIALOGPLUGIN_H
 #define DIALOGPLUGIN_H
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtQml/QQmlExtensionPlugin>
 
-class DialogPlugin : public QDeclarativeExtensionPlugin
+class DialogPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     
     public:
-        //registerTypes is inherited from QDeclarativeExtensionPlugin
+        //registerTypes is inherited from QQmlExtensionPlugin
         void registerTypes(const char *uri);
         
 };
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
index b2984d3c2d..2247360017 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -74,39 +74,39 @@ int Directory::    filesCount() const{
 /*
 Function called to append data onto list property
 */
-void appendFiles(QDeclarativeListProperty<File> * property, File * file){
+void appendFiles(QQmlListProperty<File> * property, File * file){
     //Do nothing. can't add to a directory using this method
 }
 
 /*
 Function called to retrieve file in the list using an index
 */
-File* fileAt(QDeclarativeListProperty<File> * property, int index){
+File* fileAt(QQmlListProperty<File> * property, int index){
     return static_cast< QList<File *> *>(property->data)->at(index);
 }
 
 /*
 Returns the number of files in the list
 */
-int filesSize(QDeclarativeListProperty<File> * property){
+int filesSize(QQmlListProperty<File> * property){
     return static_cast< QList<File *> *>(property->data)->size();
 }
 
 /*
 Function called to empty the list property contents
 */
-void clearFilesPtr(QDeclarativeListProperty<File> *property){
+void clearFilesPtr(QQmlListProperty<File> *property){
     return static_cast< QList<File *> *>(property->data)->clear();
 }
 
 /*
-Returns the list of files as a QDeclarativeListProperty.
+Returns the list of files as a QQmlListProperty.
 */
-QDeclarativeListProperty<File> Directory::files(){
+QQmlListProperty<File> Directory::files(){
 
     refresh();
-//     return QDeclarativeListProperty<QString>(this,m_filePtrList);        //not recommended in the docs
-    return QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt,  &clearFilesPtr );
+//     return QQmlListProperty<QString>(this,m_filePtrList);        //not recommended in the docs
+    return QQmlListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt,  &clearFilesPtr );
 }
 
 /*
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
index 53872f257b..a47e9e112f 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -46,7 +46,7 @@
 #include <QDir>
 #include <QStringList>
 #include <QTextStream>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include <QObject>
 
 class Directory : public QObject{
@@ -57,7 +57,7 @@ class Directory : public QObject{
     Q_PROPERTY(int filesCount READ filesCount)
         
     //list property containing file names as QString
-    Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT )
+    Q_PROPERTY(QQmlListProperty<File> files READ files CONSTANT )
     
     //file name of the text file to read/write
     Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged)
@@ -72,7 +72,7 @@ class Directory : public QObject{
         int filesCount() const;
         QString filename() const;
         QString fileContent() const;
-        QDeclarativeListProperty<File> files();
+        QQmlListProperty<File> files();
 
         //properties' write functions
         void setFilename(const QString &str);
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
index c1b57297cf..2385ed3240 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
index d57595607c..251b45282d 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
@@ -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:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
index 6247747003..71abddc7e3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
+++ b/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += qml
 
 DESTDIR +=  ../plugins
 OBJECTS_DIR = tmp
diff --git a/examples/tutorials/gettingStartedQml/texteditor.qml b/examples/tutorials/gettingStartedQml/texteditor.qml
index 76d79b6b90..05358294f5 100644
--- a/examples/tutorials/gettingStartedQml/texteditor.qml
+++ b/examples/tutorials/gettingStartedQml/texteditor.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:BSD$
 ** You may use this file under the terms of the BSD license as follows: