Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDeclarativeXXX.

46 files changed, 129 insertions, 129 deletions

diff --git a/examples/declarative/extending/adding/main.cpp b/examples/declarative/extending/adding/main.cpp
index 0aeeecf..76e0736 100644
--- a/examples/declarative/extending/adding/main.cpp
+++ b/examples/declarative/extending/adding/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "person.h"
 
@@ -50,8 +50,8 @@ int main(int argc, char ** argv)
 
     QML_REGISTER_TYPE(People, 1,0, Person, Person);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     Person *person = qobject_cast<Person *>(component.create());
     if (person) {
         qWarning() << "The person's name is" << person->name();
diff --git a/examples/declarative/extending/adding/person.h b/examples/declarative/extending/adding/person.h
index 691766b..fbaf2df 100644
--- a/examples/declarative/extending/adding/person.h
+++ b/examples/declarative/extending/adding/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 // ![0]
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/attached/birthdayparty.cpp b/examples/declarative/extending/attached/birthdayparty.cpp
index 293628e..d4f2675 100644
--- a/examples/declarative/extending/attached/birthdayparty.cpp
+++ b/examples/declarative/extending/attached/birthdayparty.cpp
@@ -70,9 +70,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/attached/birthdayparty.h b/examples/declarative/extending/attached/birthdayparty.h
index 9ba0f8b..d8ca2e1 100644
--- a/examples/declarative/extending/attached/birthdayparty.h
+++ b/examples/declarative/extending/attached/birthdayparty.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QDate>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -65,7 +65,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -73,7 +73,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/attached/main.cpp b/examples/declarative/extending/attached/main.cpp
index f4223a2..684d8d3 100644
--- a/examples/declarative/extending/attached/main.cpp
+++ b/examples/declarative/extending/attached/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/attached/person.h b/examples/declarative/extending/attached/person.h
index dd03091..0f86d8b 100644
--- a/examples/declarative/extending/attached/person.h
+++ b/examples/declarative/extending/attached/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/binding/birthdayparty.cpp b/examples/declarative/extending/binding/birthdayparty.cpp
index 392c59a..e5be2b9 100644
--- a/examples/declarative/extending/binding/birthdayparty.cpp
+++ b/examples/declarative/extending/binding/birthdayparty.cpp
@@ -76,9 +76,9 @@ void BirthdayParty::setCelebrant(Person *c)
     emit celebrantChanged();
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/binding/birthdayparty.h b/examples/declarative/extending/binding/birthdayparty.h
index 8bdb76a..8486442 100644
--- a/examples/declarative/extending/binding/birthdayparty.h
+++ b/examples/declarative/extending/binding/birthdayparty.h
@@ -44,7 +44,7 @@
 #include <QObject>
 #include <QDate>
 #include <QDebug>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -71,7 +71,7 @@ Q_OBJECT
 // ![0]
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant NOTIFY celebrantChanged)
 // ![0]
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_PROPERTY(QString speaker READ speaker WRITE setSpeaker)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
@@ -80,7 +80,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/binding/happybirthday.cpp b/examples/declarative/extending/binding/happybirthday.cpp
index 704d384..7d4d021 100644
--- a/examples/declarative/extending/binding/happybirthday.cpp
+++ b/examples/declarative/extending/binding/happybirthday.cpp
@@ -50,7 +50,7 @@ HappyBirthday::HappyBirthday(QObject *parent)
     timer->start(1000);
 }
 
-void HappyBirthday::setTarget(const QmlMetaProperty &p)
+void HappyBirthday::setTarget(const QDeclarativeMetaProperty &p)
 {
     m_target = p;
 }
diff --git a/examples/declarative/extending/binding/happybirthday.h b/examples/declarative/extending/binding/happybirthday.h
index 852bec7..ee4d1ec 100644
--- a/examples/declarative/extending/binding/happybirthday.h
+++ b/examples/declarative/extending/binding/happybirthday.h
@@ -41,20 +41,20 @@
 #ifndef HAPPYBIRTHDAY_H
 #define HAPPYBIRTHDAY_H
 
-#include <QmlPropertyValueSource>
-#include <QmlMetaProperty>
-#include <qml.h>
+#include <QDeclarativePropertyValueSource>
+#include <QDeclarativeMetaProperty>
+#include <qdeclarative.h>
 
 #include <QStringList>
 
-class HappyBirthday : public QObject, public QmlPropertyValueSource
+class HappyBirthday : public QObject, public QDeclarativePropertyValueSource
 {
 Q_OBJECT
 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
     HappyBirthday(QObject *parent = 0);
 
-    virtual void setTarget(const QmlMetaProperty &);
+    virtual void setTarget(const QDeclarativeMetaProperty &);
 
     QString name() const;
     void setName(const QString &);
@@ -67,7 +67,7 @@ signals:
 private:
     int m_line;
     QStringList m_lyrics;
-    QmlMetaProperty m_target;
+    QDeclarativeMetaProperty m_target;
     QString m_name;
 };
 QML_DECLARE_TYPE(HappyBirthday);
diff --git a/examples/declarative/extending/binding/main.cpp b/examples/declarative/extending/binding/main.cpp
index ea0e33a..873f8c9 100644
--- a/examples/declarative/extending/binding/main.cpp
+++ b/examples/declarative/extending/binding/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "happybirthday.h"
@@ -58,8 +58,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/binding/person.h b/examples/declarative/extending/binding/person.h
index e8aa6a8..1bec71c 100644
--- a/examples/declarative/extending/binding/person.h
+++ b/examples/declarative/extending/binding/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/coercion/birthdayparty.cpp b/examples/declarative/extending/coercion/birthdayparty.cpp
index f0eb599..523a42d 100644
--- a/examples/declarative/extending/coercion/birthdayparty.cpp
+++ b/examples/declarative/extending/coercion/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/coercion/birthdayparty.h b/examples/declarative/extending/coercion/birthdayparty.h
index 5a9eb08..fffd407 100644
--- a/examples/declarative/extending/coercion/birthdayparty.h
+++ b/examples/declarative/extending/coercion/birthdayparty.h
@@ -42,7 +42,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayParty : public QObject
@@ -50,7 +50,7 @@ class BirthdayParty : public QObject
 Q_OBJECT
 // ![0]
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 // ![0]
 public:
     BirthdayParty(QObject *parent = 0);
@@ -58,7 +58,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/coercion/main.cpp b/examples/declarative/extending/coercion/main.cpp
index b1a203f..1e2209f 100644
--- a/examples/declarative/extending/coercion/main.cpp
+++ b/examples/declarative/extending/coercion/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/coercion/person.h b/examples/declarative/extending/coercion/person.h
index 9bb9a3d..298ffb1 100644
--- a/examples/declarative/extending/coercion/person.h
+++ b/examples/declarative/extending/coercion/person.h
@@ -42,7 +42,7 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/default/birthdayparty.cpp b/examples/declarative/extending/default/birthdayparty.cpp
index f0eb599..523a42d 100644
--- a/examples/declarative/extending/default/birthdayparty.cpp
+++ b/examples/declarative/extending/default/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/default/birthdayparty.h b/examples/declarative/extending/default/birthdayparty.h
index f25f8c2..49c20bd 100644
--- a/examples/declarative/extending/default/birthdayparty.h
+++ b/examples/declarative/extending/default/birthdayparty.h
@@ -42,7 +42,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 // ![0]
@@ -50,7 +50,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -58,7 +58,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/default/main.cpp b/examples/declarative/extending/default/main.cpp
index ea51e00..7d7f8a1 100644
--- a/examples/declarative/extending/default/main.cpp
+++ b/examples/declarative/extending/default/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -54,8 +54,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/default/person.h b/examples/declarative/extending/default/person.h
index 884dda3..b3eceaa 100644
--- a/examples/declarative/extending/default/person.h
+++ b/examples/declarative/extending/default/person.h
@@ -42,7 +42,7 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/extending/extended/lineedit.cpp
index 0d8eb7f..417fbd9 100644
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ b/examples/declarative/extending/extended/lineedit.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "lineedit.h"
-#include <qml.h>
+#include <qdeclarative.h>
 
 LineEditExtension::LineEditExtension(QObject *object)
 : QObject(object), m_lineedit(static_cast<QLineEdit *>(object))
diff --git a/examples/declarative/extending/extended/main.cpp b/examples/declarative/extending/extended/main.cpp
index ad4bf50..5cbeea3 100644
--- a/examples/declarative/extending/extended/main.cpp
+++ b/examples/declarative/extending/extended/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include <QLineEdit>
 #include "lineedit.h"
@@ -51,8 +51,8 @@ int main(int argc, char ** argv)
 
     QML_REGISTER_EXTENDED_TYPE(People, 1,0, QLineEdit, QLineEdit, LineEditExtension);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     QLineEdit *edit = qobject_cast<QLineEdit *>(component.create());
 
     if (edit) {
diff --git a/examples/declarative/extending/grouped/birthdayparty.cpp b/examples/declarative/extending/grouped/birthdayparty.cpp
index f0eb599..523a42d 100644
--- a/examples/declarative/extending/grouped/birthdayparty.cpp
+++ b/examples/declarative/extending/grouped/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/grouped/birthdayparty.h b/examples/declarative/extending/grouped/birthdayparty.h
index fd0d955..42439c4 100644
--- a/examples/declarative/extending/grouped/birthdayparty.h
+++ b/examples/declarative/extending/grouped/birthdayparty.h
@@ -42,14 +42,14 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -57,7 +57,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/grouped/main.cpp b/examples/declarative/extending/grouped/main.cpp
index a8dafd9..15a0bb5 100644
--- a/examples/declarative/extending/grouped/main.cpp
+++ b/examples/declarative/extending/grouped/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -55,8 +55,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/grouped/person.h b/examples/declarative/extending/grouped/person.h
index 89ccedc..5dab378 100644
--- a/examples/declarative/extending/grouped/person.h
+++ b/examples/declarative/extending/grouped/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/extending/properties/birthdayparty.cpp
index 2fbdad9..14fd6a3 100644
--- a/examples/declarative/extending/properties/birthdayparty.cpp
+++ b/examples/declarative/extending/properties/birthdayparty.cpp
@@ -56,9 +56,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/properties/birthdayparty.h b/examples/declarative/extending/properties/birthdayparty.h
index e5d316c..c4cb536 100644
--- a/examples/declarative/extending/properties/birthdayparty.h
+++ b/examples/declarative/extending/properties/birthdayparty.h
@@ -42,7 +42,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 // ![0]
@@ -54,7 +54,7 @@ Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
 // ![1]
 // ![2]
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 // ![2]
 // ![3]
 public:
@@ -63,7 +63,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/properties/main.cpp b/examples/declarative/extending/properties/main.cpp
index 2211b89..ce69ad2 100644
--- a/examples/declarative/extending/properties/main.cpp
+++ b/examples/declarative/extending/properties/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -52,8 +52,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
     QML_REGISTER_TYPE(People, 1,0, Person, Person);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/properties/person.h b/examples/declarative/extending/properties/person.h
index 8d665f0..860a607 100644
--- a/examples/declarative/extending/properties/person.h
+++ b/examples/declarative/extending/properties/person.h
@@ -42,7 +42,7 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/signal/birthdayparty.cpp b/examples/declarative/extending/signal/birthdayparty.cpp
index d57e075..65ff530 100644
--- a/examples/declarative/extending/signal/birthdayparty.cpp
+++ b/examples/declarative/extending/signal/birthdayparty.cpp
@@ -71,9 +71,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/signal/birthdayparty.h b/examples/declarative/extending/signal/birthdayparty.h
index 30ed43b..bcdc513 100644
--- a/examples/declarative/extending/signal/birthdayparty.h
+++ b/examples/declarative/extending/signal/birthdayparty.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QDate>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -65,7 +65,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -73,7 +73,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/signal/main.cpp b/examples/declarative/extending/signal/main.cpp
index 9d8e253..afc1a66 100644
--- a/examples/declarative/extending/signal/main.cpp
+++ b/examples/declarative/extending/signal/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/signal/person.h b/examples/declarative/extending/signal/person.h
index dd03091..0f86d8b 100644
--- a/examples/declarative/extending/signal/person.h
+++ b/examples/declarative/extending/signal/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/valuesource/birthdayparty.cpp b/examples/declarative/extending/valuesource/birthdayparty.cpp
index 5b3fec1..99d98be 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.cpp
+++ b/examples/declarative/extending/valuesource/birthdayparty.cpp
@@ -71,9 +71,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/valuesource/birthdayparty.h b/examples/declarative/extending/valuesource/birthdayparty.h
index b5a0522..819a200 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.h
+++ b/examples/declarative/extending/valuesource/birthdayparty.h
@@ -44,7 +44,7 @@
 #include <QObject>
 #include <QDate>
 #include <QDebug>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -66,7 +66,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 // ![0]
 Q_PROPERTY(QString speaker READ speaker WRITE setSpeaker)
 // ![0]
@@ -77,7 +77,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/valuesource/happybirthday.cpp b/examples/declarative/extending/valuesource/happybirthday.cpp
index 306ec98..7b9d05a 100644
--- a/examples/declarative/extending/valuesource/happybirthday.cpp
+++ b/examples/declarative/extending/valuesource/happybirthday.cpp
@@ -50,7 +50,7 @@ HappyBirthday::HappyBirthday(QObject *parent)
     timer->start(1000);
 }
 
-void HappyBirthday::setTarget(const QmlMetaProperty &p)
+void HappyBirthday::setTarget(const QDeclarativeMetaProperty &p)
 {
     m_target = p;
 }
diff --git a/examples/declarative/extending/valuesource/happybirthday.h b/examples/declarative/extending/valuesource/happybirthday.h
index c02a7d7..44f55e4 100644
--- a/examples/declarative/extending/valuesource/happybirthday.h
+++ b/examples/declarative/extending/valuesource/happybirthday.h
@@ -41,13 +41,13 @@
 #ifndef HAPPYBIRTHDAY_H
 #define HAPPYBIRTHDAY_H
 
-#include <QmlPropertyValueSource>
-#include <qml.h>
+#include <QDeclarativePropertyValueSource>
+#include <qdeclarative.h>
 
 #include <QStringList>
 
 // ![0]
-class HappyBirthday : public QObject, public QmlPropertyValueSource
+class HappyBirthday : public QObject, public QDeclarativePropertyValueSource
 {
 Q_OBJECT
 // ![0]
@@ -56,7 +56,7 @@ Q_PROPERTY(QString name READ name WRITE setName)
 public:
     HappyBirthday(QObject *parent = 0);
 
-    virtual void setTarget(const QmlMetaProperty &);
+    virtual void setTarget(const QDeclarativeMetaProperty &);
 // ![1]
 
     QString name() const;
@@ -68,7 +68,7 @@ private slots:
 private:
     int m_line;
     QStringList m_lyrics;
-    QmlMetaProperty m_target;
+    QDeclarativeMetaProperty m_target;
     QString m_name;
 // ![2]
 };
diff --git a/examples/declarative/extending/valuesource/main.cpp b/examples/declarative/extending/valuesource/main.cpp
index ea0e33a..873f8c9 100644
--- a/examples/declarative/extending/valuesource/main.cpp
+++ b/examples/declarative/extending/valuesource/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "happybirthday.h"
@@ -58,8 +58,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/valuesource/person.h b/examples/declarative/extending/valuesource/person.h
index dd03091..0f86d8b 100644
--- a/examples/declarative/extending/valuesource/person.h
+++ b/examples/declarative/extending/valuesource/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/imageprovider/main.cpp b/examples/declarative/imageprovider/main.cpp
index eaaded2..d9d4c1a 100644
--- a/examples/declarative/imageprovider/main.cpp
+++ b/examples/declarative/imageprovider/main.cpp
@@ -41,22 +41,22 @@
 
 #include <QApplication>
 
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qml.h>
-#include <qmlgraphicsitem.h>
-#include <qmlimageprovider.h>
-#include <qmlview.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarative.h>
+#include <qdeclarativeitem.h>
+#include <qdeclarativeimageprovider.h>
+#include <qdeclarativeview.h>
 #include <QImage>
 #include <QPainter>
 
 /*
-   This example illustrates using a QmlImageProvider to serve
+   This example illustrates using a QDeclarativeImageProvider to serve
    images asynchronously.
 */
 
 //![0]
-class ColorImageProvider : public QmlImageProvider
+class ColorImageProvider : public QDeclarativeImageProvider
 {
 public:
     // This is run in a low priority thread.
@@ -74,7 +74,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    QmlView view;
+    QDeclarativeView view;
 
     view.engine()->addImageProvider("colors", new ColorImageProvider);
 
@@ -87,7 +87,7 @@ int main(int argc, char ** argv)
     dataList.append("image://colors/purple");
     dataList.append("image://colors/yellow");
 
-    QmlContext *ctxt = view.rootContext();
+    QDeclarativeContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 
     view.setSource(QUrl("qrc:view.qml"));
diff --git a/examples/declarative/objectlistmodel/main.cpp b/examples/declarative/objectlistmodel/main.cpp
index 7ea742b..b210570 100644
--- a/examples/declarative/objectlistmodel/main.cpp
+++ b/examples/declarative/objectlistmodel/main.cpp
@@ -41,11 +41,11 @@
 
 #include <QApplication>
 
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qml.h>
-#include <qmlgraphicsitem.h>
-#include <qmlview.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarative.h>
+#include <qdeclarativeitem.h>
+#include <qdeclarativeview.h>
 
 #include "dataobject.h"
 
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    QmlView view;
+    QDeclarativeView view;
 
     QList<QObject*> dataList;
     dataList.append(new DataObject("Item 1", "red"));
@@ -66,7 +66,7 @@ int main(int argc, char ** argv)
     dataList.append(new DataObject("Item 3", "blue"));
     dataList.append(new DataObject("Item 4", "yellow"));
 
-    QmlContext *ctxt = view.rootContext();
+    QDeclarativeContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 
     view.setSource(QUrl("qrc:view.qml"));
diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/plugins/plugin.cpp
index 8e21263..f6385d0 100644
--- a/examples/declarative/plugins/plugin.cpp
+++ b/examples/declarative/plugins/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QmlExtensionPlugin>
-#include <QtDeclarative/qml.h>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/qdeclarative.h>
 #include <qdebug.h>
 #include <qdatetime.h>
 #include <qbasictimer.h>
@@ -140,11 +140,11 @@ MinuteTimer *Time::timer=0;
 QML_DECLARE_TYPE(Time);
 
 
-class QExampleQmlPlugin : public QmlExtensionPlugin
+class QExampleQmlPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
-    void initialize(QmlEngine *engine, const char *uri)
+    void initialize(QDeclarativeEngine *engine, const char *uri)
     {
         Q_UNUSED(engine);
         Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample"));
diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro
index c9c9f7e..c925cea 100644
--- a/examples/declarative/plugins/plugins.pro
+++ b/examples/declarative/plugins/plugins.pro
@@ -7,21 +7,21 @@ VERSION = 1.0.0
 
 SOURCES += plugin.cpp
 
-qmlsources.files += \
-    com/nokia/TimeExample/qmldir \
+qdeclarativesources.files += \
+    com/nokia/TimeExample/qdeclarativedir \
     com/nokia/TimeExample/center.png \
     com/nokia/TimeExample/clock.png \
     com/nokia/TimeExample/Clock.qml \
     com/nokia/TimeExample/hour.png \
     com/nokia/TimeExample/minute.png
 
-qmlsources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
 sources.files += plugins.pro plugin.cpp plugins.qml
 sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
 
 target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
-INSTALLS += qmlsources sources target
+INSTALLS += qdeclarativesources sources target
 
 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/declarative/sql/hello.qml b/examples/declarative/sql/hello.qml
index 96e0675..277dfeb 100644
--- a/examples/declarative/sql/hello.qml
+++ b/examples/declarative/sql/hello.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 Text {
     Script {
         function findGreetings() {
-            var db = openDatabaseSync("QmlExampleDB", "1.0", "The Example QML SQL!", 1000000);
+            var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
 
             db.transaction(
                 function(tx) {
diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qdeclarative-in-html.qml
index a2f2f2a..a2f2f2a 100644
--- a/examples/declarative/webview/qml-in-html.qml
+++ b/examples/declarative/webview/qdeclarative-in-html.qml