Rename the QtQuick1 module back to QtDeclarative

Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
author: Friedemann Kleint <Friedemann.Kleint@digia.com> 2012-10-15 15:58:44 +0200
committer: The Qt Project <gerrit-noreply@qt-project.org> 2012-10-17 17:18:22 +0200
commit: 79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch)
tree: 2bf779aff001b7e9675f52ccb270a0041de06b62 /examples
parent: 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff)
106 files changed, 143 insertions, 143 deletions
diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro
index 11dd9d13..eecab9bb 100644
--- a/examples/declarative/animation/basics/color-animation/color-animation.pro
+++ b/examples/declarative/animation/basics/color-animation/color-animation.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/color-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/basics/color-animation
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro
index 28e7ebc3..61e165c8 100644
--- a/examples/declarative/animation/basics/property-animation/property-animation.pro
+++ b/examples/declarative/animation/basics/property-animation/property-animation.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/property-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/basics/property-animation
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
index b1b3cd6b..70b6187f 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/behaviors/behavior-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/behaviors/behavior-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
index 4c46a119..2c9cd4f2 100644
--- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
+++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEB6022A4
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/wigglytext/wigglytext
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/animation/wigglytext/wigglytext
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro
index ac80ef7a..34007253 100644
--- a/examples/declarative/animation/easing/easing.pro
+++ b/examples/declarative/animation/easing/easing.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/easing
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/easing
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro
index 9a469a68..b188c70a 100644
--- a/examples/declarative/animation/states/states.pro
+++ b/examples/declarative/animation/states/states.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/states
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/states
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index 0d9b33c9..0d24c035 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += quick1
+QT += declarative
 
 DESTDIR = ImageProviderCore
 TARGET  = qmlimageproviderplugin
@@ -10,13 +10,13 @@ SOURCES += imageprovider.cpp
 OTHER_FILES += imageprovider.json
 
 sources.files = $$SOURCES imageprovider.qml imageprovider.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider/ImageProviderCore
 
 ImageProviderCore_sources.files = \
     ImageProviderCore/qmldir 
-ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore
+ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider/ImageProviderCore
 
 INSTALLS = sources ImageProviderCore_sources target
 
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 4048dfd9..e8103794 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -21,7 +21,7 @@ SOURCES += main.cpp
 RESOURCES += networkaccessmanagerfactory.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/networkaccessmanagerfactory
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/networkaccessmanagerfactory
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
index 70365662..7ee6755b 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtQuick1/QDeclarativeExtensionPlugin>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/qdeclarative.h>
 #include <qdebug.h>
 #include <qdatetime.h>
 #include <qbasictimer.h>
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index a0f08844..0d6fe43e 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += widgets quick1
+QT += widgets declarative
 
 DESTDIR = com/nokia/TimeExample
 TARGET  = qmlqtimeexampleplugin
@@ -17,11 +17,11 @@ qdeclarativesources.files += \
     com/nokia/TimeExample/hour.png \
     com/nokia/TimeExample/minute.png
 
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins/com/nokia/TimeExample
 
 sources.files += plugins.pro plugin.cpp plugins.qml README
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins/com/nokia/TimeExample
 
 INSTALLS += qdeclarativesources sources target
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
index c3e6a913..27682b49 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
@@ -1,4 +1,4 @@
-QT += widgets quick1
+QT += widgets declarative
 
 SOURCES += main.cpp
 RESOURCES += layoutitem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
index 794979c4..4ad99b56 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -28,7 +28,7 @@ RESOURCES += \
     gridlayout.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
index da9b9939..cb070816 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -28,7 +28,7 @@ RESOURCES += \
     linearlayout.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
index 887c4657..464d19aa 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtQuick1/QDeclarativeExtensionPlugin>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/qdeclarative.h>
 #include <QtWidgets/QGraphicsProxyWidget>
 #include <QtWidgets/QPushButton>
 #include <QDebug>
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index 3a451551..e0d17715 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += widgets quick1
+QT += widgets declarative
 
 DESTDIR = QWidgets
 TARGET = qmlqwidgetsplugin
@@ -10,8 +10,8 @@ SOURCES += qwidgets.cpp
 OTHER_FILES += qwidgets.json
 
 sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins
 
 INSTALLS += sources target
 
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
index 92af7535..a4718886 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
@@ -1,11 +1,11 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp 
 HEADERS += person.h
 RESOURCES += adding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/adding
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/adding
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
index ab1bd45f..8a5bc14c 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/attached
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/attached
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
index b818f79d..281ca7e0 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += binding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/binding
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/binding
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
index 882a71b9..b89db7a5 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/coercion
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/coercion
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro
index 0244f8bb..3d0b3405 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.pro
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/default
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/default
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
index ffc161ad..f9485f67 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
@@ -1,11 +1,11 @@
-QT += widgets quick1
+QT += widgets declarative
 
 SOURCES += main.cpp \
            lineedit.cpp 
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/extended
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/extended
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
index 0ce0bad9..5bf40ddd 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/grouped
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/grouped
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
index 8c8288a3..b9310c14 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
+++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += methods.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/methods
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/methods
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
index 13f8bb0f..5bc57983 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/properties
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/properties
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
index 3baff92e..2b850245 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/signal
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/signal
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
index 6db7514f..c32e5a2d 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
@@ -1,4 +1,4 @@
-QT += quick1
+QT += declarative
 
 SOURCES += main.cpp \
            person.cpp \
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += valuesource.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/valuesource
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/valuesource
 INSTALLS += target sources
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 7fe8f957..42bc3f4a 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -25,5 +25,5 @@ sources.files = \
    cppextensions \
    xml
 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative
 INSTALLS += sources
diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro
index abae210e..951b2611 100644
--- a/examples/declarative/i18n/i18n.pro
+++ b/examples/declarative/i18n/i18n.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/i18n
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/i18n
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro
index 5cfc2e5b..eab55135 100644
--- a/examples/declarative/imageelements/borderimage/borderimage.pro
+++ b/examples/declarative/imageelements/borderimage/borderimage.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/borderimage
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/borderimage
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro
index d19b6fde..41560539 100644
--- a/examples/declarative/imageelements/image/image.pro
+++ b/examples/declarative/imageelements/image/image.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/image
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/image
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro
index 035a06a6..d12cb7ca 100644
--- a/examples/declarative/imageelements/shadows/shadows.pro
+++ b/examples/declarative/imageelements/shadows/shadows.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/shadows
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/shadows
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro
index 584a80bf..b6fd6856 100644
--- a/examples/declarative/keyinteraction/focus/focus.pro
+++ b/examples/declarative/keyinteraction/focus/focus.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/keyinteraction/focus
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/keyinteraction/focus
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index 7ba55ba6..164ed233 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -21,7 +21,7 @@ SOURCES = main.cpp model.cpp
 HEADERS = model.h
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/abstractitemmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/abstractitemmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro
index 5ff68def..967ca931 100644
--- a/examples/declarative/modelviews/gridview/gridview.pro
+++ b/examples/declarative/modelviews/gridview/gridview.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/gridview-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
index c37afe45..272ff7d3 100644
--- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
+++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/dynamiclist
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/dynamiclist
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
index 1ddbb46f..73a32e44 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
+++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/expandingdelegates
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/expandingdelegates
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro
index 062de0a7..220dae9e 100644
--- a/examples/declarative/modelviews/listview/highlight/highlight.pro
+++ b/examples/declarative/modelviews/listview/highlight/highlight.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlight
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/highlight
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
index b27e2c06..0faf1a8f 100644
--- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
+++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlightranges
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/highlightranges
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro
index edad3e58..699a8e4e 100644
--- a/examples/declarative/modelviews/listview/sections/sections.pro
+++ b/examples/declarative/modelviews/listview/sections/sections.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/sections
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/sections
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
index d37bd87b..790946cd 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -22,7 +22,7 @@ SOURCES += main.cpp \
 HEADERS += dataobject.h
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/objectlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/objectlistmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/package/package.pro b/examples/declarative/modelviews/package/package.pro
index d68cdcc8..6d7a1fab 100644
--- a/examples/declarative/modelviews/package/package.pro
+++ b/examples/declarative/modelviews/package/package.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/package
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/package
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro
index cf21b699..51307e54 100644
--- a/examples/declarative/modelviews/parallax/parallax.pro
+++ b/examples/declarative/modelviews/parallax/parallax.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/parallax
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/parallax
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro
index 9b00ce2c..9bd27e18 100644
--- a/examples/declarative/modelviews/pathview/pathview.pro
+++ b/examples/declarative/modelviews/pathview/pathview.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/pathview-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
index 8d326922..e7221f02 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
@@ -20,7 +20,7 @@ QT += widgets
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/stringlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/stringlistmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
index 7309eea1..19ea9469 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/visualitemmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/visualitemmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro
index 1991997a..c6b26fb8 100644
--- a/examples/declarative/positioners/positioners.pro
+++ b/examples/declarative/positioners/positioners.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/positioners
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/positioners
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro
index 402d8344..dd33b64a 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro
+++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutdirection
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/layoutdirection
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro
index eb6ab5c5..f45ca74e 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro
+++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutmirroring
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/layoutmirroring
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.pro b/examples/declarative/righttoleft/textalignment/textalignment.pro
index fd2ee263..f9d164ea 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.pro
+++ b/examples/declarative/righttoleft/textalignment/textalignment.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/textalignment
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/textalignment
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro
index b4a9eabe..d8d0df19 100644
--- a/examples/declarative/shadereffects/shadereffects.pro
+++ b/examples/declarative/shadereffects/shadereffects.pro
@@ -14,7 +14,7 @@ QML_IMPORT_PATH =
 # Speed up launching on MeeGo/Harmattan when using applauncherd daemon
 # CONFIG += qdeclarative-boostable
 
-QT += quick1 opengl
+QT += declarative opengl
 
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp
@@ -24,7 +24,7 @@ symbian {
 }
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/shadereffects
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/shadereffects
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.pro b/examples/declarative/sqllocalstorage/sqllocalstorage.pro
index 631cff40..bb5a1323 100644
--- a/examples/declarative/sqllocalstorage/sqllocalstorage.pro
+++ b/examples/declarative/sqllocalstorage/sqllocalstorage.pro
@@ -19,7 +19,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/sqllocalstorage
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/sqllocalstorage
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro
index a175e3d5..e8fc381b 100644
--- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro
+++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/availableFonts
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/availableFonts
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/banner/banner.pro b/examples/declarative/text/fonts/banner/banner.pro
index ab6f3e56..f3fba2e6 100644
--- a/examples/declarative/text/fonts/banner/banner.pro
+++ b/examples/declarative/text/fonts/banner/banner.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/banner
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/banner
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/fonts/fonts.pro b/examples/declarative/text/fonts/fonts/fonts.pro
index 1e10fc17..c5382311 100644
--- a/examples/declarative/text/fonts/fonts/fonts.pro
+++ b/examples/declarative/text/fonts/fonts/fonts.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/fonts
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/fonts
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/hello/hello.pro b/examples/declarative/text/fonts/hello/hello.pro
index 8a7752a8..a6a685c2 100644
--- a/examples/declarative/text/fonts/hello/hello.pro
+++ b/examples/declarative/text/fonts/hello/hello.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/hello
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/hello
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro
index 327efad9..20450b2d 100644
--- a/examples/declarative/text/textselection/textselection.pro
+++ b/examples/declarative/text/textselection/textselection.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/textselection
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/textselection
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
index 35f203f1..409f792e 100644
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
+++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/threadedlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/threading/threadedlistmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/threading/workerscript/workerscript.pro b/examples/declarative/threading/workerscript/workerscript.pro
index b92a2745..e7f1a2aa 100644
--- a/examples/declarative/threading/workerscript/workerscript.pro
+++ b/examples/declarative/threading/workerscript/workerscript.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/workerscript
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/threading/workerscript
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
index db652cc3..a81a0219 100644
--- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
+++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/gestures/experimental-gestures
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/gestures/experimental-gestures
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
index c55b883c..ce5bbd3f 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/mousearea/mousearea-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/mousearea/mousearea-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.pro b/examples/declarative/touchinteraction/pincharea/pincharea.pro
index 6a2e9dd3..a7ae4561 100644
--- a/examples/declarative/touchinteraction/pincharea/pincharea.pro
+++ b/examples/declarative/touchinteraction/pincharea/pincharea.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/pincharea
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/pincharea
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro
index 483924e1..6fc6c58c 100644
--- a/examples/declarative/toys/clocks/clocks.pro
+++ b/examples/declarative/toys/clocks/clocks.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/clocks
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/clocks
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro
index 61e141fa..810adf04 100644
--- a/examples/declarative/toys/corkboards/corkboards.pro
+++ b/examples/declarative/toys/corkboards/corkboards.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/corkboards
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/corkboards
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro
index 5d19757b..3a177275 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.pro
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/dynamicscene
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/dynamicscene
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
index 4a669f6f..9547c913 100644
--- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro
+++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
@@ -24,7 +24,7 @@ TARGET = tic-tac-toe
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tic-tac-toe
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/tic-tac-toe
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro
index 2b4cc07e..3f843595 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.pro
+++ b/examples/declarative/toys/tvtennis/tvtennis.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tvtennis
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/tvtennis
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
index d75e7b26..f978c7bb 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
+++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
@@ -1,4 +1,4 @@
-QT += widgets quick1
+QT += widgets declarative
 
 HEADERS += piechart.h
 SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
index d75e7b26..f978c7bb 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
+++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
@@ -1,4 +1,4 @@
-QT += widgets quick1
+QT += widgets declarative
 
 HEADERS += piechart.h
 SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
index d75e7b26..f978c7bb 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
@@ -1,4 +1,4 @@
-QT += widgets quick1
+QT += widgets declarative
 
 HEADERS += piechart.h
 SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
index 535f8a72..b0c94cc7 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
@@ -1,4 +1,4 @@
-QT += widgets quick1
+QT += widgets declarative
 
 HEADERS += piechart.h \
            pieslice.h 
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
index 535f8a72..b0c94cc7 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
@@ -1,4 +1,4 @@
-QT += widgets quick1
+QT += widgets declarative
 
 HEADERS += piechart.h \
            pieslice.h 
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index c2d277f5..62c41a0f 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += quick1 widgets
+QT += declarative widgets
 
 DESTDIR = lib
 OBJECTS_DIR = tmp
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
index 5e112a8d..741c0429 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/dialcontrol
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/dialcontrol
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro
index 0cfd2ec2..9707142b 100644
--- a/examples/declarative/ui-components/flipable/flipable.pro
+++ b/examples/declarative/ui-components/flipable/flipable.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/flipable
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/flipable
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro
index 428ffd47..c0e53864 100644
--- a/examples/declarative/ui-components/main/main.pro
+++ b/examples/declarative/ui-components/main/main.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/main
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/main
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro
index 8e232277..5557daba 100644
--- a/examples/declarative/ui-components/progressbar/progressbar.pro
+++ b/examples/declarative/ui-components/progressbar/progressbar.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/progressbar
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/progressbar
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.pro b/examples/declarative/ui-components/scrollbar/scrollbar.pro
index 5843ef7f..c29a02dc 100644
--- a/examples/declarative/ui-components/scrollbar/scrollbar.pro
+++ b/examples/declarative/ui-components/scrollbar/scrollbar.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/scrollbar
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/scrollbar
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/searchbox/searchbox.pro b/examples/declarative/ui-components/searchbox/searchbox.pro
index 6219524f..56c060b8 100644
--- a/examples/declarative/ui-components/searchbox/searchbox.pro
+++ b/examples/declarative/ui-components/searchbox/searchbox.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/searchbox
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/searchbox
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro
index 63e471cf..77b3d996 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.pro
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/slideswitch
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/slideswitch
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/spinner/spinner.pro b/examples/declarative/ui-components/spinner/spinner.pro
index 0c65f28d..20a686da 100644
--- a/examples/declarative/ui-components/spinner/spinner.pro
+++ b/examples/declarative/ui-components/spinner/spinner.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/spinner
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/spinner
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.pro b/examples/declarative/ui-components/tabwidget/tabwidget.pro
index 97d49ea2..caa03212 100644
--- a/examples/declarative/ui-components/tabwidget/tabwidget.pro
+++ b/examples/declarative/ui-components/tabwidget/tabwidget.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/tabwidget
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/tabwidget
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
index 9c75b8b0..c6be2562 100644
--- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
+++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/xml/xmlhttprequest-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/xml/xmlhttprequest-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/calculator/calculator.pro b/examples/demos/calculator/calculator.pro
index 7db59b96..f59289be 100644
--- a/examples/demos/calculator/calculator.pro
+++ b/examples/demos/calculator/calculator.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/calculator
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/flickr/flickr.pro b/examples/demos/flickr/flickr.pro
index 625b2a57..74342fbc 100644
--- a/examples/demos/flickr/flickr.pro
+++ b/examples/demos/flickr/flickr.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/flickr
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/flickr
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/minehunt/main.cpp b/examples/demos/minehunt/main.cpp
index 636ec081..cfe36f0b 100644
--- a/examples/demos/minehunt/main.cpp
+++ b/examples/demos/minehunt/main.cpp
@@ -42,8 +42,8 @@
 #include "qmlapplicationviewer.h"
 #include "minehunt.h"
 #include <QtWidgets/QApplication>
-#include <QtQuick1/QDeclarativeContext>
-#include <QtQuick1/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtDeclarative/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/demos/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro
index 2a43a11f..8c7f5bbf 100644
--- a/examples/demos/minehunt/minehunt.pro
+++ b/examples/demos/minehunt/minehunt.pro
@@ -19,7 +19,7 @@ SOURCES += main.cpp minehunt.cpp
 RESOURCES = minehunt.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/minehunt
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/minehunt
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro
index 694aeb36..1b1490cb 100644
--- a/examples/demos/photoviewer/photoviewer.pro
+++ b/examples/demos/photoviewer/photoviewer.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/photoviewer
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/photoviewer
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/rssnews/rssnews.pro b/examples/demos/rssnews/rssnews.pro
index 14002fb1..04ff5ae9 100644
--- a/examples/demos/rssnews/rssnews.pro
+++ b/examples/demos/rssnews/rssnews.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/rssnews
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/rssnews
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro
index 6342ba4a..10b28698 100644
--- a/examples/demos/samegame/samegame.pro
+++ b/examples/demos/samegame/samegame.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/samegame
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/samegame
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/snake/snake.pro b/examples/demos/snake/snake.pro
index 0fa838d5..427f570a 100644
--- a/examples/demos/snake/snake.pro
+++ b/examples/demos/snake/snake.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/snake
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/snake
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/demos/twitter/twitter.pro b/examples/demos/twitter/twitter.pro
index c2beb0e3..9a699799 100644
--- a/examples/demos/twitter/twitter.pro
+++ b/examples/demos/twitter/twitter.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/twitter
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/twitter
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/helper/helper.pro b/examples/helper/helper.pro
index 85117a0f..0a111c50 100644
--- a/examples/helper/helper.pro
+++ b/examples/helper/helper.pro
@@ -3,5 +3,5 @@ TEMPLATE = subdirs
 # the helpers simply need a make install target, but require no compilation 
 sources.files = \
 	qmlapplicationviewer
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/helper
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/helper
 INSTALLS += sources
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index bbd53bd5..6a9a1fd5 100644
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -42,9 +42,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include <QtQuick1/QDeclarativeComponent>
-#include <QtQuick1/QDeclarativeEngine>
-#include <QtQuick1/QDeclarativeContext>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QtWidgets/QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
index ef4e8363..b6b96bca 100644
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
@@ -41,7 +41,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#include <QtQuick1/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri
index e1cc288b..b83bd9b5 100644
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -4,7 +4,7 @@
 # It is recommended not to modify this file, since newer versions of Qt Creator
 # may offer an updated version of it.
 
-QT += quick1 widgets
+QT += declarative widgets
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/examples/mobile/guitartuner/guitartuner.pro b/examples/mobile/guitartuner/guitartuner.pro
index b86f4778..9478f380 100644
--- a/examples/mobile/guitartuner/guitartuner.pro
+++ b/examples/mobile/guitartuner/guitartuner.pro
@@ -65,8 +65,8 @@ symbian {
     TARGET.CAPABILITY = UserEnvironment
 }
 
-# Add quick1 module
-QT       += quick1
+# Add declarative module
+QT       += declarative
 
 OTHER_FILES += \
     src/application.qml \
diff --git a/examples/mobile/guitartuner/src/guitartuner.h b/examples/mobile/guitartuner/src/guitartuner.h
index 0d647d54..a1eff87c 100644
--- a/examples/mobile/guitartuner/src/guitartuner.h
+++ b/examples/mobile/guitartuner/src/guitartuner.h
@@ -43,7 +43,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QtQuick1>
+#include <QtDeclarative>
 #include <QAudioDeviceInfo>
 #include <QAudioOutput>
 #include <QAudioInput>
diff --git a/examples/mobile/qtbubblelevel/main.cpp b/examples/mobile/qtbubblelevel/main.cpp
index ad0e1dc7..2b8bdf00 100644
--- a/examples/mobile/qtbubblelevel/main.cpp
+++ b/examples/mobile/qtbubblelevel/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtQuick1>
+#include <QtDeclarative>
 #include <QtGui>
 #include <QAccelerometer>
 
diff --git a/examples/mobile/qtbubblelevel/qtbubblelevel.pro b/examples/mobile/qtbubblelevel/qtbubblelevel.pro
index 93c676c6..3314815b 100644
--- a/examples/mobile/qtbubblelevel/qtbubblelevel.pro
+++ b/examples/mobile/qtbubblelevel/qtbubblelevel.pro
@@ -1,4 +1,4 @@
-QT       += core gui quick1
+QT       += core gui declarative
 CONFIG   += mobility
 MOBILITY += sensors
 
diff --git a/examples/mobile/quickhit/quickhit.pro b/examples/mobile/quickhit/quickhit.pro
index cc980d92..b511a76f 100644
--- a/examples/mobile/quickhit/quickhit.pro
+++ b/examples/mobile/quickhit/quickhit.pro
@@ -1,4 +1,4 @@
-QT       += core gui quick1 opengl widgets
+QT       += core gui declarative opengl widgets
 
 VERSION = 1.1.1
 
diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp
index f7b2537d..bc711932 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp
@@ -41,7 +41,7 @@
 #include "dialogPlugin.h"
 #include "directory.h"
 #include "file.h"
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 void DialogPlugin::registerTypes(const char *uri)
 {
diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h
index a5cf8cdf..e87b7e82 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h
@@ -41,7 +41,7 @@
 #ifndef DIALOGPLUGIN_H
 #define DIALOGPLUGIN_H
 
-#include <QtQuick1/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
 
 class DialogPlugin : public QDeclarativeExtensionPlugin
 {
diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro
index 33eb51d4..d85787d0 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += quick1
+QT += declarative
 
 DESTDIR +=  ../plugins
 OBJECTS_DIR = tmp
diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp
index 9cf5f0ee..286374d8 100644
--- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp
+++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp
@@ -41,7 +41,7 @@
 #include "dialogPlugin.h"
 #include "directory.h"
 #include "file.h"
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 void DialogPlugin::registerTypes(const char *uri){
     
diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h
index 1ee96a96..ddcf82be 100644
--- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h
+++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h
@@ -41,7 +41,7 @@
 #ifndef DIALOGPLUGIN_H
 #define DIALOGPLUGIN_H
 
-#include <QtQuick1/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
 
 class DialogPlugin : public QDeclarativeExtensionPlugin
 {
diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro
index 9b1cfa11..62477470 100644
--- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro
+++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += quick1
+QT += declarative
 
 DESTDIR +=  ../plugins
 OBJECTS_DIR = tmp
author	Friedemann Kleint <Friedemann.Kleint@digia.com>	2012-10-15 15:58:44 +0200
committer	The Qt Project <gerrit-noreply@qt-project.org>	2012-10-17 17:18:22 +0200
commit	79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch)
tree	2bf779aff001b7e9675f52ccb270a0041de06b62 /examples
parent	049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff)