9 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml
index 0a57847b..8a9caa4d 100644
--- a/tests/auto/controls/data/tst_control.qml
+++ b/tests/auto/controls/data/tst_control.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 TestCase {
     id: testCase
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index 54e21690..50a203c3 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 TestCase {
     id: testCase
diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml
index 094f8c6e..2eba2afc 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/controls/data/tst_scrollindicator.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 TestCase {
     id: testCase
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index f39676a4..dc56830a 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 TestCase {
     id: testCase
diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml
index 40e7dfa0..ceb316d4 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/controls/data/tst_swipeview.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 TestCase {
     id: testCase
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 97430681..3a8937bb 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 TestCase {
     id: testCase
diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml
index 3874ea44..d096019f 100644
--- a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml
+++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import Qt.labs.calendar 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 //! [1]
 ListView {
diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml
index 978435c0..1654e93c 100644
--- a/tests/manual/fonts/main.qml
+++ b/tests/manual/fonts/main.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 import QtQuick.Layouts 1.2
 
 ApplicationWindow {
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index 465c055f..985c64c4 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import Qt.labs.templates 1.0 as T
 
 Item {
     width: 200