import Qt.labs.controls 1.0 => QtQuick.Controls 2.0

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

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

21 files changed, 23 insertions, 23 deletions

diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml
index 52908a3d..883226a7 100644
--- a/tests/manual/fonts/main.qml
+++ b/tests/manual/fonts/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Templates 2.0 as T
 import QtQuick.Layouts 1.2
 
diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
index e68af7dd..f4a51afb 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: busyIndicator.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/gifs/data/qtquickcontrols2-button.qml
index 3d9a4f45..7ac9f81c 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-button.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: button.width
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
index ac276c06..df80a417 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: column.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml
index 55d744ec..b280b385 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: dial.implicitWidth + 20
diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml
index ccd4f88c..7ecda085 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: dial.implicitWidth + 20
diff --git a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
index f0c029a6..18bf942c 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: column.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/gifs/data/qtquickcontrols2-menu.qml
index 81ea3137..332e4d2b 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-menu.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-menu.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 // TODO: restore and finish https://codereview.qt-project.org/#/c/123948/
 ApplicationWindow {
diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
index 9cc542f6..60a0424f 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: column.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
index 55056cf8..4f764f8a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: slider.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtquickcontrols2-slider.qml
index af582d7c..d109b1d2 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-slider.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: slider.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
index 31246a79..37241d25 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: swipeDelegate.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
index d346a377..fd56db9d 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: swipeDelegate.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
index 78d36e3b..a7f73580 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: swipeDelegate.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/gifs/data/qtquickcontrols2-switch.qml
index f6067c1b..44d07e24 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-switch.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: 100
diff --git a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
index e9fec94e..a0ee4e03 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: column.implicitWidth
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
index 8ca14721..3d0568e1 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: 300
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index 4b84c6d1..e1139177 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.Window 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Window {
     width: 200
diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp
index 134ece2e..1e3f141f 100644
--- a/tests/manual/gifs/gifrecorder.cpp
+++ b/tests/manual/gifs/gifrecorder.cpp
@@ -243,7 +243,7 @@ void GifRecorder::waitForFinish()
     if (mHighQuality) {
         // Indicate the end of recording and the beginning of conversion.
         QQmlComponent busyComponent(&mEngine);
-        busyComponent.setData("import QtQuick 2.6; import Qt.labs.controls 1.0; Rectangle { anchors.fill: parent; " \
+        busyComponent.setData("import QtQuick 2.6; import QtQuick.Controls 2.0; Rectangle { anchors.fill: parent; " \
             "BusyIndicator { width: 32; height: 32; anchors.centerIn: parent } }", QUrl());
         QCOMPARE(busyComponent.status(), QQmlComponent::Ready);
         QQuickItem *busyRect = qobject_cast<QQuickItem*>(busyComponent.create());
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index c612048b..492dddc4 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -41,9 +41,9 @@
 import QtQuick 2.6
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.0
-import Qt.labs.controls 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Universal 2.0
 
 ApplicationWindow {
     id: window
diff --git a/tests/manual/viewinqwidget/main.qml b/tests/manual/viewinqwidget/main.qml
index 36a0b133..5ad52d83 100644
--- a/tests/manual/viewinqwidget/main.qml
+++ b/tests/manual/viewinqwidget/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 Item {
     visible: true