164 files changed, 149 insertions, 149 deletions

diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro
index f7fc993b..e8e29b8f 100644
--- a/src/imports/calendar/calendar.pro
+++ b/src/imports/calendar/calendar.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Calendar.2
 IMPORT_VERSION = 2.0
 
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
+QT += core-private gui-private qml-private quick-private quicktemplates-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/calendar/qquickcalendarview.cpp b/src/imports/calendar/qquickcalendarview.cpp
index bdc67d43..23ed9dd3 100644
--- a/src/imports/calendar/qquickcalendarview.cpp
+++ b/src/imports/calendar/qquickcalendarview.cpp
@@ -39,7 +39,7 @@
 
 #include <QtGui/qstylehints.h>
 #include <QtGui/qguiapplication.h>
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/calendar/qquickcalendarview_p.h b/src/imports/calendar/qquickcalendarview_p.h
index f391d919..e69b5ddf 100644
--- a/src/imports/calendar/qquickcalendarview_p.h
+++ b/src/imports/calendar/qquickcalendarview_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 #include <QtCore/qlocale.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp
index e4b42302..9ace5bdd 100644
--- a/src/imports/calendar/qquickdayofweekrow.cpp
+++ b/src/imports/calendar/qquickdayofweekrow.cpp
@@ -37,7 +37,7 @@
 #include "qquickdayofweekrow_p.h"
 #include "qquickdayofweekmodel_p.h"
 
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h
index 83b32dd7..e0ea0939 100644
--- a/src/imports/calendar/qquickdayofweekrow_p.h
+++ b/src/imports/calendar/qquickdayofweekrow_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 #include <QtCore/qlocale.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp
index 56c4af97..12f61bd4 100644
--- a/src/imports/calendar/qquickweeknumbercolumn.cpp
+++ b/src/imports/calendar/qquickweeknumbercolumn.cpp
@@ -37,7 +37,7 @@
 #include "qquickweeknumbercolumn_p.h"
 #include "qquickweeknumbermodel_p.h"
 
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h
index 423cd99a..efc2c172 100644
--- a/src/imports/calendar/qquickweeknumbercolumn_p.h
+++ b/src/imports/calendar/qquickweeknumbercolumn_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 #include <QtCore/qlocale.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 3503294f..d3b0bbcc 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Controls.2
 IMPORT_VERSION = 2.0
 
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
+QT += core-private gui-private qml-private quick-private quicktemplates-private
 
 OTHER_FILES += \
     qmldir
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 6c0f9ecc..fcc263a8 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -37,29 +37,29 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtCore/qdir.h>
 
-#include <QtQuickControls/private/qquickexclusivegroup_p.h>
-#include <QtQuickControls/private/qquickapplicationwindow_p.h>
-#include <QtQuickControls/private/qquickbusyindicator_p.h>
-#include <QtQuickControls/private/qquickbutton_p.h>
-#include <QtQuickControls/private/qquickcheckbox_p.h>
-#include <QtQuickControls/private/qquickframe_p.h>
-#include <QtQuickControls/private/qquickgroupbox_p.h>
-#include <QtQuickControls/private/qquicklabel_p.h>
-#include <QtQuickControls/private/qquickpageindicator_p.h>
-#include <QtQuickControls/private/qquickprogressbar_p.h>
-#include <QtQuickControls/private/qquickradiobutton_p.h>
-#include <QtQuickControls/private/qquickscrollbar_p.h>
-#include <QtQuickControls/private/qquickscrollindicator_p.h>
-#include <QtQuickControls/private/qquickslider_p.h>
-#include <QtQuickControls/private/qquickstackview_p.h>
-#include <QtQuickControls/private/qquickswitch_p.h>
-#include <QtQuickControls/private/qquicktabbar_p.h>
-#include <QtQuickControls/private/qquicktabbutton_p.h>
-#include <QtQuickControls/private/qquicktextarea_p.h>
-#include <QtQuickControls/private/qquicktextfield_p.h>
-#include <QtQuickControls/private/qquicktogglebutton_p.h>
-#include <QtQuickControls/private/qquicktoolbar_p.h>
-#include <QtQuickControls/private/qquicktoolbutton_p.h>
+#include <QtQuickTemplates/private/qquickexclusivegroup_p.h>
+#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates/private/qquickbusyindicator_p.h>
+#include <QtQuickTemplates/private/qquickbutton_p.h>
+#include <QtQuickTemplates/private/qquickcheckbox_p.h>
+#include <QtQuickTemplates/private/qquickframe_p.h>
+#include <QtQuickTemplates/private/qquickgroupbox_p.h>
+#include <QtQuickTemplates/private/qquicklabel_p.h>
+#include <QtQuickTemplates/private/qquickpageindicator_p.h>
+#include <QtQuickTemplates/private/qquickprogressbar_p.h>
+#include <QtQuickTemplates/private/qquickradiobutton_p.h>
+#include <QtQuickTemplates/private/qquickscrollbar_p.h>
+#include <QtQuickTemplates/private/qquickscrollindicator_p.h>
+#include <QtQuickTemplates/private/qquickslider_p.h>
+#include <QtQuickTemplates/private/qquickstackview_p.h>
+#include <QtQuickTemplates/private/qquickswitch_p.h>
+#include <QtQuickTemplates/private/qquicktabbar_p.h>
+#include <QtQuickTemplates/private/qquicktabbutton_p.h>
+#include <QtQuickTemplates/private/qquicktextarea_p.h>
+#include <QtQuickTemplates/private/qquicktextfield_p.h>
+#include <QtQuickTemplates/private/qquicktogglebutton_p.h>
+#include <QtQuickTemplates/private/qquicktoolbar_p.h>
+#include <QtQuickTemplates/private/qquicktoolbutton_p.h>
 #include "qquicktheme_p.h"
 
 void initResources()
diff --git a/src/imports/extras/extras.pro b/src/imports/extras/extras.pro
index 1046cec4..fd3dcc1e 100644
--- a/src/imports/extras/extras.pro
+++ b/src/imports/extras/extras.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Extras.2
 IMPORT_VERSION = 2.0
 
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
+QT += core-private gui-private qml-private quick-private quicktemplates-private
 
 QMAKE_DOCS = $$PWD/doc/qtquickextras2.qdocconf
 
diff --git a/src/imports/extras/qquickdial.cpp b/src/imports/extras/qquickdial.cpp
index fe196659..aa93e9ca 100644
--- a/src/imports/extras/qquickdial.cpp
+++ b/src/imports/extras/qquickdial.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/qmath.h>
 #include <QtQuick/private/qquickflickable_p.h>
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquickdial_p.h b/src/imports/extras/qquickdial_p.h
index 6e3f4e6a..0b5cda35 100644
--- a/src/imports/extras/qquickdial_p.h
+++ b/src/imports/extras/qquickdial_p.h
@@ -50,7 +50,7 @@
 
 #include <QtCore/qvariant.h>
 #include <QtQml/qqmlcomponent.h>
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquickdrawer.cpp b/src/imports/extras/qquickdrawer.cpp
index 7c61688a..1bb9c6f6 100644
--- a/src/imports/extras/qquickdrawer.cpp
+++ b/src/imports/extras/qquickdrawer.cpp
@@ -40,7 +40,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtQuick/private/qquickwindow_p.h>
 #include <QtQuick/private/qquickanimation_p.h>
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquickdrawer_p.h b/src/imports/extras/qquickdrawer_p.h
index 2a45f5b1..00af2164 100644
--- a/src/imports/extras/qquickdrawer_p.h
+++ b/src/imports/extras/qquickdrawer_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquickswipeview.cpp b/src/imports/extras/qquickswipeview.cpp
index ec76d7f2..c6203f23 100644
--- a/src/imports/extras/qquickswipeview.cpp
+++ b/src/imports/extras/qquickswipeview.cpp
@@ -36,7 +36,7 @@
 
 #include "qquickswipeview_p.h"
 
-#include <QtQuickControls/private/qquickcontainer_p_p.h>
+#include <QtQuickTemplates/private/qquickcontainer_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquickswipeview_p.h b/src/imports/extras/qquickswipeview_p.h
index 68f08783..5541a677 100644
--- a/src/imports/extras/qquickswipeview_p.h
+++ b/src/imports/extras/qquickswipeview_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickTemplates/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquicktumbler.cpp b/src/imports/extras/qquicktumbler.cpp
index 53a8af8f..dd24693b 100644
--- a/src/imports/extras/qquicktumbler.cpp
+++ b/src/imports/extras/qquicktumbler.cpp
@@ -37,7 +37,7 @@
 #include "qquicktumbler_p.h"
 
 #include <QtQuick/private/qquickflickable_p.h>
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/extras/qquicktumbler_p.h b/src/imports/extras/qquicktumbler_p.h
index bda2a020..948382e4 100644
--- a/src/imports/extras/qquicktumbler_p.h
+++ b/src/imports/extras/qquicktumbler_p.h
@@ -50,7 +50,7 @@
 
 #include <QtCore/qvariant.h>
 #include <QtQml/qqmlcomponent.h>
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 80f034bb..8d76c86b 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -36,30 +36,30 @@
 
 #include <QtQml/qqmlextensionplugin.h>
 
-#include <QtQuickControls/private/qquickapplicationwindow_p.h>
-#include <QtQuickControls/private/qquickbusyindicator_p.h>
-#include <QtQuickControls/private/qquickbutton_p.h>
-#include <QtQuickControls/private/qquickcheckbox_p.h>
-#include <QtQuickControls/private/qquickcontrol_p.h>
-#include <QtQuickControls/private/qquickcontainer_p.h>
-#include <QtQuickControls/private/qquickframe_p.h>
-#include <QtQuickControls/private/qquickgroupbox_p.h>
-#include <QtQuickControls/private/qquicklabel_p.h>
-#include <QtQuickControls/private/qquickpageindicator_p.h>
-#include <QtQuickControls/private/qquickprogressbar_p.h>
-#include <QtQuickControls/private/qquickradiobutton_p.h>
-#include <QtQuickControls/private/qquickscrollbar_p.h>
-#include <QtQuickControls/private/qquickscrollindicator_p.h>
-#include <QtQuickControls/private/qquickslider_p.h>
-#include <QtQuickControls/private/qquickstackview_p.h>
-#include <QtQuickControls/private/qquickswitch_p.h>
-#include <QtQuickControls/private/qquicktabbar_p.h>
-#include <QtQuickControls/private/qquicktabbutton_p.h>
-#include <QtQuickControls/private/qquicktextarea_p.h>
-#include <QtQuickControls/private/qquicktextfield_p.h>
-#include <QtQuickControls/private/qquicktogglebutton_p.h>
-#include <QtQuickControls/private/qquicktoolbar_p.h>
-#include <QtQuickControls/private/qquicktoolbutton_p.h>
+#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates/private/qquickbusyindicator_p.h>
+#include <QtQuickTemplates/private/qquickbutton_p.h>
+#include <QtQuickTemplates/private/qquickcheckbox_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontainer_p.h>
+#include <QtQuickTemplates/private/qquickframe_p.h>
+#include <QtQuickTemplates/private/qquickgroupbox_p.h>
+#include <QtQuickTemplates/private/qquicklabel_p.h>
+#include <QtQuickTemplates/private/qquickpageindicator_p.h>
+#include <QtQuickTemplates/private/qquickprogressbar_p.h>
+#include <QtQuickTemplates/private/qquickradiobutton_p.h>
+#include <QtQuickTemplates/private/qquickscrollbar_p.h>
+#include <QtQuickTemplates/private/qquickscrollindicator_p.h>
+#include <QtQuickTemplates/private/qquickslider_p.h>
+#include <QtQuickTemplates/private/qquickstackview_p.h>
+#include <QtQuickTemplates/private/qquickswitch_p.h>
+#include <QtQuickTemplates/private/qquicktabbar_p.h>
+#include <QtQuickTemplates/private/qquicktabbutton_p.h>
+#include <QtQuickTemplates/private/qquicktextarea_p.h>
+#include <QtQuickTemplates/private/qquicktextfield_p.h>
+#include <QtQuickTemplates/private/qquicktogglebutton_p.h>
+#include <QtQuickTemplates/private/qquicktoolbar_p.h>
+#include <QtQuickTemplates/private/qquicktoolbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro
index c264b0ff..07e96aa1 100644
--- a/src/imports/templates/templates.pro
+++ b/src/imports/templates/templates.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Templates.2
 IMPORT_VERSION = 2.0
 
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
+QT += core-private gui-private qml-private quick-private quicktemplates-private
 
 OTHER_FILES += \
     qmldir
diff --git a/src/src.pro b/src/src.pro
index ff2ae30b..ab08ac5e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    controls \
-    imports
+    imports \
+    templates
 
-imports.depends = controls
+imports.depends = templates
diff --git a/src/controls/doc/images/qtquickcontrols2-busyindicator-background.png b/src/templates/doc/images/qtquickcontrols2-busyindicator-background.png
index 84cd2ed9..84cd2ed9 100644
--- a/src/controls/doc/images/qtquickcontrols2-busyindicator-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-busyindicator-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png b/src/templates/doc/images/qtquickcontrols2-busyindicator-indicator.png
index 87db05a1..87db05a1 100644
--- a/src/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-busyindicator-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/templates/doc/images/qtquickcontrols2-busyindicator.gif
index 46633c34..46633c34 100644
--- a/src/controls/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/templates/doc/images/qtquickcontrols2-busyindicator.gif
diff --git a/src/controls/doc/images/qtquickcontrols2-button-background.png b/src/templates/doc/images/qtquickcontrols2-button-background.png
index f8e9342c..f8e9342c 100644
--- a/src/controls/doc/images/qtquickcontrols2-button-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-button-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-button-disabled.png b/src/templates/doc/images/qtquickcontrols2-button-disabled.png
index 9b9d1eb3..9b9d1eb3 100644
--- a/src/controls/doc/images/qtquickcontrols2-button-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-button-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-button-focused.png b/src/templates/doc/images/qtquickcontrols2-button-focused.png
index 172bf9fe..172bf9fe 100644
--- a/src/controls/doc/images/qtquickcontrols2-button-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-button-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-button-label.png b/src/templates/doc/images/qtquickcontrols2-button-label.png
index 6875fc06..6875fc06 100644
--- a/src/controls/doc/images/qtquickcontrols2-button-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-button-label.png
diff --git a/src/controls/doc/images/qtquickcontrols2-button-normal.png b/src/templates/doc/images/qtquickcontrols2-button-normal.png
index f59669a2..f59669a2 100644
--- a/src/controls/doc/images/qtquickcontrols2-button-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-button-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/templates/doc/images/qtquickcontrols2-button-pressed.png
index c9b14992..c9b14992 100644
--- a/src/controls/doc/images/qtquickcontrols2-button-pressed.png
+++ b/src/templates/doc/images/qtquickcontrols2-button-pressed.png
diff --git a/src/controls/doc/images/qtquickcontrols2-button.gif b/src/templates/doc/images/qtquickcontrols2-button.gif
index 9f08f458..9f08f458 100644
--- a/src/controls/doc/images/qtquickcontrols2-button.gif
+++ b/src/templates/doc/images/qtquickcontrols2-button.gif
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-background.png b/src/templates/doc/images/qtquickcontrols2-checkbox-background.png
index 81198821..81198821 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-checked.png b/src/templates/doc/images/qtquickcontrols2-checkbox-checked.png
index f44428e0..f44428e0 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-checked.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-checked.png
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/templates/doc/images/qtquickcontrols2-checkbox-disabled.png
index ca31061a..ca31061a 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-focused.png b/src/templates/doc/images/qtquickcontrols2-checkbox-focused.png
index 7847fb9b..7847fb9b 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/templates/doc/images/qtquickcontrols2-checkbox-indicator.png
index 7c6148b6..7c6148b6 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-label.png b/src/templates/doc/images/qtquickcontrols2-checkbox-label.png
index 5bef6df5..5bef6df5 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-label.png
diff --git a/src/controls/doc/images/qtquickcontrols2-checkbox-normal.png b/src/templates/doc/images/qtquickcontrols2-checkbox-normal.png
index 790ebc93..790ebc93 100644
--- a/src/controls/doc/images/qtquickcontrols2-checkbox-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-checkbox-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-frame-background.png b/src/templates/doc/images/qtquickcontrols2-frame-background.png
index e09960fc..e09960fc 100644
--- a/src/controls/doc/images/qtquickcontrols2-frame-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-frame-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-frame-frame.png b/src/templates/doc/images/qtquickcontrols2-frame-frame.png
index bfdf9c1b..bfdf9c1b 100644
--- a/src/controls/doc/images/qtquickcontrols2-frame-frame.png
+++ b/src/templates/doc/images/qtquickcontrols2-frame-frame.png
diff --git a/src/controls/doc/images/qtquickcontrols2-groupbox-background.png b/src/templates/doc/images/qtquickcontrols2-groupbox-background.png
index 36e9aa0f..36e9aa0f 100644
--- a/src/controls/doc/images/qtquickcontrols2-groupbox-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-groupbox-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-groupbox-frame.png b/src/templates/doc/images/qtquickcontrols2-groupbox-frame.png
index 11b075d7..11b075d7 100644
--- a/src/controls/doc/images/qtquickcontrols2-groupbox-frame.png
+++ b/src/templates/doc/images/qtquickcontrols2-groupbox-frame.png
diff --git a/src/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/templates/doc/images/qtquickcontrols2-groupbox-label.png
index 67ccb4c1..67ccb4c1 100644
--- a/src/controls/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-groupbox-label.png
diff --git a/src/controls/doc/images/qtquickcontrols2-progressbar-background.png b/src/templates/doc/images/qtquickcontrols2-progressbar-background.png
index 0fd77835..0fd77835 100644
--- a/src/controls/doc/images/qtquickcontrols2-progressbar-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-progressbar-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/templates/doc/images/qtquickcontrols2-progressbar-disabled.png
index 4baf5c83..4baf5c83 100644
--- a/src/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-progressbar-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-progressbar-indicator.png b/src/templates/doc/images/qtquickcontrols2-progressbar-indicator.png
index 02e888ed..02e888ed 100644
--- a/src/controls/doc/images/qtquickcontrols2-progressbar-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-progressbar-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-progressbar-normal.png b/src/templates/doc/images/qtquickcontrols2-progressbar-normal.png
index 783d721d..783d721d 100644
--- a/src/controls/doc/images/qtquickcontrols2-progressbar-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-progressbar-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-background.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-background.png
index 3ee9590e..3ee9590e 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-checked.png
index 9f71b6b6..9f71b6b6 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-checked.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-disabled.png
index f7fbcb7c..f7fbcb7c 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-focused.png
index dfb8d51e..dfb8d51e 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-indicator.png
index f9e91709..f9e91709 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-label.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-label.png
index 16c0ee08..16c0ee08 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-label.png
diff --git a/src/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/templates/doc/images/qtquickcontrols2-radiobutton-normal.png
index 5a2d4bca..5a2d4bca 100644
--- a/src/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-radiobutton-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-scrollbar-background.png b/src/templates/doc/images/qtquickcontrols2-scrollbar-background.png
index 770f546c..770f546c 100644
--- a/src/controls/doc/images/qtquickcontrols2-scrollbar-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-scrollbar-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-scrollbar-handle.png b/src/templates/doc/images/qtquickcontrols2-scrollbar-handle.png
index aafa90a7..aafa90a7 100644
--- a/src/controls/doc/images/qtquickcontrols2-scrollbar-handle.png
+++ b/src/templates/doc/images/qtquickcontrols2-scrollbar-handle.png
diff --git a/src/controls/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/templates/doc/images/qtquickcontrols2-scrollindicator-background.png
index e8947aa0..e8947aa0 100644
--- a/src/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-scrollindicator-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png b/src/templates/doc/images/qtquickcontrols2-scrollindicator-indicator.png
index 9d969f16..9d969f16 100644
--- a/src/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-scrollindicator-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider-background.png b/src/templates/doc/images/qtquickcontrols2-slider-background.png
index 35fb12ca..35fb12ca 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-slider-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/templates/doc/images/qtquickcontrols2-slider-disabled.png
index 7d4584f8..7d4584f8 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-slider-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/templates/doc/images/qtquickcontrols2-slider-focused.png
index 7f9ad18b..7f9ad18b 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-slider-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/templates/doc/images/qtquickcontrols2-slider-handle.png
index 7878e0f8..7878e0f8 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/templates/doc/images/qtquickcontrols2-slider-handle.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/templates/doc/images/qtquickcontrols2-slider-normal.png
index dac102de..dac102de 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-slider-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider-track.png b/src/templates/doc/images/qtquickcontrols2-slider-track.png
index 868fa420..868fa420 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider-track.png
+++ b/src/templates/doc/images/qtquickcontrols2-slider-track.png
diff --git a/src/controls/doc/images/qtquickcontrols2-slider.gif b/src/templates/doc/images/qtquickcontrols2-slider.gif
index 59c94796..59c94796 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider.gif
+++ b/src/templates/doc/images/qtquickcontrols2-slider.gif
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-background.png b/src/templates/doc/images/qtquickcontrols2-switch-background.png
index bfa24fe6..bfa24fe6 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/templates/doc/images/qtquickcontrols2-switch-checked.png
index fadf851a..fadf851a 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-checked.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/templates/doc/images/qtquickcontrols2-switch-disabled.png
index 328ff6a9..328ff6a9 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/templates/doc/images/qtquickcontrols2-switch-focused.png
index 795868b8..795868b8 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-indicator.png b/src/templates/doc/images/qtquickcontrols2-switch-indicator.png
index 5fc9c83b..5fc9c83b 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-label.png b/src/templates/doc/images/qtquickcontrols2-switch-label.png
index 57deabc6..57deabc6 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-label.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/templates/doc/images/qtquickcontrols2-switch-normal.png
index a162e898..a162e898 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-switch-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-switch.gif b/src/templates/doc/images/qtquickcontrols2-switch.gif
index b2e1b548..b2e1b548 100644
--- a/src/controls/doc/images/qtquickcontrols2-switch.gif
+++ b/src/templates/doc/images/qtquickcontrols2-switch.gif
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/templates/doc/images/qtquickcontrols2-textfield-background.png
index a2908200..a2908200 100644
--- a/src/controls/doc/images/qtquickcontrols2-textfield-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-textfield-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/templates/doc/images/qtquickcontrols2-textfield-disabled.png
index bb5b779e..bb5b779e 100644
--- a/src/controls/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-textfield-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/templates/doc/images/qtquickcontrols2-textfield-focused.png
index 5d8592c1..5d8592c1 100644
--- a/src/controls/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-textfield-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/templates/doc/images/qtquickcontrols2-textfield-normal.png
index 26ad9c11..26ad9c11 100644
--- a/src/controls/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-textfield-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-placeholder.png b/src/templates/doc/images/qtquickcontrols2-textfield-placeholder.png
index b040315f..b040315f 100644
--- a/src/controls/doc/images/qtquickcontrols2-textfield-placeholder.png
+++ b/src/templates/doc/images/qtquickcontrols2-textfield-placeholder.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-background.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-background.png
index 8f390b49..8f390b49 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-checked.png
index fa883751..fa883751 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-checked.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-disabled.png
index 794692b0..794692b0 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-disabled.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-focused.png
index f52e4686..f52e4686 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-focused.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-indicator.png
index 97e06e2c..97e06e2c 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-indicator.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-label.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-label.png
index 3eb3ba35..3eb3ba35 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-label.png
diff --git a/src/controls/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/templates/doc/images/qtquickcontrols2-togglebutton-normal.png
index b066c565..b066c565 100644
--- a/src/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
+++ b/src/templates/doc/images/qtquickcontrols2-togglebutton-normal.png
diff --git a/src/controls/doc/images/qtquickcontrols2-toolbar-background.png b/src/templates/doc/images/qtquickcontrols2-toolbar-background.png
index 28d4fd98..28d4fd98 100644
--- a/src/controls/doc/images/qtquickcontrols2-toolbar-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-toolbar-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-toolbar-frame.png b/src/templates/doc/images/qtquickcontrols2-toolbar-frame.png
index 28d4fd98..28d4fd98 100644
--- a/src/controls/doc/images/qtquickcontrols2-toolbar-frame.png
+++ b/src/templates/doc/images/qtquickcontrols2-toolbar-frame.png
diff --git a/src/controls/doc/images/qtquickcontrols2-toolbutton-background.png b/src/templates/doc/images/qtquickcontrols2-toolbutton-background.png
index fd105fee..fd105fee 100644
--- a/src/controls/doc/images/qtquickcontrols2-toolbutton-background.png
+++ b/src/templates/doc/images/qtquickcontrols2-toolbutton-background.png
diff --git a/src/controls/doc/images/qtquickcontrols2-toolbutton-label.png b/src/templates/doc/images/qtquickcontrols2-toolbutton-label.png
index 7aae8dc8..7aae8dc8 100644
--- a/src/controls/doc/images/qtquickcontrols2-toolbutton-label.png
+++ b/src/templates/doc/images/qtquickcontrols2-toolbutton-label.png
diff --git a/src/controls/doc/qtquickcontrols2.qdocconf b/src/templates/doc/qtquickcontrols2.qdocconf
index a67cc1f7..a67cc1f7 100644
--- a/src/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/templates/doc/qtquickcontrols2.qdocconf
diff --git a/src/controls/doc/snippets/basic-example.qml b/src/templates/doc/snippets/basic-example.qml
index 62ab2466..62ab2466 100644
--- a/src/controls/doc/snippets/basic-example.qml
+++ b/src/templates/doc/snippets/basic-example.qml
diff --git a/src/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/templates/doc/src/qtquickcontrols2-customize.qdoc
index b099b482..b099b482 100644
--- a/src/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/templates/doc/src/qtquickcontrols2-customize.qdoc
diff --git a/src/controls/doc/src/qtquickcontrols2-index.qdoc b/src/templates/doc/src/qtquickcontrols2-index.qdoc
index eefd6c3a..eefd6c3a 100644
--- a/src/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/templates/doc/src/qtquickcontrols2-index.qdoc
diff --git a/src/controls/doc/src/qtquickcontrols2.qdoc b/src/templates/doc/src/qtquickcontrols2.qdoc
index 9b52b09e..9b52b09e 100644
--- a/src/controls/doc/src/qtquickcontrols2.qdoc
+++ b/src/templates/doc/src/qtquickcontrols2.qdoc
diff --git a/src/controls/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp
index 964b97c4..964b97c4 100644
--- a/src/controls/qquickabstractbutton.cpp
+++ b/src/templates/qquickabstractbutton.cpp
diff --git a/src/controls/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h
index ae0e34d9..75901430 100644
--- a/src/controls/qquickabstractbutton_p.h
+++ b/src/templates/qquickabstractbutton_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickAbstractButtonPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractButton : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
diff --git a/src/controls/qquickabstractbutton_p_p.h b/src/templates/qquickabstractbutton_p_p.h
index 4a24b4dd..91519c3f 100644
--- a/src/controls/qquickabstractbutton_p_p.h
+++ b/src/templates/qquickabstractbutton_p_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/controls/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index a750ec01..a750ec01 100644
--- a/src/controls/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
diff --git a/src/controls/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h
index 3117322f..50caa3b2 100644
--- a/src/controls/qquickapplicationwindow_p.h
+++ b/src/templates/qquickapplicationwindow_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuick/private/qquickwindowmodule_p.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickApplicationWindowPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
+class Q_QUICKTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL)
diff --git a/src/controls/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp
index 836fd78f..836fd78f 100644
--- a/src/controls/qquickbusyindicator.cpp
+++ b/src/templates/qquickbusyindicator.cpp
diff --git a/src/controls/qquickbusyindicator_p.h b/src/templates/qquickbusyindicator_p.h
index a9a66853..62039462 100644
--- a/src/controls/qquickbusyindicator_p.h
+++ b/src/templates/qquickbusyindicator_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickBusyIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickBusyIndicator : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL)
diff --git a/src/controls/qquickbutton.cpp b/src/templates/qquickbutton.cpp
index f84489a2..f84489a2 100644
--- a/src/controls/qquickbutton.cpp
+++ b/src/templates/qquickbutton.cpp
diff --git a/src/controls/qquickbutton_p.h b/src/templates/qquickbutton_p.h
index b35ea97e..633b8b3d 100644
--- a/src/controls/qquickbutton_p.h
+++ b/src/templates/qquickbutton_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickButtonPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/controls/qquickcheckable.cpp b/src/templates/qquickcheckable.cpp
index 0130308e..0130308e 100644
--- a/src/controls/qquickcheckable.cpp
+++ b/src/templates/qquickcheckable.cpp
diff --git a/src/controls/qquickcheckable_p.h b/src/templates/qquickcheckable_p.h
index 3790e2cf..3c2683c4 100644
--- a/src/controls/qquickcheckable_p.h
+++ b/src/templates/qquickcheckable_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickCheckablePrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickCheckable : public QQuickAbstractButton
+class Q_QUICKTEMPLATES_EXPORT QQuickCheckable : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL)
diff --git a/src/controls/qquickcheckable_p_p.h b/src/templates/qquickcheckable_p_p.h
index ef0d3f0a..510a3588 100644
--- a/src/controls/qquickcheckable_p_p.h
+++ b/src/templates/qquickcheckable_p_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractbutton_p_p.h>
+#include <QtQuickTemplates/private/qquickabstractbutton_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/controls/qquickcheckbox.cpp b/src/templates/qquickcheckbox.cpp
index 3d9b0704..3d9b0704 100644
--- a/src/controls/qquickcheckbox.cpp
+++ b/src/templates/qquickcheckbox.cpp
diff --git a/src/controls/qquickcheckbox_p.h b/src/templates/qquickcheckbox_p.h
index a3998fd4..a420655f 100644
--- a/src/controls/qquickcheckbox_p.h
+++ b/src/templates/qquickcheckbox_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcheckable_p.h>
+#include <QtQuickTemplates/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickCheckBox : public QQuickCheckable
+class Q_QUICKTEMPLATES_EXPORT QQuickCheckBox : public QQuickCheckable
 {
     Q_OBJECT
 
diff --git a/src/controls/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp
index 76a4e192..76a4e192 100644
--- a/src/controls/qquickcontainer.cpp
+++ b/src/templates/qquickcontainer.cpp
diff --git a/src/controls/qquickcontainer_p.h b/src/templates/qquickcontainer_p.h
index 8fe35faf..28963932 100644
--- a/src/controls/qquickcontainer_p.h
+++ b/src/templates/qquickcontainer_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 #include <QtQml/qqmllist.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickContainerPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickContainer : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickContainer : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
diff --git a/src/controls/qquickcontainer_p_p.h b/src/templates/qquickcontainer_p_p.h
index fec72286..3ff16093 100644
--- a/src/controls/qquickcontainer_p_p.h
+++ b/src/templates/qquickcontainer_p_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 #include <QtQml/private/qqmlobjectmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
+class Q_QUICKTEMPLATES_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickContainer)
 
diff --git a/src/controls/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index d441fc85..d441fc85 100644
--- a/src/controls/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
diff --git a/src/controls/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h
index ff0b92db..78513381 100644
--- a/src/controls/qquickcontrol_p.h
+++ b/src/templates/qquickcontrol_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuick/qquickitem.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickControlPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickControl : public QQuickItem
+class Q_QUICKTEMPLATES_EXPORT QQuickControl : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged)
diff --git a/src/controls/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h
index 6104b2a2..a9046705 100644
--- a/src/controls/qquickcontrol_p_p.h
+++ b/src/templates/qquickcontrol_p_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickAccessibleAttached;
 
-class Q_QUICKCONTROLS_EXPORT QQuickControlPrivate : public QQuickItemPrivate
+class Q_QUICKTEMPLATES_EXPORT QQuickControlPrivate : public QQuickItemPrivate
 {
     Q_DECLARE_PUBLIC(QQuickControl)
 
diff --git a/src/controls/qquickexclusivegroup.cpp b/src/templates/qquickexclusivegroup.cpp
index 20a863cc..20a863cc 100644
--- a/src/controls/qquickexclusivegroup.cpp
+++ b/src/templates/qquickexclusivegroup.cpp
diff --git a/src/controls/qquickexclusivegroup_p.h b/src/templates/qquickexclusivegroup_p.h
index 0c4962aa..2b4a460f 100644
--- a/src/controls/qquickexclusivegroup_p.h
+++ b/src/templates/qquickexclusivegroup_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtCore/qobject.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
@@ -58,7 +58,7 @@ class QQuickExclusiveGroupPrivate;
 class QQuickExclusiveGroupAttached;
 class QQuickExclusiveGroupAttachedPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickExclusiveGroup : public QObject
+class Q_QUICKTEMPLATES_EXPORT QQuickExclusiveGroup : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QObject *current READ current WRITE setCurrent NOTIFY currentChanged)
@@ -90,7 +90,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_updateCurrent())
 };
 
-class Q_QUICKCONTROLS_EXPORT QQuickExclusiveGroupAttached : public QObject
+class Q_QUICKTEMPLATES_EXPORT QQuickExclusiveGroupAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickExclusiveGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL)
diff --git a/src/controls/qquickframe.cpp b/src/templates/qquickframe.cpp
index 7a0aec70..7a0aec70 100644
--- a/src/controls/qquickframe.cpp
+++ b/src/templates/qquickframe.cpp
diff --git a/src/controls/qquickframe_p.h b/src/templates/qquickframe_p.h
index 1f47ff30..c25e7fed 100644
--- a/src/controls/qquickframe_p.h
+++ b/src/templates/qquickframe_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 #include <QtQml/qqmllist.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickFramePrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickFrame : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickFrame : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL)
diff --git a/src/controls/qquickframe_p_p.h b/src/templates/qquickframe_p_p.h
index 02c4421b..efaa1b9c 100644
--- a/src/controls/qquickframe_p_p.h
+++ b/src/templates/qquickframe_p_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickFramePrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES_EXPORT QQuickFramePrivate : public QQuickControlPrivate
 {
 public:
     QQuickFramePrivate();
diff --git a/src/controls/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp
index df5024aa..df5024aa 100644
--- a/src/controls/qquickgroupbox.cpp
+++ b/src/templates/qquickgroupbox.cpp
diff --git a/src/controls/qquickgroupbox_p.h b/src/templates/qquickgroupbox_p.h
index 1934f655..36665710 100644
--- a/src/controls/qquickgroupbox_p.h
+++ b/src/templates/qquickgroupbox_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickframe_p.h>
+#include <QtQuickTemplates/private/qquickframe_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickGroupBoxPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickGroupBox : public QQuickFrame
+class Q_QUICKTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
diff --git a/src/controls/qquicklabel.cpp b/src/templates/qquicklabel.cpp
index 2175fc33..2175fc33 100644
--- a/src/controls/qquicklabel.cpp
+++ b/src/templates/qquicklabel.cpp
diff --git a/src/controls/qquicklabel_p.h b/src/templates/qquicklabel_p.h
index 71430b32..931a7b1d 100644
--- a/src/controls/qquicklabel_p.h
+++ b/src/templates/qquicklabel_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickLabelPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickLabel : public QQuickText
+class Q_QUICKTEMPLATES_EXPORT QQuickLabel : public QQuickText
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/controls/qquicklabel_p_p.h b/src/templates/qquicklabel_p_p.h
index 43f03382..43f03382 100644
--- a/src/controls/qquicklabel_p_p.h
+++ b/src/templates/qquicklabel_p_p.h
diff --git a/src/controls/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp
index 37a52fe0..37a52fe0 100644
--- a/src/controls/qquickpageindicator.cpp
+++ b/src/templates/qquickpageindicator.cpp
diff --git a/src/controls/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h
index 487c945d..856ce39b 100644
--- a/src/controls/qquickpageindicator_p.h
+++ b/src/templates/qquickpageindicator_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 class QQmlComponent;
 class QQuickPageIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickPageIndicator : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL)
diff --git a/src/controls/qquickpressandholdhelper.cpp b/src/templates/qquickpressandholdhelper.cpp
index 38cd871c..38cd871c 100644
--- a/src/controls/qquickpressandholdhelper.cpp
+++ b/src/templates/qquickpressandholdhelper.cpp
diff --git a/src/controls/qquickpressandholdhelper_p.h b/src/templates/qquickpressandholdhelper_p.h
index 0ac84494..0ac84494 100644
--- a/src/controls/qquickpressandholdhelper_p.h
+++ b/src/templates/qquickpressandholdhelper_p.h
diff --git a/src/controls/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp
index 9607bcff..9607bcff 100644
--- a/src/controls/qquickprogressbar.cpp
+++ b/src/templates/qquickprogressbar.cpp
diff --git a/src/controls/qquickprogressbar_p.h b/src/templates/qquickprogressbar_p.h
index 18f585a7..4c81c845 100644
--- a/src/controls/qquickprogressbar_p.h
+++ b/src/templates/qquickprogressbar_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickProgressBarPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickProgressBar : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/controls/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp
index 6681c69c..6681c69c 100644
--- a/src/controls/qquickradiobutton.cpp
+++ b/src/templates/qquickradiobutton.cpp
diff --git a/src/controls/qquickradiobutton_p.h b/src/templates/qquickradiobutton_p.h
index fa61cc60..7601925f 100644
--- a/src/controls/qquickradiobutton_p.h
+++ b/src/templates/qquickradiobutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcheckable_p.h>
+#include <QtQuickTemplates/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickRadioButton : public QQuickCheckable
+class Q_QUICKTEMPLATES_EXPORT QQuickRadioButton : public QQuickCheckable
 {
     Q_OBJECT
 
diff --git a/src/controls/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp
index 085900ba..085900ba 100644
--- a/src/controls/qquickscrollbar.cpp
+++ b/src/templates/qquickscrollbar.cpp
diff --git a/src/controls/qquickscrollbar_p.h b/src/templates/qquickscrollbar_p.h
index 270b2757..4c723022 100644
--- a/src/controls/qquickscrollbar_p.h
+++ b/src/templates/qquickscrollbar_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ class QQuickFlickable;
 class QQuickScrollBarAttached;
 class QQuickScrollBarPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickScrollBar : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@@ -114,7 +114,7 @@ Q_DECLARE_TYPEINFO(QQuickScrollBar, Q_COMPLEX_TYPE);
 
 class QQuickScrollBarAttachedPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickScrollBarAttached : public QObject
+class Q_QUICKTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
diff --git a/src/controls/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp
index b935b0e8..b935b0e8 100644
--- a/src/controls/qquickscrollindicator.cpp
+++ b/src/templates/qquickscrollindicator.cpp
diff --git a/src/controls/qquickscrollindicator_p.h b/src/templates/qquickscrollindicator_p.h
index e09f0376..3e1f4e47 100644
--- a/src/controls/qquickscrollindicator_p.h
+++ b/src/templates/qquickscrollindicator_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ class QQuickFlickable;
 class QQuickScrollIndicatorAttached;
 class QQuickScrollIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickScrollIndicator : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@@ -102,7 +102,7 @@ Q_DECLARE_TYPEINFO(QQuickScrollIndicator, Q_COMPLEX_TYPE);
 
 class QQuickScrollIndicatorAttachedPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickScrollIndicatorAttached : public QObject
+class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
diff --git a/src/controls/qquickslider.cpp b/src/templates/qquickslider.cpp
index 581f85da..581f85da 100644
--- a/src/controls/qquickslider.cpp
+++ b/src/templates/qquickslider.cpp
diff --git a/src/controls/qquickslider_p.h b/src/templates/qquickslider_p.h
index 186ef029..b6743156 100644
--- a/src/controls/qquickslider_p.h
+++ b/src/templates/qquickslider_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSliderPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickSlider : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickSlider : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/controls/qquickstackview.cpp b/src/templates/qquickstackview.cpp
index 1c09b6e8..1c09b6e8 100644
--- a/src/controls/qquickstackview.cpp
+++ b/src/templates/qquickstackview.cpp
diff --git a/src/controls/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp
index 451e5512..451e5512 100644
--- a/src/controls/qquickstackview_p.cpp
+++ b/src/templates/qquickstackview_p.cpp
diff --git a/src/controls/qquickstackview_p.h b/src/templates/qquickstackview_p.h
index 9dd7280b..df72f5d8 100644
--- a/src/controls/qquickstackview_p.h
+++ b/src/templates/qquickstackview_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +58,7 @@ class QQuickStackElement;
 class QQuickStackAttached;
 class QQuickStackViewPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickStackView : public QQuickControl
+class Q_QUICKTEMPLATES_EXPORT QQuickStackView : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool busy READ busy NOTIFY busyChanged FINAL)
@@ -148,7 +148,7 @@ Q_DECLARE_TYPEINFO(QQuickStackView, Q_COMPLEX_TYPE);
 
 class QQuickStackAttachedPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickStackAttached : public QObject
+class Q_QUICKTEMPLATES_EXPORT QQuickStackAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
diff --git a/src/controls/qquickstackview_p_p.h b/src/templates/qquickstackview_p_p.h
index 0e0039b6..237a8ac4 100644
--- a/src/controls/qquickstackview_p_p.h
+++ b/src/templates/qquickstackview_p_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickstackview_p.h>
-#include <QtQuickControls/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates/private/qquickstackview_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
 #include <QtQuick/private/qquickitemviewtransition_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 #include <QtQml/private/qv4persistent_p.h>
diff --git a/src/controls/qquickswitch.cpp b/src/templates/qquickswitch.cpp
index b4619318..b4619318 100644
--- a/src/controls/qquickswitch.cpp
+++ b/src/templates/qquickswitch.cpp
diff --git a/src/controls/qquickswitch_p.h b/src/templates/qquickswitch_p.h
index b3a48c63..5b3cbcf2 100644
--- a/src/controls/qquickswitch_p.h
+++ b/src/templates/qquickswitch_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcheckable_p.h>
+#include <QtQuickTemplates/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSwitchPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickSwitch : public QQuickCheckable
+class Q_QUICKTEMPLATES_EXPORT QQuickSwitch : public QQuickCheckable
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/controls/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp
index 38de7f49..38de7f49 100644
--- a/src/controls/qquicktabbar.cpp
+++ b/src/templates/qquicktabbar.cpp
diff --git a/src/controls/qquicktabbar_p.h b/src/templates/qquicktabbar_p.h
index 5307d477..43ff0035 100644
--- a/src/controls/qquicktabbar_p.h
+++ b/src/templates/qquicktabbar_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickTemplates/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickTabBarPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickTabBar : public QQuickContainer
+class Q_QUICKTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
diff --git a/src/controls/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp
index ce88c7ab..ce88c7ab 100644
--- a/src/controls/qquicktabbutton.cpp
+++ b/src/templates/qquicktabbutton.cpp
diff --git a/src/controls/qquicktabbutton_p.h b/src/templates/qquicktabbutton_p.h
index 20761e31..51b00835 100644
--- a/src/controls/qquicktabbutton_p.h
+++ b/src/templates/qquicktabbutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcheckable_p.h>
+#include <QtQuickTemplates/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickTabButton : public QQuickCheckable
+class Q_QUICKTEMPLATES_EXPORT QQuickTabButton : public QQuickCheckable
 {
     Q_OBJECT
 
diff --git a/src/controls/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp
index d46702e2..d46702e2 100644
--- a/src/controls/qquicktextarea.cpp
+++ b/src/templates/qquicktextarea.cpp
diff --git a/src/controls/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h
index 6e5561b6..78a51b6f 100644
--- a/src/controls/qquicktextarea_p.h
+++ b/src/templates/qquicktextarea_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextedit_p.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ class QQuickText;
 class QQuickTextAreaPrivate;
 class QQuickMouseEvent;
 
-class Q_QUICKCONTROLS_EXPORT QQuickTextArea : public QQuickTextEdit
+class Q_QUICKTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/controls/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h
index 2d93c13e..8d7ad690 100644
--- a/src/controls/qquicktextarea_p_p.h
+++ b/src/templates/qquicktextarea_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextedit_p_p.h>
-#include <QtQuickControls/private/qquickpressandholdhelper_p.h>
+#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h>
 
 #include "qquicktextarea_p.h"
 
diff --git a/src/controls/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp
index 7cf5f3c1..7cf5f3c1 100644
--- a/src/controls/qquicktextfield.cpp
+++ b/src/templates/qquicktextfield.cpp
diff --git a/src/controls/qquicktextfield_p.h b/src/templates/qquicktextfield_p.h
index 937113f2..400f0334 100644
--- a/src/controls/qquicktextfield_p.h
+++ b/src/templates/qquicktextfield_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextinput_p.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ class QQuickText;
 class QQuickTextFieldPrivate;
 class QQuickMouseEvent;
 
-class Q_QUICKCONTROLS_EXPORT QQuickTextField : public QQuickTextInput
+class Q_QUICKTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/controls/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h
index 89dc0572..b50fea08 100644
--- a/src/controls/qquicktextfield_p_p.h
+++ b/src/templates/qquicktextfield_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextinput_p_p.h>
-#include <QtQuickControls/private/qquickpressandholdhelper_p.h>
+#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h>
 
 #include "qquicktextfield_p.h"
 
diff --git a/src/controls/qquicktogglebutton.cpp b/src/templates/qquicktogglebutton.cpp
index 96edbefd..96edbefd 100644
--- a/src/controls/qquicktogglebutton.cpp
+++ b/src/templates/qquicktogglebutton.cpp
diff --git a/src/controls/qquicktogglebutton_p.h b/src/templates/qquicktogglebutton_p.h
index 5a4b377a..8f80437e 100644
--- a/src/controls/qquicktogglebutton_p.h
+++ b/src/templates/qquicktogglebutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickswitch_p.h>
+#include <QtQuickTemplates/private/qquickswitch_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickToggleButton : public QQuickSwitch
+class Q_QUICKTEMPLATES_EXPORT QQuickToggleButton : public QQuickSwitch
 {
     Q_OBJECT
 
diff --git a/src/controls/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp
index f9141b25..f9141b25 100644
--- a/src/controls/qquicktoolbar.cpp
+++ b/src/templates/qquicktoolbar.cpp
diff --git a/src/controls/qquicktoolbar_p.h b/src/templates/qquicktoolbar_p.h
index 3525c3df..80204e5b 100644
--- a/src/controls/qquicktoolbar_p.h
+++ b/src/templates/qquicktoolbar_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickframe_p.h>
+#include <QtQuickTemplates/private/qquickframe_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickToolBar : public QQuickFrame
+class Q_QUICKTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame
 {
     Q_OBJECT
 
diff --git a/src/controls/qquicktoolbutton.cpp b/src/templates/qquicktoolbutton.cpp
index b913494e..b913494e 100644
--- a/src/controls/qquicktoolbutton.cpp
+++ b/src/templates/qquicktoolbutton.cpp
diff --git a/src/controls/qquicktoolbutton_p.h b/src/templates/qquicktoolbutton_p.h
index 0eb323b0..25ef6639 100644
--- a/src/controls/qquicktoolbutton_p.h
+++ b/src/templates/qquicktoolbutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickbutton_p.h>
+#include <QtQuickTemplates/private/qquickbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickToolButton : public QQuickButton
+class Q_QUICKTEMPLATES_EXPORT QQuickToolButton : public QQuickButton
 {
     Q_OBJECT
 
diff --git a/src/controls/qtquickcontrolsglobal_p.h b/src/templates/qtquicktemplatesglobal_p.h
index 933980b8..f39af6e1 100644
--- a/src/controls/qtquickcontrolsglobal_p.h
+++ b/src/templates/qtquicktemplatesglobal_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTQUICKCONTROLSGLOBAL_P_H
-#define QTQUICKCONTROLSGLOBAL_P_H
+#ifndef QTQUICKTEMPLATESGLOBAL_P_H
+#define QTQUICKTEMPLATESGLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -53,15 +53,15 @@
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
-#  if defined(QT_BUILD_QUICKCONTROLS2_LIB)
-#    define Q_QUICKCONTROLS_EXPORT Q_DECL_EXPORT
+#  if defined(QT_BUILD_QUICKTEMPLATES_LIB)
+#    define Q_QUICKTEMPLATES_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_QUICKCONTROLS_EXPORT Q_DECL_IMPORT
+#    define Q_QUICKTEMPLATES_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define Q_QUICKCONTROLS_EXPORT
+#  define Q_QUICKTEMPLATES_EXPORT
 #endif
 
 QT_END_NAMESPACE
 
-#endif // QTQUICKCONTROLSGLOBAL_P_H
+#endif // QTQUICKTEMPLATESGLOBAL_P_H
diff --git a/src/controls/controls.pri b/src/templates/templates.pri
index 60edac78..60edac78 100644
--- a/src/controls/controls.pri
+++ b/src/templates/templates.pri
diff --git a/src/controls/controls.pro b/src/templates/templates.pro
index a51b7e93..ab189d64 100644
--- a/src/controls/controls.pro
+++ b/src/templates/templates.pro
@@ -1,5 +1,5 @@
-TARGET = QtQuickControls
-MODULE = quickcontrols2
+TARGET = QtQuickTemplates
+MODULE = quicktemplates
 CONFIG += internal_module
 
 QT += quick
@@ -10,7 +10,7 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf
 
 HEADERS += \
-    $$PWD/qtquickcontrolsglobal_p.h
+    $$PWD/qtquicktemplatesglobal_p.h
 
-include(controls.pri)
+include(templates.pri)
 load(qt_module)
diff --git a/sync.profile b/sync.profile
index f00b7d06..a365aca9 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtQuickControls" => "$basedir/src/controls",
+    "QtQuickTemplates" => "$basedir/src/templates",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );