137 files changed, 219 insertions, 219 deletions

diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 16f2005c..5a5ffb01 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -2,7 +2,7 @@ TARGET = QtQuickControls
 MODULE = quickcontrols
 
 QT += quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/controls/qquickstyleattached.cpp b/src/controls/qquickstyleattached.cpp
index 0ac47ed1..a815b956 100644
--- a/src/controls/qquickstyleattached.cpp
+++ b/src/controls/qquickstyleattached.cpp
@@ -40,7 +40,7 @@
 #include <QtCore/qsettings.h>
 #include <QtCore/qfileselector.h>
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickTemplates/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro
index 7c375139..8e9446cc 100644
--- a/src/imports/calendar/calendar.pro
+++ b/src/imports/calendar/calendar.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/calendar
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp
index 8530389f..b630adc9 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 <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/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 7c69bba0..51d2c329 100644
--- a/src/imports/calendar/qquickdayofweekrow_p.h
+++ b/src/imports/calendar/qquickdayofweekrow_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp
index 084ade3c..5227e7d5 100644
--- a/src/imports/calendar/qquickmonthgrid.cpp
+++ b/src/imports/calendar/qquickmonthgrid.cpp
@@ -39,7 +39,7 @@
 
 #include <QtGui/qstylehints.h>
 #include <QtGui/qguiapplication.h>
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 #include <QtQml/qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h
index df5f1716..9d8d65d1 100644
--- a/src/imports/calendar/qquickmonthgrid_p.h
+++ b/src/imports/calendar/qquickmonthgrid_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp
index 1aac33f9..e18daf19 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 <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 #include <QtQml/qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h
index 92606fc8..bf3da66e 100644
--- a/src/imports/calendar/qquickweeknumbercolumn_p.h
+++ b/src/imports/calendar/qquickweeknumbercolumn_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index ea8da342..281689ef 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 3466d457..96176fcc 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -30,18 +30,18 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake
 # \example controls/tabs
 exampledirs += ../../../../examples/controls \
                ../ \
-               ../../../templates \
+               ../../../quicktemplates2 \
                ../../calendar \
                ../../../../tests/auto/controls/data \
                snippets
 
 examplesinstallpath = qtquickcontrols2/controls
 
-headerdirs += ../../../templates \
+headerdirs += ../../../quicktemplates2 \
               ../../calendar \
               ../../../controls
 
-sourcedirs += ../../../templates \
+sourcedirs += ../../../quicktemplates2 \
               ../../calendar \
               ../../../controls \
               src
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 667235ab..10b46885 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/material
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/controls/qtquickcontrolsplugin.cpp b/src/imports/controls/qtquickcontrolsplugin.cpp
index e8b1e386..442dce69 100644
--- a/src/imports/controls/qtquickcontrolsplugin.cpp
+++ b/src/imports/controls/qtquickcontrolsplugin.cpp
@@ -41,11 +41,11 @@
 #include <QtCore/private/qfileselector_p.h>
 
 #include <QtQuickControls/qquickstyle.h>
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
-#include <QtQuickTemplates/private/qquickbuttongroup_p.h>
-#include <QtQuickTemplates/private/qquickcontainer_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
-#include <QtQuickTemplates/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickbuttongroup_p.h>
+#include <QtQuickTemplates2/private/qquickcontainer_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
 #include <QtQuickControls/private/qquickpluginutils_p.h>
 #include <QtQuickControls/private/qquickstyleselector_p.h>
 
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 14058547..83720408 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/universal
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/templates/qtquicktemplatesplugin.cpp b/src/imports/templates/qtquicktemplatesplugin.cpp
index 2329cb0f..c88b2eaa 100644
--- a/src/imports/templates/qtquicktemplatesplugin.cpp
+++ b/src/imports/templates/qtquicktemplatesplugin.cpp
@@ -36,49 +36,49 @@
 
 #include <QtQml/qqmlextensionplugin.h>
 
-#include <QtQuickTemplates/private/qquickabstractbutton_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/qquickcheckdelegate_p.h>
-#include <QtQuickTemplates/private/qquickcombobox_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
-#include <QtQuickTemplates/private/qquickcontainer_p.h>
-#include <QtQuickTemplates/private/qquickdial_p.h>
-#include <QtQuickTemplates/private/qquickdrawer_p.h>
-#include <QtQuickTemplates/private/qquickframe_p.h>
-#include <QtQuickTemplates/private/qquickgroupbox_p.h>
-#include <QtQuickTemplates/private/qquickitemdelegate_p.h>
-#include <QtQuickTemplates/private/qquicklabel_p.h>
-#include <QtQuickTemplates/private/qquickmenu_p.h>
-#include <QtQuickTemplates/private/qquickmenuitem_p.h>
-#include <QtQuickTemplates/private/qquickoverlay_p.h>
-#include <QtQuickTemplates/private/qquickpage_p.h>
-#include <QtQuickTemplates/private/qquickpageindicator_p.h>
-#include <QtQuickTemplates/private/qquickpane_p.h>
-#include <QtQuickTemplates/private/qquickpopup_p.h>
-#include <QtQuickTemplates/private/qquickprogressbar_p.h>
-#include <QtQuickTemplates/private/qquickradiobutton_p.h>
-#include <QtQuickTemplates/private/qquickradiodelegate_p.h>
-#include <QtQuickTemplates/private/qquickrangeslider_p.h>
-#include <QtQuickTemplates/private/qquickscrollbar_p.h>
-#include <QtQuickTemplates/private/qquickscrollindicator_p.h>
-#include <QtQuickTemplates/private/qquickslider_p.h>
-#include <QtQuickTemplates/private/qquickspinbox_p.h>
-#include <QtQuickTemplates/private/qquickstackview_p.h>
-#include <QtQuickTemplates/private/qquickswipedelegate_p.h>
-#include <QtQuickTemplates/private/qquickswipeview_p.h>
-#include <QtQuickTemplates/private/qquickswitch_p.h>
-#include <QtQuickTemplates/private/qquickswitchdelegate_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/qquicktoolbar_p.h>
-#include <QtQuickTemplates/private/qquicktoolbutton_p.h>
-#include <QtQuickTemplates/private/qquicktooltip_p.h>
-#include <QtQuickTemplates/private/qquicktumbler_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickbusyindicator_p.h>
+#include <QtQuickTemplates2/private/qquickbutton_p.h>
+#include <QtQuickTemplates2/private/qquickcheckbox_p.h>
+#include <QtQuickTemplates2/private/qquickcheckdelegate_p.h>
+#include <QtQuickTemplates2/private/qquickcombobox_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontainer_p.h>
+#include <QtQuickTemplates2/private/qquickdial_p.h>
+#include <QtQuickTemplates2/private/qquickdrawer_p.h>
+#include <QtQuickTemplates2/private/qquickframe_p.h>
+#include <QtQuickTemplates2/private/qquickgroupbox_p.h>
+#include <QtQuickTemplates2/private/qquickitemdelegate_p.h>
+#include <QtQuickTemplates2/private/qquicklabel_p.h>
+#include <QtQuickTemplates2/private/qquickmenu_p.h>
+#include <QtQuickTemplates2/private/qquickmenuitem_p.h>
+#include <QtQuickTemplates2/private/qquickoverlay_p.h>
+#include <QtQuickTemplates2/private/qquickpage_p.h>
+#include <QtQuickTemplates2/private/qquickpageindicator_p.h>
+#include <QtQuickTemplates2/private/qquickpane_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickprogressbar_p.h>
+#include <QtQuickTemplates2/private/qquickradiobutton_p.h>
+#include <QtQuickTemplates2/private/qquickradiodelegate_p.h>
+#include <QtQuickTemplates2/private/qquickrangeslider_p.h>
+#include <QtQuickTemplates2/private/qquickscrollbar_p.h>
+#include <QtQuickTemplates2/private/qquickscrollindicator_p.h>
+#include <QtQuickTemplates2/private/qquickslider_p.h>
+#include <QtQuickTemplates2/private/qquickspinbox_p.h>
+#include <QtQuickTemplates2/private/qquickstackview_p.h>
+#include <QtQuickTemplates2/private/qquickswipedelegate_p.h>
+#include <QtQuickTemplates2/private/qquickswipeview_p.h>
+#include <QtQuickTemplates2/private/qquickswitch_p.h>
+#include <QtQuickTemplates2/private/qquickswitchdelegate_p.h>
+#include <QtQuickTemplates2/private/qquicktabbar_p.h>
+#include <QtQuickTemplates2/private/qquicktabbutton_p.h>
+#include <QtQuickTemplates2/private/qquicktextarea_p.h>
+#include <QtQuickTemplates2/private/qquicktextfield_p.h>
+#include <QtQuickTemplates2/private/qquicktoolbar_p.h>
+#include <QtQuickTemplates2/private/qquicktoolbutton_p.h>
+#include <QtQuickTemplates2/private/qquicktooltip_p.h>
+#include <QtQuickTemplates2/private/qquicktumbler_p.h>
 
 static inline void initResources()
 {
diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro
index f3dd85c9..57a88336 100644
--- a/src/imports/templates/templates.pro
+++ b/src/imports/templates/templates.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/templates
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/templates/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 2a462c03..2a462c03 100644
--- a/src/templates/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
diff --git a/src/templates/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h
index 71aed622..79f9b92e 100644
--- a/src/templates/qquickabstractbutton_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickAbstractButtonPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickAbstractButton : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
diff --git a/src/templates/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
index a26785ae..62112e07 100644
--- a/src/templates/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index d9a0097b..d9a0097b 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
diff --git a/src/templates/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h
index 1a0b82ec..e383d08b 100644
--- a/src/templates/qquickapplicationwindow_p.h
+++ b/src/quicktemplates2/qquickapplicationwindow_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquickwindowmodule_p.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 #include <QtGui/qfont.h>
 #include <QtCore/qlocale.h>
 
@@ -60,7 +60,7 @@ class QQuickApplicationWindowPrivate;
 class QQuickApplicationWindowAttached;
 class QQuickApplicationWindowAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
+class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
@@ -125,7 +125,7 @@ private:
     QScopedPointer<QQuickApplicationWindowPrivate> d_ptr;
 };
 
-class Q_QUICKTEMPLATES_EXPORT QQuickApplicationWindowAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindowAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickApplicationWindow *window READ window NOTIFY windowChanged FINAL)
diff --git a/src/templates/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp
index 631101c3..631101c3 100644
--- a/src/templates/qquickbusyindicator.cpp
+++ b/src/quicktemplates2/qquickbusyindicator.cpp
diff --git a/src/templates/qquickbusyindicator_p.h b/src/quicktemplates2/qquickbusyindicator_p.h
index a7198639..d7c4c70f 100644
--- a/src/templates/qquickbusyindicator_p.h
+++ b/src/quicktemplates2/qquickbusyindicator_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickBusyIndicatorPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickBusyIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL)
diff --git a/src/templates/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index 3dbab498..3dbab498 100644
--- a/src/templates/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
diff --git a/src/templates/qquickbutton_p.h b/src/quicktemplates2/qquickbutton_p.h
index 00476313..654651d7 100644
--- a/src/templates/qquickbutton_p.h
+++ b/src/quicktemplates2/qquickbutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickButton : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL)
diff --git a/src/templates/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp
index 7a087300..7a087300 100644
--- a/src/templates/qquickbuttongroup.cpp
+++ b/src/quicktemplates2/qquickbuttongroup.cpp
diff --git a/src/templates/qquickbuttongroup_p.h b/src/quicktemplates2/qquickbuttongroup_p.h
index 4c0d6fef..96991e19 100644
--- a/src/templates/qquickbuttongroup_p.h
+++ b/src/quicktemplates2/qquickbuttongroup_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtCore/qobject.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +59,7 @@ class QQuickButtonGroupPrivate;
 class QQuickButtonGroupAttached;
 class QQuickButtonGroupAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickButtonGroup : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickButtonGroup : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
@@ -89,7 +89,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickButtonGroup)
 };
 
-class Q_QUICKTEMPLATES_EXPORT QQuickButtonGroupAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickButtonGroupAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickButtonGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL)
diff --git a/src/templates/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp
index 8e0b3953..8e0b3953 100644
--- a/src/templates/qquickcheckbox.cpp
+++ b/src/quicktemplates2/qquickcheckbox.cpp
diff --git a/src/templates/qquickcheckbox_p.h b/src/quicktemplates2/qquickcheckbox_p.h
index c2b3d6b6..1e9389b2 100644
--- a/src/templates/qquickcheckbox_p.h
+++ b/src/quicktemplates2/qquickcheckbox_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickCheckBoxPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickCheckBox : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickCheckBox : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL)
diff --git a/src/templates/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index 53c2af69..53c2af69 100644
--- a/src/templates/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
diff --git a/src/templates/qquickcheckdelegate_p.h b/src/quicktemplates2/qquickcheckdelegate_p.h
index 20ca6b39..183953d1 100644
--- a/src/templates/qquickcheckdelegate_p.h
+++ b/src/quicktemplates2/qquickcheckdelegate_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickitemdelegate_p.h>
+#include <QtQuickTemplates2/private/qquickitemdelegate_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickCheckDelegatePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickCheckDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickCheckDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL)
diff --git a/src/templates/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index d25e674c..d25e674c 100644
--- a/src/templates/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
diff --git a/src/templates/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h
index b9271aed..e90141e3 100644
--- a/src/templates/qquickcombobox_p.h
+++ b/src/quicktemplates2/qquickcombobox_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ class QQuickPopup;
 class QQmlInstanceModel;
 class QQuickComboBoxPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickComboBox : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickComboBox : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
diff --git a/src/templates/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index 9d39182f..9d39182f 100644
--- a/src/templates/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
diff --git a/src/templates/qquickcontainer_p.h b/src/quicktemplates2/qquickcontainer_p.h
index e60c13a7..4efcdba1 100644
--- a/src/templates/qquickcontainer_p.h
+++ b/src/quicktemplates2/qquickcontainer_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtQml/qqmllist.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickContainerPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickContainer : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickContainer : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
diff --git a/src/templates/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h
index 3382d104..25ccfda9 100644
--- a/src/templates/qquickcontainer_p_p.h
+++ b/src/quicktemplates2/qquickcontainer_p_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 #include <QtQml/private/qqmlobjectmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
+class Q_QUICKTEMPLATES2_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickContainer)
 
diff --git a/src/templates/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 2bee0ed2..2bee0ed2 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
diff --git a/src/templates/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h
index 4cd0b77c..086489b3 100644
--- a/src/templates/qquickcontrol_p.h
+++ b/src/quicktemplates2/qquickcontrol_p.h
@@ -50,13 +50,13 @@
 
 #include <QtCore/qlocale.h>
 #include <QtQuick/qquickitem.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickControlPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickControl : public QQuickItem
+class Q_QUICKTEMPLATES2_EXPORT QQuickControl : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
diff --git a/src/templates/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 301483ab..6972f3c8 100644
--- a/src/templates/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickAccessibleAttached;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickControlPrivate : public QQuickItemPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickControlPrivate : public QQuickItemPrivate
 #ifndef QT_NO_ACCESSIBILITY
     , public QAccessible::ActivationObserver
 #endif
diff --git a/src/templates/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index bfc91808..7cdca7ef 100644
--- a/src/templates/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/qmath.h>
 #include <QtQuick/private/qquickflickable_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/templates/qquickdial_p.h b/src/quicktemplates2/qquickdial_p.h
index dd75b2ba..11ffb3c1 100644
--- a/src/templates/qquickdial_p.h
+++ b/src/quicktemplates2/qquickdial_p.h
@@ -50,14 +50,14 @@
 
 #include <QtCore/qvariant.h>
 #include <QtQml/qqmlcomponent.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickDialAttached;
 class QQuickDialPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickDial : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickDial : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/templates/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 8d8d2d78..8d8d2d78 100644
--- a/src/templates/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
diff --git a/src/templates/qquickdrawer_p.h b/src/quicktemplates2/qquickdrawer_p.h
index dfc4639a..a6ab50ee 100644
--- a/src/templates/qquickdrawer_p.h
+++ b/src/quicktemplates2/qquickdrawer_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickDrawerPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickDrawer : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickDrawer : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL)
diff --git a/src/templates/qquickframe.cpp b/src/quicktemplates2/qquickframe.cpp
index 265c2ba3..265c2ba3 100644
--- a/src/templates/qquickframe.cpp
+++ b/src/quicktemplates2/qquickframe.cpp
diff --git a/src/templates/qquickframe_p.h b/src/quicktemplates2/qquickframe_p.h
index 3d03caf1..d1f9b0ba 100644
--- a/src/templates/qquickframe_p.h
+++ b/src/quicktemplates2/qquickframe_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickpane_p.h>
+#include <QtQuickTemplates2/private/qquickpane_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickFramePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickFrame : public QQuickPane
+class Q_QUICKTEMPLATES2_EXPORT QQuickFrame : public QQuickPane
 {
     Q_OBJECT
 
diff --git a/src/templates/qquickframe_p_p.h b/src/quicktemplates2/qquickframe_p_p.h
index 4d84a9f3..35cda8ae 100644
--- a/src/templates/qquickframe_p_p.h
+++ b/src/quicktemplates2/qquickframe_p_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickpane_p_p.h>
+#include <QtQuickTemplates2/private/qquickpane_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickFrame;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickFramePrivate : public QQuickPanePrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickFramePrivate : public QQuickPanePrivate
 {
 };
 
diff --git a/src/templates/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index 6efdb140..6efdb140 100644
--- a/src/templates/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
diff --git a/src/templates/qquickgroupbox_p.h b/src/quicktemplates2/qquickgroupbox_p.h
index 4c33f1dd..f1670904 100644
--- a/src/templates/qquickgroupbox_p.h
+++ b/src/quicktemplates2/qquickgroupbox_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickframe_p.h>
+#include <QtQuickTemplates2/private/qquickframe_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickGroupBoxPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame
+class Q_QUICKTEMPLATES2_EXPORT QQuickGroupBox : public QQuickFrame
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
diff --git a/src/templates/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp
index 604c7464..604c7464 100644
--- a/src/templates/qquickitemdelegate.cpp
+++ b/src/quicktemplates2/qquickitemdelegate.cpp
diff --git a/src/templates/qquickitemdelegate_p.h b/src/quicktemplates2/qquickitemdelegate_p.h
index 8e3fd6b9..b34b4283 100644
--- a/src/templates/qquickitemdelegate_p.h
+++ b/src/quicktemplates2/qquickitemdelegate_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES_EXPORT QQuickItemDelegate : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickItemDelegate : public QQuickAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/templates/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 86eb9144..86eb9144 100644
--- a/src/templates/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
diff --git a/src/templates/qquicklabel_p.h b/src/quicktemplates2/qquicklabel_p.h
index e2084fe0..c0dd4cb2 100644
--- a/src/templates/qquicklabel_p.h
+++ b/src/quicktemplates2/qquicklabel_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickLabelPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickLabel : public QQuickText
+class Q_QUICKTEMPLATES2_EXPORT QQuickLabel : public QQuickText
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/templates/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index aa24a5fd..aa24a5fd 100644
--- a/src/templates/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
diff --git a/src/templates/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index b4154dc9..b4154dc9 100644
--- a/src/templates/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
diff --git a/src/templates/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h
index c6ee52c8..47834a59 100644
--- a/src/templates/qquickmenu_p.h
+++ b/src/quicktemplates2/qquickmenu_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QQuickMenuItem;
 class QQuickMenuPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickMenu : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenu : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL)
diff --git a/src/templates/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h
index 70230262..bc118f14 100644
--- a/src/templates/qquickmenu_p_p.h
+++ b/src/quicktemplates2/qquickmenu_p_p.h
@@ -52,13 +52,13 @@
 #include <QtCore/qpointer.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 
-#include <QtQuickTemplates/private/qquickpopup_p_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQmlObjectModel;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickMenu)
 
diff --git a/src/templates/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp
index daf426e6..daf426e6 100644
--- a/src/templates/qquickmenuitem.cpp
+++ b/src/quicktemplates2/qquickmenuitem.cpp
diff --git a/src/templates/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h
index 66f5fdad..999a6445 100644
--- a/src/templates/qquickmenuitem_p.h
+++ b/src/quicktemplates2/qquickmenuitem_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickMenuItemPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickMenuItem : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuItem : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL)
diff --git a/src/templates/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index 4977d08d..4977d08d 100644
--- a/src/templates/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
diff --git a/src/templates/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h
index 3aed5a82..0ea51aea 100644
--- a/src/templates/qquickoverlay_p.h
+++ b/src/quicktemplates2/qquickoverlay_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuick/qquickitem.h>
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickOverlayPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickOverlay : public QQuickItem
+class Q_QUICKTEMPLATES2_EXPORT QQuickOverlay : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
diff --git a/src/templates/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 8e0b542f..8e0b542f 100644
--- a/src/templates/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
diff --git a/src/templates/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h
index b9e45c77..950b72e6 100644
--- a/src/templates/qquickpage_p.h
+++ b/src/quicktemplates2/qquickpage_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtQml/qqmllist.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickPagePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickPage : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickPage : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL)
diff --git a/src/templates/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp
index f49909cc..f49909cc 100644
--- a/src/templates/qquickpageindicator.cpp
+++ b/src/quicktemplates2/qquickpageindicator.cpp
diff --git a/src/templates/qquickpageindicator_p.h b/src/quicktemplates2/qquickpageindicator_p.h
index d94e470a..96c12170 100644
--- a/src/templates/qquickpageindicator_p.h
+++ b/src/quicktemplates2/qquickpageindicator_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQmlComponent;
 class QQuickPageIndicatorPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickPageIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL)
diff --git a/src/templates/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index f5588d86..f5588d86 100644
--- a/src/templates/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
diff --git a/src/templates/qquickpane_p.h b/src/quicktemplates2/qquickpane_p.h
index c3529bf4..519ea706 100644
--- a/src/templates/qquickpane_p.h
+++ b/src/quicktemplates2/qquickpane_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtQml/qqmllist.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickPanePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickPane : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickPane : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL)
diff --git a/src/templates/qquickpane_p_p.h b/src/quicktemplates2/qquickpane_p_p.h
index 34feff07..f99a8928 100644
--- a/src/templates/qquickpane_p_p.h
+++ b/src/quicktemplates2/qquickpane_p_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickPane;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickPanePrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickPanePrivate : public QQuickControlPrivate
 {
     Q_DECLARE_PUBLIC(QQuickPane)
 
diff --git a/src/templates/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index be3c720c..be3c720c 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
diff --git a/src/templates/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h
index 22f9e8a9..a0ba5359 100644
--- a/src/templates/qquickpopup_p.h
+++ b/src/quicktemplates2/qquickpopup_p.h
@@ -53,7 +53,7 @@
 #include <QtGui/qevent.h>
 #include <QtCore/qlocale.h>
 #include <QtGui/qfont.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 #include <QtQml/qqml.h>
 #include <QtQml/qqmllist.h>
 #include <QtQml/qqmlparserstatus.h>
@@ -69,7 +69,7 @@ class QQuickWindow;
 class QQuickPopupPrivate;
 class QQuickTransition;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStatus
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopup : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
diff --git a/src/templates/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 577c4b51..577c4b51 100644
--- a/src/templates/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
diff --git a/src/templates/qquickpresshandler.cpp b/src/quicktemplates2/qquickpresshandler.cpp
index e505ab7d..e505ab7d 100644
--- a/src/templates/qquickpresshandler.cpp
+++ b/src/quicktemplates2/qquickpresshandler.cpp
diff --git a/src/templates/qquickpresshandler_p_p.h b/src/quicktemplates2/qquickpresshandler_p_p.h
index 526695e0..526695e0 100644
--- a/src/templates/qquickpresshandler_p_p.h
+++ b/src/quicktemplates2/qquickpresshandler_p_p.h
diff --git a/src/templates/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp
index 779f2468..779f2468 100644
--- a/src/templates/qquickprogressbar.cpp
+++ b/src/quicktemplates2/qquickprogressbar.cpp
diff --git a/src/templates/qquickprogressbar_p.h b/src/quicktemplates2/qquickprogressbar_p.h
index 9d37a5f9..4d81c706 100644
--- a/src/templates/qquickprogressbar_p.h
+++ b/src/quicktemplates2/qquickprogressbar_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickProgressBarPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickProgressBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/templates/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp
index 93a3c4a7..93a3c4a7 100644
--- a/src/templates/qquickradiobutton.cpp
+++ b/src/quicktemplates2/qquickradiobutton.cpp
diff --git a/src/templates/qquickradiobutton_p.h b/src/quicktemplates2/qquickradiobutton_p.h
index 3d63d9c9..1ddba7c9 100644
--- a/src/templates/qquickradiobutton_p.h
+++ b/src/quicktemplates2/qquickradiobutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES_EXPORT QQuickRadioButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickRadioButton : public QQuickAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/templates/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp
index e70044e7..e70044e7 100644
--- a/src/templates/qquickradiodelegate.cpp
+++ b/src/quicktemplates2/qquickradiodelegate.cpp
diff --git a/src/templates/qquickradiodelegate_p.h b/src/quicktemplates2/qquickradiodelegate_p.h
index 8ab04c51..b428bd37 100644
--- a/src/templates/qquickradiodelegate_p.h
+++ b/src/quicktemplates2/qquickradiodelegate_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickitemdelegate_p.h>
+#include <QtQuickTemplates2/private/qquickitemdelegate_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickRadioDelegatePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickRadioDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickRadioDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
 
diff --git a/src/templates/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 19ce5e19..19ce5e19 100644
--- a/src/templates/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
diff --git a/src/templates/qquickrangeslider_p.h b/src/quicktemplates2/qquickrangeslider_p.h
index 7eda2e4e..009116c9 100644
--- a/src/templates/qquickrangeslider_p.h
+++ b/src/quicktemplates2/qquickrangeslider_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickRangeSliderPrivate;
 class QQuickRangeSliderNode;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickRangeSlider : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickRangeSlider : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
@@ -127,7 +127,7 @@ private:
 
 class QQuickRangeSliderNodePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickRangeSliderNode : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickRangeSliderNode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)
diff --git a/src/templates/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index f8ce76ab..f8ce76ab 100644
--- a/src/templates/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
diff --git a/src/templates/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h
index 63ecd472..0a86ac95 100644
--- a/src/templates/qquickscrollbar_p.h
+++ b/src/quicktemplates2/qquickscrollbar_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ class QQuickFlickable;
 class QQuickScrollBarAttached;
 class QQuickScrollBarPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@@ -117,7 +117,7 @@ private:
 
 class QQuickScrollBarAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollBarAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
diff --git a/src/templates/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp
index 619c9b4b..619c9b4b 100644
--- a/src/templates/qquickscrollindicator.cpp
+++ b/src/quicktemplates2/qquickscrollindicator.cpp
diff --git a/src/templates/qquickscrollindicator_p.h b/src/quicktemplates2/qquickscrollindicator_p.h
index e669928d..1af57929 100644
--- a/src/templates/qquickscrollindicator_p.h
+++ b/src/quicktemplates2/qquickscrollindicator_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ class QQuickFlickable;
 class QQuickScrollIndicatorAttached;
 class QQuickScrollIndicatorPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@@ -100,7 +100,7 @@ private:
 
 class QQuickScrollIndicatorAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollIndicatorAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
diff --git a/src/templates/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 16be7677..16be7677 100644
--- a/src/templates/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
diff --git a/src/templates/qquickslider_p.h b/src/quicktemplates2/qquickslider_p.h
index cff734fd..8efa6b02 100644
--- a/src/templates/qquickslider_p.h
+++ b/src/quicktemplates2/qquickslider_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSliderPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSlider : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickSlider : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/templates/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index a18e2bde..a18e2bde 100644
--- a/src/templates/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
diff --git a/src/templates/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h
index c51f8f77..11d8fff6 100644
--- a/src/templates/qquickspinbox_p.h
+++ b/src/quicktemplates2/qquickspinbox_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtQml/qjsvalue.h>
 
 QT_BEGIN_NAMESPACE
@@ -58,7 +58,7 @@ class QQuickSpinButton;
 class QQuickSpinButtonPrivate;
 class QQuickSpinBoxPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSpinBox : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickSpinBox : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int from READ from WRITE setFrom NOTIFY fromChanged FINAL)
@@ -141,7 +141,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickSpinBox)
 };
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSpinButton : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSpinButton : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL)
diff --git a/src/templates/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index f5d6f5b1..f5d6f5b1 100644
--- a/src/templates/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
diff --git a/src/templates/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp
index 196e77e3..196e77e3 100644
--- a/src/templates/qquickstackview_p.cpp
+++ b/src/quicktemplates2/qquickstackview_p.cpp
diff --git a/src/templates/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h
index 0c76908c..5b303648 100644
--- a/src/templates/qquickstackview_p.h
+++ b/src/quicktemplates2/qquickstackview_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +58,7 @@ class QQuickStackElement;
 class QQuickStackAttached;
 class QQuickStackViewPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickStackView : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickStackView : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool busy READ isBusy NOTIFY busyChanged FINAL)
@@ -156,7 +156,7 @@ private:
 
 class QQuickStackAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickStackAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickStackAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
diff --git a/src/templates/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h
index 1d065a5b..a0a7f77a 100644
--- a/src/templates/qquickstackview_p_p.h
+++ b/src/quicktemplates2/qquickstackview_p_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickstackview_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickstackview_p.h>
+#include <QtQuickTemplates2/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/templates/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index 064aebb7..064aebb7 100644
--- a/src/templates/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
diff --git a/src/templates/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h
index 4e1688ec..1febf17e 100644
--- a/src/templates/qquickswipedelegate_p.h
+++ b/src/quicktemplates2/qquickswipedelegate_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSwipeDelegatePrivate;
 class QQuickSwipeExposure;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSwipeDelegate : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeDelegate : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(QQuickSwipeExposure *exposure READ exposure CONSTANT)
@@ -84,7 +84,7 @@ private:
 
 class QQuickSwipeExposurePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSwipeExposure : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeExposure : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position NOTIFY positionChanged FINAL)
diff --git a/src/templates/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index b378e354..6614ebe2 100644
--- a/src/templates/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -37,7 +37,7 @@
 #include "qquickswipeview_p.h"
 
 #include <QtQml/qqmlinfo.h>
-#include <QtQuickTemplates/private/qquickcontainer_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontainer_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/templates/qquickswipeview_p.h b/src/quicktemplates2/qquickswipeview_p.h
index e6dd69dd..84f009d3 100644
--- a/src/templates/qquickswipeview_p.h
+++ b/src/quicktemplates2/qquickswipeview_p.h
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontainer_p.h>
+#include <QtQuickTemplates2/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSwipeViewAttached;
 class QQuickSwipeViewPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeView : public QQuickContainer
 {
     Q_OBJECT
 
@@ -75,7 +75,7 @@ private:
 
 class QQuickSwipeViewAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSwipeViewAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeViewAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
diff --git a/src/templates/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 04281a9e..04281a9e 100644
--- a/src/templates/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
diff --git a/src/templates/qquickswitch_p.h b/src/quicktemplates2/qquickswitch_p.h
index 923ecc1c..abf2879f 100644
--- a/src/templates/qquickswitch_p.h
+++ b/src/quicktemplates2/qquickswitch_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSwitchPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSwitch : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwitch : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/templates/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 05cee244..05cee244 100644
--- a/src/templates/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
diff --git a/src/templates/qquickswitchdelegate_p.h b/src/quicktemplates2/qquickswitchdelegate_p.h
index 5ea17a1f..1707c55c 100644
--- a/src/templates/qquickswitchdelegate_p.h
+++ b/src/quicktemplates2/qquickswitchdelegate_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickitemdelegate_p.h>
+#include <QtQuickTemplates2/private/qquickitemdelegate_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSwitchDelegatePrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickSwitchDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwitchDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/templates/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 8d6a65f8..8d6a65f8 100644
--- a/src/templates/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
diff --git a/src/templates/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h
index 76c2e59f..bfc7f2c9 100644
--- a/src/templates/qquicktabbar_p.h
+++ b/src/quicktemplates2/qquicktabbar_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickcontainer_p.h>
+#include <QtQuickTemplates2/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickTabBarPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickTabBar : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/templates/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp
index fc7cb634..fc7cb634 100644
--- a/src/templates/qquicktabbutton.cpp
+++ b/src/quicktemplates2/qquicktabbutton.cpp
diff --git a/src/templates/qquicktabbutton_p.h b/src/quicktemplates2/qquicktabbutton_p.h
index 549615ea..c298e308 100644
--- a/src/templates/qquicktabbutton_p.h
+++ b/src/quicktemplates2/qquicktabbutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES_EXPORT QQuickTabButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickTabButton : public QQuickAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/templates/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 0f3860c9..0f3860c9 100644
--- a/src/templates/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
diff --git a/src/templates/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index 2e031c07..d681e8bb 100644
--- a/src/templates/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextedit_p.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ class QQuickText;
 class QQuickTextAreaPrivate;
 class QQuickMouseEvent;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit
+class Q_QUICKTEMPLATES2_EXPORT QQuickTextArea : public QQuickTextEdit
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/templates/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h
index d92f03c8..8274243f 100644
--- a/src/templates/qquicktextarea_p_p.h
+++ b/src/quicktemplates2/qquicktextarea_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextedit_p_p.h>
-#include <QtQuickTemplates/private/qquickpresshandler_p_p.h>
+#include <QtQuickTemplates2/private/qquickpresshandler_p_p.h>
 
 #include "qquicktextarea_p.h"
 
diff --git a/src/templates/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 7a8dae0d..7a8dae0d 100644
--- a/src/templates/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
diff --git a/src/templates/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h
index 00d6d0c7..2e10f17d 100644
--- a/src/templates/qquicktextfield_p.h
+++ b/src/quicktemplates2/qquicktextfield_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextinput_p.h>
-#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ class QQuickText;
 class QQuickTextFieldPrivate;
 class QQuickMouseEvent;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput
+class Q_QUICKTEMPLATES2_EXPORT QQuickTextField : public QQuickTextInput
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/templates/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h
index e8e68cbb..bd85d606 100644
--- a/src/templates/qquicktextfield_p_p.h
+++ b/src/quicktemplates2/qquicktextfield_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextinput_p_p.h>
-#include <QtQuickTemplates/private/qquickpresshandler_p_p.h>
+#include <QtQuickTemplates2/private/qquickpresshandler_p_p.h>
 
 #include "qquicktextfield_p.h"
 
diff --git a/src/templates/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index 541160fd..541160fd 100644
--- a/src/templates/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
diff --git a/src/templates/qquicktoolbar_p.h b/src/quicktemplates2/qquicktoolbar_p.h
index fe62c127..11aee8a0 100644
--- a/src/templates/qquicktoolbar_p.h
+++ b/src/quicktemplates2/qquicktoolbar_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickframe_p.h>
+#include <QtQuickTemplates2/private/qquickframe_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickToolBarPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolBar : public QQuickFrame
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/templates/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp
index 410bb556..410bb556 100644
--- a/src/templates/qquicktoolbutton.cpp
+++ b/src/quicktemplates2/qquicktoolbutton.cpp
diff --git a/src/templates/qquicktoolbutton_p.h b/src/quicktemplates2/qquicktoolbutton_p.h
index dda0668e..e35e3525 100644
--- a/src/templates/qquicktoolbutton_p.h
+++ b/src/quicktemplates2/qquicktoolbutton_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickbutton_p.h>
+#include <QtQuickTemplates2/private/qquickbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES_EXPORT QQuickToolButton : public QQuickButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolButton : public QQuickButton
 {
     Q_OBJECT
 
diff --git a/src/templates/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 010a07c5..010a07c5 100644
--- a/src/templates/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
diff --git a/src/templates/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h
index 07e6815d..a4e00eb2 100644
--- a/src/templates/qquicktooltip_p.h
+++ b/src/quicktemplates2/qquicktooltip_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ class QQuickToolTipPrivate;
 class QQuickToolTipAttached;
 class QQuickToolTipAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickToolTip : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolTip : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(int delay READ delay WRITE setDelay NOTIFY delayChanged FINAL)
@@ -99,7 +99,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickToolTip)
 };
 
-class Q_QUICKTEMPLATES_EXPORT QQuickToolTipAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolTipAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
diff --git a/src/templates/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index 42f67d70..ee82128f 100644
--- a/src/templates/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -37,7 +37,7 @@
 #include "qquicktumbler_p.h"
 
 #include <QtQuick/private/qquickflickable_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/templates/qquicktumbler_p.h b/src/quicktemplates2/qquicktumbler_p.h
index 7b0126ce..0fdccca8 100644
--- a/src/templates/qquicktumbler_p.h
+++ b/src/quicktemplates2/qquicktumbler_p.h
@@ -50,14 +50,14 @@
 
 #include <QtCore/qvariant.h>
 #include <QtQml/qqmlcomponent.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickTumblerAttached;
 class QQuickTumblerPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickTumbler : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickTumbler : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL)
@@ -112,7 +112,7 @@ private:
 
 class QQuickTumblerAttachedPrivate;
 
-class Q_QUICKTEMPLATES_EXPORT QQuickTumblerAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickTumblerAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT)
diff --git a/src/templates/qquickvelocitycalculator.cpp b/src/quicktemplates2/qquickvelocitycalculator.cpp
index 3d5fa4a4..3d5fa4a4 100644
--- a/src/templates/qquickvelocitycalculator.cpp
+++ b/src/quicktemplates2/qquickvelocitycalculator.cpp
diff --git a/src/templates/qquickvelocitycalculator_p_p.h b/src/quicktemplates2/qquickvelocitycalculator_p_p.h
index bb4733ac..bb4733ac 100644
--- a/src/templates/qquickvelocitycalculator_p_p.h
+++ b/src/quicktemplates2/qquickvelocitycalculator_p_p.h
diff --git a/src/templates/qtquicktemplatesglobal_p.h b/src/quicktemplates2/qtquicktemplates2global_p.h
index 671a1ed0..f962dc04 100644
--- a/src/templates/qtquicktemplatesglobal_p.h
+++ b/src/quicktemplates2/qtquicktemplates2global_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTQUICKTEMPLATESGLOBAL_H
-#define QTQUICKTEMPLATESGLOBAL_H
+#ifndef QTQUICKTEMPLATES2GLOBAL_H
+#define QTQUICKTEMPLATES2GLOBAL_H
 
 //
 //  W A R N I N G
@@ -53,15 +53,15 @@
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
-#  if defined(QT_BUILD_QUICKTEMPLATES_LIB)
-#    define Q_QUICKTEMPLATES_EXPORT Q_DECL_EXPORT
+#  if defined(QT_BUILD_QUICKTEMPLATES2_LIB)
+#    define Q_QUICKTEMPLATES2_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_QUICKTEMPLATES_EXPORT Q_DECL_IMPORT
+#    define Q_QUICKTEMPLATES2_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define Q_QUICKTEMPLATES_EXPORT
+#  define Q_QUICKTEMPLATES2_EXPORT
 #endif
 
 QT_END_NAMESPACE
 
-#endif // QTQUICKTEMPLATESGLOBAL_H
+#endif // QTQUICKTEMPLATES2GLOBAL_H
diff --git a/src/templates/templates.pri b/src/quicktemplates2/quicktemplates2.pri
index e16d8b69..e16d8b69 100644
--- a/src/templates/templates.pri
+++ b/src/quicktemplates2/quicktemplates2.pri
diff --git a/src/templates/templates.pro b/src/quicktemplates2/quicktemplates2.pro
index f28a82ab..59871a54 100644
--- a/src/templates/templates.pro
+++ b/src/quicktemplates2/quicktemplates2.pro
@@ -1,5 +1,5 @@
-TARGET = QtQuickTemplates
-MODULE = quicktemplates
+TARGET = QtQuickTemplates2
+MODULE = quicktemplates2
 CONFIG += internal_module
 
 QT += quick
@@ -8,7 +8,7 @@ QT_PRIVATE += core-private gui-private qml-private quick-private
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
-    $$PWD/qtquicktemplatesglobal_p.h
+    $$PWD/qtquicktemplates2global_p.h
 
-include(templates.pri)
+include(quicktemplates2.pri)
 load(qt_module)
diff --git a/src/src.pro b/src/src.pro
index 38778fe1..428dc642 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    templates \
+    quicktemplates2 \
     controls \
     imports
 
-controls.depends = templates
-imports.depends = controls templates
+controls.depends = quicktemplates2
+imports.depends = controls quicktemplates2
diff --git a/sync.profile b/sync.profile
index dc1bc02c..f0196430 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
     "QtQuickControls" => "$basedir/src/controls",
-    "QtQuickTemplates" => "$basedir/src/templates",
+    "QtQuickTemplates2" => "$basedir/src/quicktemplates2",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/accessibility/accessibility.pro b/tests/auto/accessibility/accessibility.pro
index ead68318..bef6eae4 100644
--- a/tests/auto/accessibility/accessibility.pro
+++ b/tests/auto/accessibility/accessibility.pro
@@ -4,7 +4,7 @@ SOURCES += tst_accessibility.cpp
 
 osx:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private quicktemplates-private testlib
+QT += core-private gui-private qml-private quick-private quicktemplates2-private testlib
 
 include (../shared/util.pri)
 
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp
index 8bd4d09a..e97e4702 100644
--- a/tests/auto/accessibility/tst_accessibility.cpp
+++ b/tests/auto/accessibility/tst_accessibility.cpp
@@ -41,7 +41,7 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQuick/qquickview.h>
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickTemplates/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"
 
diff --git a/tests/auto/applicationwindow/applicationwindow.pro b/tests/auto/applicationwindow/applicationwindow.pro
index 4d1b44bd..f6861ee4 100644
--- a/tests/auto/applicationwindow/applicationwindow.pro
+++ b/tests/auto/applicationwindow/applicationwindow.pro
@@ -4,7 +4,7 @@ SOURCES += tst_applicationwindow.cpp
 
 osx:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private testlib
+QT += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private testlib
 
 include (../shared/util.pri)
 
diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp
index 67525ef7..c3488148 100644
--- a/tests/auto/applicationwindow/tst_applicationwindow.cpp
+++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp
@@ -42,12 +42,12 @@
 #include <QtQuick/qquickview.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
-#include <QtQuickTemplates/private/qquickoverlay_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
-#include <QtQuickTemplates/private/qquicklabel_p.h>
-#include <QtQuickTemplates/private/qquicktextarea_p.h>
-#include <QtQuickTemplates/private/qquicktextfield_p.h>
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickoverlay_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquicklabel_p.h>
+#include <QtQuickTemplates2/private/qquicktextarea_p.h>
+#include <QtQuickTemplates2/private/qquicktextfield_p.h>
 #include <QtQuickControls/private/qquickproxytheme_p.h>
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"
diff --git a/tests/auto/focus/focus.pro b/tests/auto/focus/focus.pro
index cfd155b8..790445e3 100644
--- a/tests/auto/focus/focus.pro
+++ b/tests/auto/focus/focus.pro
@@ -8,4 +8,4 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private quick-private quicktemplates-private testlib
+QT += core-private gui-private qml-private quick-private quicktemplates2-private testlib
diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp
index f058f137..2350290d 100644
--- a/tests/auto/focus/tst_focus.cpp
+++ b/tests/auto/focus/tst_focus.cpp
@@ -41,7 +41,7 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQuick/qquickview.h>
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qstylehints.h>
 #include "../shared/util.h"
diff --git a/tests/auto/menu/menu.pro b/tests/auto/menu/menu.pro
index 71bb0fb0..649f3fd4 100644
--- a/tests/auto/menu/menu.pro
+++ b/tests/auto/menu/menu.pro
@@ -4,7 +4,7 @@ SOURCES += tst_menu.cpp
 
 osx:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private testlib quicktemplates-private
+QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private
 
 include (../shared/util.pri)
 
diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp
index 20b56143..98d431f7 100644
--- a/tests/auto/menu/tst_menu.cpp
+++ b/tests/auto/menu/tst_menu.cpp
@@ -45,11 +45,11 @@
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"
 
-#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
-#include <QtQuickTemplates/private/qquickoverlay_p.h>
-#include <QtQuickTemplates/private/qquickbutton_p.h>
-#include <QtQuickTemplates/private/qquickmenu_p.h>
-#include <QtQuickTemplates/private/qquickmenuitem_p.h>
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickoverlay_p.h>
+#include <QtQuickTemplates2/private/qquickbutton_p.h>
+#include <QtQuickTemplates2/private/qquickmenu_p.h>
+#include <QtQuickTemplates2/private/qquickmenuitem_p.h>
 
 using namespace QQuickVisualTestUtil;
 
diff --git a/tests/auto/popup/popup.pro b/tests/auto/popup/popup.pro
index 45f55cab..af4db794 100644
--- a/tests/auto/popup/popup.pro
+++ b/tests/auto/popup/popup.pro
@@ -4,7 +4,7 @@ SOURCES += tst_popup.cpp
 
 osx:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private testlib quicktemplates-private
+QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private
 
 include (../shared/util.pri)
 
diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp
index ae886623..ef29ac1b 100644
--- a/tests/auto/popup/tst_popup.cpp
+++ b/tests/auto/popup/tst_popup.cpp
@@ -39,10 +39,10 @@
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"
 
-#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
-#include <QtQuickTemplates/private/qquickoverlay_p.h>
-#include <QtQuickTemplates/private/qquickpopup_p.h>
-#include <QtQuickTemplates/private/qquickbutton_p.h>
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickoverlay_p.h>
+#include <QtQuickTemplates2/private/qquickpopup_p.h>
+#include <QtQuickTemplates2/private/qquickbutton_p.h>
 
 using namespace QQuickVisualTestUtil;
 
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri
index 61d4d509..03191511 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/shared/util.pri
@@ -1,4 +1,4 @@
-QT += core-private gui-private qml-private quick-private quicktemplates-private
+QT += core-private gui-private qml-private quick-private quicktemplates2-private
 
 HEADERS += $$PWD/visualtestutil.h \
            $$PWD/util.h
diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h
index 94c45778..c1cc9c7d 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/shared/visualtestutil.h
@@ -42,7 +42,7 @@
 
 #include <QtQuick/private/qquickitem_p.h>
 
-#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
 
 #include "util.h"