import Qt.labs.templates 1.0 => QtQuick.Templates 2.0

Even though there never was such thing is QtQuick.Templates 1.0,
we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0
(next step). The templates define (and in the future, revision) the
API of the controls, so the two must have the same version or it
will get messy.

Docs and plugins.qmltypes will be updated in follow up commits.

Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910
Task-number: QTBUG-52549
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

122 files changed, 170 insertions, 170 deletions

diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index 7eaf4d17..cc30c601 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.2
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ApplicationWindow {
     id: window
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index 9432b8a3..00a329d6 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -37,7 +37,7 @@
 import QtQuick 2.6
 import Qt.labs.controls 1.0
 import Qt.labs.controls.impl 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.BusyIndicator {
     id: control
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 406ae931..c68fc1e8 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Button {
     id: control
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index f46b46f2..1ac97160 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.impl 1.0
 
 T.CheckBox {
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index c56ef221..d1f43816 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.impl 1.0
 
 T.CheckDelegate {
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 10e8c0c9..ef0b504e 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -37,7 +37,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.2
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ComboBox {
     id: control
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index 44862c69..b02aae17 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls.impl 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Dial {
     id: control
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml
index d669ba52..8cf4e5e5 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/Drawer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Drawer {
     id: control
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index 4b23a697..cb2ffd35 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Frame {
     id: control
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index d6eb84e1..0e9d79fc 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.GroupBox {
     id: control
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index b8a4f590..42d207de 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ItemDelegate {
     id: control
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index 7412d402..d0f01613 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Label {
     id: control
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index 2d12fd70..c902c66b 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Menu {
     id: control
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index 1ad513e5..c0feff4c 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.MenuItem {
     id: control
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml
index a2f503e0..3cbb1569 100644
--- a/src/imports/controls/Page.qml
+++ b/src/imports/controls/Page.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Page {
     id: control
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 80c1bcf5..5b61acd5 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.PageIndicator {
     id: control
diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml
index d9bebf38..eb79129c 100644
--- a/src/imports/controls/Pane.qml
+++ b/src/imports/controls/Pane.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Pane {
     id: control
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml
index d1222ffd..6d40f2f9 100644
--- a/src/imports/controls/Popup.qml
+++ b/src/imports/controls/Popup.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Popup {
     id: control
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index 85acf11b..81468385 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.impl 1.0
 
 T.ProgressBar {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index b9ac74f3..6a3cc62d 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.RadioButton {
     id: control
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml
index 2dce11fd..6fb7c4f6 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/RadioDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.RadioDelegate {
     id: control
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index d2573b2f..22656425 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.RangeSlider {
     id: control
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index 891ab2fb..8ccbc328 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ScrollBar {
     id: control
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 69152ab4..cd7b53fd 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ScrollIndicator {
     id: control
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 8a4a9190..a53c99aa 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Slider {
     id: control
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index b4cd3c08..9ea9d5ef 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.SpinBox {
     id: control
diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml
index 4c7ac48f..52ba9fe0 100644
--- a/src/imports/controls/StackView.qml
+++ b/src/imports/controls/StackView.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.4
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.StackView {
     id: control
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml
index 12673f33..6060fcb2 100644
--- a/src/imports/controls/SwipeDelegate.qml
+++ b/src/imports/controls/SwipeDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.SwipeDelegate {
     id: control
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml
index 0789c097..3aafbb39 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/SwipeView.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.SwipeView {
     id: control
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 0913af05..d01d36fe 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.impl 1.0
 
 T.Switch {
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index b6856a90..725a4c2d 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.impl 1.0
 
 T.SwitchDelegate {
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index d7f32558..6f3e040b 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.TabBar {
     id: control
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index 352bef1a..870edb6d 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.TabButton {
     id: control
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index 42aa0cd2..a109cb8d 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.TextArea {
     id: control
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 057e4ff8..742c3a28 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.TextField {
     id: control
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index fe6aeeb8..a787df61 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ToolBar {
     id: control
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 8c903bb4..98eb262b 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ToolButton {
     id: control
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml
index 6a16e068..b317d57c 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/ToolTip.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.ToolTip {
     id: control
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml
index 905b3c9c..54e4301a 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/Tumbler.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Tumbler {
     id: control
diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml
index 6bfa36f8..26604fdb 100644
--- a/src/imports/controls/material/ApplicationWindow.qml
+++ b/src/imports/controls/material/ApplicationWindow.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.2
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ApplicationWindow {
diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml
index a3b055df..f631dfb1 100644
--- a/src/imports/controls/material/BusyIndicator.qml
+++ b/src/imports/controls/material/BusyIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 1e12cb6e..330d2eb8 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import QtGraphicalEffects 1.0
 
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index 94758b62..e9331f60 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml
index 70104962..8381aeed 100644
--- a/src/imports/controls/material/CheckDelegate.qml
+++ b/src/imports/controls/material/CheckDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index b1e35e80..cc5268d1 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -37,7 +37,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.2
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import QtGraphicalEffects 1.0
 
diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml
index 7f1c565e..1f1c986c 100644
--- a/src/imports/controls/material/Dial.qml
+++ b/src/imports/controls/material/Dial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Dial {
diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml
index 03744cdd..35a362de 100644
--- a/src/imports/controls/material/Drawer.qml
+++ b/src/imports/controls/material/Drawer.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import QtGraphicalEffects 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Drawer {
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index cf50e02a..7a7dacf8 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Frame {
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml
index a1b6c980..2d1f80c2 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/imports/controls/material/GroupBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.GroupBox {
diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml
index efba10b0..89a870ac 100644
--- a/src/imports/controls/material/ItemDelegate.qml
+++ b/src/imports/controls/material/ItemDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ItemDelegate {
diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml
index 03eeb898..c179bdf4 100644
--- a/src/imports/controls/material/Label.qml
+++ b/src/imports/controls/material/Label.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Label {
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml
index 9e4076f1..c53b031c 100644
--- a/src/imports/controls/material/Menu.qml
+++ b/src/imports/controls/material/Menu.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import QtGraphicalEffects 1.0
 
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml
index 48eb390b..e687a78f 100644
--- a/src/imports/controls/material/MenuItem.qml
+++ b/src/imports/controls/material/MenuItem.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml
index 451d66f2..adeb8b64 100644
--- a/src/imports/controls/material/Page.qml
+++ b/src/imports/controls/material/Page.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Page {
diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml
index 6e5044e4..6bde1473 100644
--- a/src/imports/controls/material/PageIndicator.qml
+++ b/src/imports/controls/material/PageIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.PageIndicator {
diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml
index e862e856..642dc1f1 100644
--- a/src/imports/controls/material/Pane.qml
+++ b/src/imports/controls/material/Pane.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Pane {
diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml
index 4b9a9221..bfee632a 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/imports/controls/material/Popup.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import QtGraphicalEffects 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Popup {
diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml
index acefaf7c..a475c648 100644
--- a/src/imports/controls/material/ProgressBar.qml
+++ b/src/imports/controls/material/ProgressBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index bb71f96e..bcfd071f 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml
index 5f5f58cf..88c1aa5c 100644
--- a/src/imports/controls/material/RadioDelegate.qml
+++ b/src/imports/controls/material/RadioDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.RadioDelegate {
diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml
index d57624ed..fdca41fb 100644
--- a/src/imports/controls/material/RangeSlider.qml
+++ b/src/imports/controls/material/RangeSlider.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml
index 554cc21d..a930e167 100644
--- a/src/imports/controls/material/ScrollBar.qml
+++ b/src/imports/controls/material/ScrollBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ScrollBar {
diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml
index fc89d0f8..9a7b1b5d 100644
--- a/src/imports/controls/material/ScrollIndicator.qml
+++ b/src/imports/controls/material/ScrollIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ScrollIndicator {
diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml
index 8a80c0aa..3a892fff 100644
--- a/src/imports/controls/material/Slider.qml
+++ b/src/imports/controls/material/Slider.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index e34d7943..447ac411 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import QtGraphicalEffects 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml
index 66675e85..f3756307 100644
--- a/src/imports/controls/material/StackView.qml
+++ b/src/imports/controls/material/StackView.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.StackView {
     id: control
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index c4bacc10..da6d7d72 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml
index c7b1e54d..ab53203d 100644
--- a/src/imports/controls/material/SwipeView.qml
+++ b/src/imports/controls/material/SwipeView.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.SwipeView {
     id: control
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml
index 6bc3041a..f256781a 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/imports/controls/material/Switch.qml
@@ -37,7 +37,7 @@
 import QtQuick 2.6
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 
 T.Switch {
     id: control
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml
index bb3ef6de..adfd508d 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/imports/controls/material/SwitchDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 import Qt.labs.controls.material.impl 1.0
 
diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml
index 0e1d0ada..4d0ed57c 100644
--- a/src/imports/controls/material/TabBar.qml
+++ b/src/imports/controls/material/TabBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.TabBar {
diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml
index 70efc0ff..61542fa1 100644
--- a/src/imports/controls/material/TabButton.qml
+++ b/src/imports/controls/material/TabButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.TabButton {
diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml
index b952d319..c087911d 100644
--- a/src/imports/controls/material/TextArea.qml
+++ b/src/imports/controls/material/TextArea.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.TextArea {
diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml
index 25cd6fe8..d037d491 100644
--- a/src/imports/controls/material/TextField.qml
+++ b/src/imports/controls/material/TextField.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.TextField {
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml
index df606709..432f77fb 100644
--- a/src/imports/controls/material/ToolBar.qml
+++ b/src/imports/controls/material/ToolBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ToolBar {
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index e3a1d740..bdb341f6 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ToolButton {
diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml
index 263f1766..1ca0c127 100644
--- a/src/imports/controls/material/ToolTip.qml
+++ b/src/imports/controls/material/ToolTip.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.ToolTip {
diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml
index fe7954a9..959415f2 100644
--- a/src/imports/controls/material/Tumbler.qml
+++ b/src/imports/controls/material/Tumbler.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.material 1.0
 
 T.Tumbler {
diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir
index 23cb0475..ef74280e 100644
--- a/src/imports/controls/qmldir
+++ b/src/imports/controls/qmldir
@@ -1,5 +1,5 @@
 module Qt.labs.controls
 plugin qtquickcontrols2plugin
 classname QtQuickControls2Plugin
-depends Qt.labs.templates 1.0
+depends QtQuick.Templates 1.0
 designersupported
diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml
index 1f56bd8a..2211bcc5 100644
--- a/src/imports/controls/universal/ApplicationWindow.qml
+++ b/src/imports/controls/universal/ApplicationWindow.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 import Qt.labs.controls.universal.impl 1.0
 
diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml
index d3d4da34..b5d11fa8 100644
--- a/src/imports/controls/universal/BusyIndicator.qml
+++ b/src/imports/controls/universal/BusyIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 import Qt.labs.controls.universal.impl 1.0
 
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index 0741812d..9e4ac774 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Button {
diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml
index fbfb40b7..a8365b9a 100644
--- a/src/imports/controls/universal/CheckBox.qml
+++ b/src/imports/controls/universal/CheckBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 import Qt.labs.controls.universal.impl 1.0
 
diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml
index 13cc0d90..b6c8564b 100644
--- a/src/imports/controls/universal/CheckDelegate.qml
+++ b/src/imports/controls/universal/CheckDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.CheckDelegate {
diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml
index 4795ccce..e9638e1b 100644
--- a/src/imports/controls/universal/CheckIndicator.qml
+++ b/src/imports/controls/universal/CheckIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 Rectangle {
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 9a859b1c..f0da15ed 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -37,7 +37,7 @@
 import QtQuick 2.6
 import QtQuick.Window 2.2
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ComboBox {
diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index a55bc19f..9595857f 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Dial {
diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml
index 2d87bf39..1318c0fa 100644
--- a/src/imports/controls/universal/Drawer.qml
+++ b/src/imports/controls/universal/Drawer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Drawer {
diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml
index 3d88b5e0..1d18c51b 100644
--- a/src/imports/controls/universal/Frame.qml
+++ b/src/imports/controls/universal/Frame.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Frame {
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index 3888f482..09c9c0ec 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.GroupBox {
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml
index d32612f4..b05382be 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/imports/controls/universal/ItemDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ItemDelegate {
diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml
index db0fdea0..d4c693f5 100644
--- a/src/imports/controls/universal/Label.qml
+++ b/src/imports/controls/universal/Label.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Label {
diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml
index cdb904f8..1819bb4e 100644
--- a/src/imports/controls/universal/Menu.qml
+++ b/src/imports/controls/universal/Menu.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Menu {
diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml
index aef20ff9..5941a826 100644
--- a/src/imports/controls/universal/MenuItem.qml
+++ b/src/imports/controls/universal/MenuItem.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.MenuItem {
diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml
index 85b1ef8c..b1a0c64b 100644
--- a/src/imports/controls/universal/Page.qml
+++ b/src/imports/controls/universal/Page.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Page {
diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml
index a6de64a3..6949b34e 100644
--- a/src/imports/controls/universal/PageIndicator.qml
+++ b/src/imports/controls/universal/PageIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.PageIndicator {
diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml
index 97d1d140..cd7aef6d 100644
--- a/src/imports/controls/universal/Pane.qml
+++ b/src/imports/controls/universal/Pane.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Pane {
diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml
index e4cb9635..633cc370 100644
--- a/src/imports/controls/universal/Popup.qml
+++ b/src/imports/controls/universal/Popup.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Popup {
diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml
index 9529cea6..65ba192d 100644
--- a/src/imports/controls/universal/ProgressBar.qml
+++ b/src/imports/controls/universal/ProgressBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 import Qt.labs.controls.universal.impl 1.0
 
diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml
index 2091e082..fe26df16 100644
--- a/src/imports/controls/universal/RadioButton.qml
+++ b/src/imports/controls/universal/RadioButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 import Qt.labs.controls.universal.impl 1.0
 
diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml
index 4aeeb7ce..a138863b 100644
--- a/src/imports/controls/universal/RadioDelegate.qml
+++ b/src/imports/controls/universal/RadioDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.RadioDelegate {
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml
index 00b2f6ac..7c01fc96 100644
--- a/src/imports/controls/universal/RangeSlider.qml
+++ b/src/imports/controls/universal/RangeSlider.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.RangeSlider {
diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml
index 9316eda2..b8b86183 100644
--- a/src/imports/controls/universal/ScrollBar.qml
+++ b/src/imports/controls/universal/ScrollBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ScrollBar {
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml
index 080720f1..6d8224c1 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/imports/controls/universal/ScrollIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ScrollIndicator {
diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml
index 09b758d4..de02440a 100644
--- a/src/imports/controls/universal/Slider.qml
+++ b/src/imports/controls/universal/Slider.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Slider {
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 4751b83c..f3a6376a 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.SpinBox {
diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml
index 210ce2e3..a05bcc50 100644
--- a/src/imports/controls/universal/StackView.qml
+++ b/src/imports/controls/universal/StackView.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.StackView {
diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml
index 6fe7dca0..d73561ab 100644
--- a/src/imports/controls/universal/SwipeDelegate.qml
+++ b/src/imports/controls/universal/SwipeDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.SwipeDelegate {
diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml
index 929993a5..918fe64f 100644
--- a/src/imports/controls/universal/Switch.qml
+++ b/src/imports/controls/universal/Switch.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.Switch {
diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml
index d53f93d3..96dc5d69 100644
--- a/src/imports/controls/universal/SwitchDelegate.qml
+++ b/src/imports/controls/universal/SwitchDelegate.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.SwitchDelegate {
diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml
index be99273c..31d89779 100644
--- a/src/imports/controls/universal/SwitchIndicator.qml
+++ b/src/imports/controls/universal/SwitchIndicator.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 Rectangle {
diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml
index 185a1beb..8c3552b0 100644
--- a/src/imports/controls/universal/TabBar.qml
+++ b/src/imports/controls/universal/TabBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.TabBar {
diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml
index 9192d64d..91803818 100644
--- a/src/imports/controls/universal/TabButton.qml
+++ b/src/imports/controls/universal/TabButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.TabButton {
diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml
index 810fce82..0e682217 100644
--- a/src/imports/controls/universal/TextArea.qml
+++ b/src/imports/controls/universal/TextArea.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.TextArea {
diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml
index bc891164..4ada061a 100644
--- a/src/imports/controls/universal/TextField.qml
+++ b/src/imports/controls/universal/TextField.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.TextField {
diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml
index 7cc9293b..f096d126 100644
--- a/src/imports/controls/universal/ToolBar.qml
+++ b/src/imports/controls/universal/ToolBar.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ToolBar {
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index 90bbd46e..084c0282 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ToolButton {
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml
index 4703e6b7..7988f5ad 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/imports/controls/universal/ToolTip.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 
 T.ToolTip {
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml
index 7e05c6df..ee80196f 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/imports/controls/universal/Tumbler.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
+import QtQuick.Templates 2.0 as T
 import Qt.labs.controls.universal 1.0
 import Qt.labs.controls 1.0
 
diff --git a/src/imports/templates/qmldir b/src/imports/templates/qmldir
index f0f834c3..afb94818 100644
--- a/src/imports/templates/qmldir
+++ b/src/imports/templates/qmldir
@@ -1,4 +1,4 @@
-module Qt.labs.templates
+module QtQuick.Templates
 plugin qtquicktemplates2plugin
 classname QtQuickTemplates2Plugin
 depends QtQuick.Window 2.2
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 7ce42ac2..db3eadab 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -83,7 +83,7 @@
 static inline void initResources()
 {
 #ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_Qt_labs_templates);
+    Q_INIT_RESOURCE(qmake_QtQuick_Templates_2);
 #endif
 }
 
@@ -106,62 +106,62 @@ QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensio
 
 void QtQuickTemplates2Plugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton");
-    qmlRegisterType<QQuickApplicationWindow>(uri, 1, 0, "ApplicationWindow");
+    qmlRegisterType<QQuickAbstractButton>(uri, 2, 0, "AbstractButton");
+    qmlRegisterType<QQuickApplicationWindow>(uri, 2, 0, "ApplicationWindow");
     qmlRegisterType<QQuickApplicationWindowAttached>();
-    qmlRegisterType<QQuickBusyIndicator>(uri, 1, 0, "BusyIndicator");
-    qmlRegisterType<QQuickButton>(uri, 1, 0, "Button");
-    qmlRegisterType<QQuickCheckBox>(uri, 1, 0, "CheckBox");
-    qmlRegisterType<QQuickCheckDelegate>(uri, 1, 0, "CheckDelegate");
-    qmlRegisterType<QQuickComboBox>(uri, 1, 0, "ComboBox");
-    qmlRegisterType<QQuickContainer>(uri, 1, 0, "Container");
-    qmlRegisterType<QQuickControl>(uri, 1, 0, "Control");
-    qmlRegisterType<QQuickDial>(uri, 1, 0, "Dial");
-    qmlRegisterType<QQuickDrawer>(uri, 1, 0, "Drawer");
-    qmlRegisterType<QQuickFrame>(uri, 1, 0, "Frame");
-    qmlRegisterType<QQuickGroupBox>(uri, 1, 0, "GroupBox");
-    qmlRegisterType<QQuickItemDelegate>(uri, 1, 0, "ItemDelegate");
-    qmlRegisterType<QQuickLabel>(uri, 1, 0, "Label");
-    qmlRegisterType<QQuickMenu>(uri, 1, 0, "Menu");
-    qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem");
+    qmlRegisterType<QQuickBusyIndicator>(uri, 2, 0, "BusyIndicator");
+    qmlRegisterType<QQuickButton>(uri, 2, 0, "Button");
+    qmlRegisterType<QQuickCheckBox>(uri, 2, 0, "CheckBox");
+    qmlRegisterType<QQuickCheckDelegate>(uri, 2, 0, "CheckDelegate");
+    qmlRegisterType<QQuickComboBox>(uri, 2, 0, "ComboBox");
+    qmlRegisterType<QQuickContainer>(uri, 2, 0, "Container");
+    qmlRegisterType<QQuickControl>(uri, 2, 0, "Control");
+    qmlRegisterType<QQuickDial>(uri, 2, 0, "Dial");
+    qmlRegisterType<QQuickDrawer>(uri, 2, 0, "Drawer");
+    qmlRegisterType<QQuickFrame>(uri, 2, 0, "Frame");
+    qmlRegisterType<QQuickGroupBox>(uri, 2, 0, "GroupBox");
+    qmlRegisterType<QQuickItemDelegate>(uri, 2, 0, "ItemDelegate");
+    qmlRegisterType<QQuickLabel>(uri, 2, 0, "Label");
+    qmlRegisterType<QQuickMenu>(uri, 2, 0, "Menu");
+    qmlRegisterType<QQuickMenuItem>(uri, 2, 0, "MenuItem");
     qmlRegisterType<QQuickOverlay>();
-    qmlRegisterType<QQuickPage>(uri, 1, 0, "Page");
-    qmlRegisterType<QQuickPageIndicator>(uri, 1, 0, "PageIndicator");
-    qmlRegisterType<QQuickPane>(uri, 1, 0, "Pane");
-    qmlRegisterType<QQuickPopup>(uri, 1, 0, "Popup");
-    qmlRegisterType<QQuickProgressBar>(uri, 1, 0, "ProgressBar");
-    qmlRegisterType<QQuickRadioButton>(uri, 1, 0, "RadioButton");
-    qmlRegisterType<QQuickRadioDelegate>(uri, 1, 0, "RadioDelegate");
-    qmlRegisterType<QQuickRangeSlider>(uri, 1, 0, "RangeSlider");
+    qmlRegisterType<QQuickPage>(uri, 2, 0, "Page");
+    qmlRegisterType<QQuickPageIndicator>(uri, 2, 0, "PageIndicator");
+    qmlRegisterType<QQuickPane>(uri, 2, 0, "Pane");
+    qmlRegisterType<QQuickPopup>(uri, 2, 0, "Popup");
+    qmlRegisterType<QQuickProgressBar>(uri, 2, 0, "ProgressBar");
+    qmlRegisterType<QQuickRadioButton>(uri, 2, 0, "RadioButton");
+    qmlRegisterType<QQuickRadioDelegate>(uri, 2, 0, "RadioDelegate");
+    qmlRegisterType<QQuickRangeSlider>(uri, 2, 0, "RangeSlider");
     qmlRegisterType<QQuickRangeSliderNode>();
-    qmlRegisterType<QQuickScrollBar>(uri, 1, 0, "ScrollBar");
-    qmlRegisterType<QQuickScrollIndicator>(uri, 1, 0, "ScrollIndicator");
-    qmlRegisterType<QQuickSlider>(uri, 1, 0, "Slider");
-    qmlRegisterType<QQuickSpinBox>(uri, 1, 0, "SpinBox");
+    qmlRegisterType<QQuickScrollBar>(uri, 2, 0, "ScrollBar");
+    qmlRegisterType<QQuickScrollIndicator>(uri, 2, 0, "ScrollIndicator");
+    qmlRegisterType<QQuickSlider>(uri, 2, 0, "Slider");
+    qmlRegisterType<QQuickSpinBox>(uri, 2, 0, "SpinBox");
     qmlRegisterType<QQuickSpinButton>();
-    qmlRegisterType<QQuickStackView>(uri, 1, 0, "StackView");
-    qmlRegisterType<QQuickSwipeDelegate>(uri, 1, 0, "SwipeDelegate");
+    qmlRegisterType<QQuickStackView>(uri, 2, 0, "StackView");
+    qmlRegisterType<QQuickSwipeDelegate>(uri, 2, 0, "SwipeDelegate");
     qmlRegisterType<QQuickSwipeExposure>();
     qmlRegisterType<QQuickSwipeViewAttached>();
-    qmlRegisterType<QQuickSwipeView>(uri, 1, 0, "SwipeView");
-    qmlRegisterType<QQuickSwitch>(uri, 1, 0, "Switch");
-    qmlRegisterType<QQuickSwitchDelegate>(uri, 1, 0, "SwitchDelegate");
-    qmlRegisterType<QQuickTabBar>(uri, 1, 0, "TabBar");
-    qmlRegisterType<QQuickTabButton>(uri, 1, 0, "TabButton");
-    qmlRegisterType<QQuickTextArea>(uri, 1, 0, "TextArea");
-    qmlRegisterType<QQuickTextField>(uri, 1, 0, "TextField");
-    qmlRegisterType<QQuickToolBar>(uri, 1, 0, "ToolBar");
-    qmlRegisterType<QQuickToolButton>(uri, 1, 0, "ToolButton");
+    qmlRegisterType<QQuickSwipeView>(uri, 2, 0, "SwipeView");
+    qmlRegisterType<QQuickSwitch>(uri, 2, 0, "Switch");
+    qmlRegisterType<QQuickSwitchDelegate>(uri, 2, 0, "SwitchDelegate");
+    qmlRegisterType<QQuickTabBar>(uri, 2, 0, "TabBar");
+    qmlRegisterType<QQuickTabButton>(uri, 2, 0, "TabButton");
+    qmlRegisterType<QQuickTextArea>(uri, 2, 0, "TextArea");
+    qmlRegisterType<QQuickTextField>(uri, 2, 0, "TextField");
+    qmlRegisterType<QQuickToolBar>(uri, 2, 0, "ToolBar");
+    qmlRegisterType<QQuickToolButton>(uri, 2, 0, "ToolButton");
     qmlRegisterType<QQuickToolTipAttached>();
-    qmlRegisterType<QQuickToolTip>(uri, 1, 0, "ToolTip");
+    qmlRegisterType<QQuickToolTip>(uri, 2, 0, "ToolTip");
     qmlRegisterType<QQuickTumblerAttached>();
-    qmlRegisterType<QQuickTumbler>(uri, 1, 0, "Tumbler");
+    qmlRegisterType<QQuickTumbler>(uri, 2, 0, "Tumbler");
 
-    qmlRegisterRevision<QQuickItem, 2>(uri, 1, 0);
-    qmlRegisterRevision<QQuickWindow, 2>(uri, 1, 0);
-    qmlRegisterRevision<QQuickText, 6>(uri, 1, 0);
-    qmlRegisterRevision<QQuickTextInput, 6>(uri, 1, 0);
-    qmlRegisterRevision<QQuickTextEdit, 6>(uri, 1, 0);
+    qmlRegisterRevision<QQuickItem, 2>(uri, 2, 0);
+    qmlRegisterRevision<QQuickWindow, 2>(uri, 2, 0);
+    qmlRegisterRevision<QQuickText, 6>(uri, 2, 0);
+    qmlRegisterRevision<QQuickTextInput, 6>(uri, 2, 0);
+    qmlRegisterRevision<QQuickTextEdit, 6>(uri, 2, 0);
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro
index 1edac4c3..8785734a 100644
--- a/src/imports/templates/templates.pro
+++ b/src/imports/templates/templates.pro
@@ -1,6 +1,6 @@
 TARGET = qtquicktemplates2plugin
-TARGETPATH = Qt/labs/templates
-IMPORT_VERSION = 1.0
+TARGETPATH = QtQuick/Templates.2
+IMPORT_VERSION = 2.0
 
 QT += qml quick
 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private