Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0

Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

27 files changed, 19 insertions, 22 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index e0f52889..29810159 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    labs \
-    quick
+    labs
diff --git a/examples/labs/calendar/DateTimePicker.qml b/examples/labs/calendar/DateTimePicker.qml
index e7b2c227..ab0b3085 100644
--- a/examples/labs/calendar/DateTimePicker.qml
+++ b/examples/labs/calendar/DateTimePicker.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import Qt.labs.calendar 1.0
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 Item {
diff --git a/examples/labs/calendar/EventView.qml b/examples/labs/calendar/EventView.qml
index 3991e5eb..e47e7486 100644
--- a/examples/labs/calendar/EventView.qml
+++ b/examples/labs/calendar/EventView.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 
 Rectangle {
     border.color: Theme.frameColor
diff --git a/examples/labs/calendar/TumblerDelegate.qml b/examples/labs/calendar/TumblerDelegate.qml
index fb360cd5..e7d3ee47 100644
--- a/examples/labs/calendar/TumblerDelegate.qml
+++ b/examples/labs/calendar/TumblerDelegate.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 Text {
diff --git a/examples/labs/calendar/main.qml b/examples/labs/calendar/main.qml
index d543aeb5..490dc4d1 100644
--- a/examples/labs/calendar/main.qml
+++ b/examples/labs/calendar/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.calendar 1.0
 import Qt.labs.templates 1.0 as T
 import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/controls.pro b/examples/labs/controls/controls.pro
index 950309a6..950309a6 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/labs/controls/controls.pro
diff --git a/examples/quick/controls/drawer/drawer.pro b/examples/labs/controls/drawer/drawer.pro
index 8c128054..02e40200 100644
--- a/examples/quick/controls/drawer/drawer.pro
+++ b/examples/labs/controls/drawer/drawer.pro
@@ -11,5 +11,5 @@ OTHER_FILES += \
 RESOURCES += \
     drawer.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/drawer
+target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/drawer
 INSTALLS += target
diff --git a/examples/quick/controls/drawer/drawer.qrc b/examples/labs/controls/drawer/drawer.qrc
index 25cc5cbe..25cc5cbe 100644
--- a/examples/quick/controls/drawer/drawer.qrc
+++ b/examples/labs/controls/drawer/drawer.qrc
diff --git a/examples/quick/controls/drawer/images/arrow.png b/examples/labs/controls/drawer/images/arrow.png
index 4981e0de..4981e0de 100644
--- a/examples/quick/controls/drawer/images/arrow.png
+++ b/examples/labs/controls/drawer/images/arrow.png
diff --git a/examples/quick/controls/drawer/images/qt-logo.png b/examples/labs/controls/drawer/images/qt-logo.png
index cf350dad..cf350dad 100644
--- a/examples/quick/controls/drawer/images/qt-logo.png
+++ b/examples/labs/controls/drawer/images/qt-logo.png
diff --git a/examples/quick/controls/drawer/main.cpp b/examples/labs/controls/drawer/main.cpp
index 2abdc16d..2abdc16d 100644
--- a/examples/quick/controls/drawer/main.cpp
+++ b/examples/labs/controls/drawer/main.cpp
diff --git a/examples/quick/controls/drawer/main.qml b/examples/labs/controls/drawer/main.qml
index 45819e6f..5b30a098 100644
--- a/examples/quick/controls/drawer/main.qml
+++ b/examples/labs/controls/drawer/main.qml
@@ -39,14 +39,14 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 
 ApplicationWindow {
     id: window
     width: 360
     height: 520
     visible: true
-    title: "Qt Quick Controls - Drawer Example"
+    title: "Qt Labs Controls - Drawer Example"
 
     Rectangle {
         id: content
diff --git a/examples/quick/controls/mirroring/main.cpp b/examples/labs/controls/mirroring/main.cpp
index 2abdc16d..2abdc16d 100644
--- a/examples/quick/controls/mirroring/main.cpp
+++ b/examples/labs/controls/mirroring/main.cpp
diff --git a/examples/quick/controls/mirroring/main.qml b/examples/labs/controls/mirroring/main.qml
index 471f3397..835304a8 100644
--- a/examples/quick/controls/mirroring/main.qml
+++ b/examples/labs/controls/mirroring/main.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 ApplicationWindow {
@@ -48,7 +48,7 @@ ApplicationWindow {
     width: 360
     height: 520
     visible: true
-    title: "Qt Quick Controls - Mirroring Example"
+    title: "Qt Labs Controls - Mirroring Example"
 
     ListView {
         id: listview
diff --git a/examples/quick/controls/mirroring/mirroring.pro b/examples/labs/controls/mirroring/mirroring.pro
index 8086c166..60b73f94 100644
--- a/examples/quick/controls/mirroring/mirroring.pro
+++ b/examples/labs/controls/mirroring/mirroring.pro
@@ -11,5 +11,5 @@ OTHER_FILES += \
 RESOURCES += \
     mirroring.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/mirroring
+target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/mirroring
 INSTALLS += target
diff --git a/examples/quick/controls/mirroring/mirroring.qrc b/examples/labs/controls/mirroring/mirroring.qrc
index 5f6483ac..5f6483ac 100644
--- a/examples/quick/controls/mirroring/mirroring.qrc
+++ b/examples/labs/controls/mirroring/mirroring.qrc
diff --git a/examples/quick/controls/tabs/images/qt-logo.png b/examples/labs/controls/tabs/images/qt-logo.png
index cf350dad..cf350dad 100644
--- a/examples/quick/controls/tabs/images/qt-logo.png
+++ b/examples/labs/controls/tabs/images/qt-logo.png
diff --git a/examples/quick/controls/tabs/main.cpp b/examples/labs/controls/tabs/main.cpp
index 2abdc16d..2abdc16d 100644
--- a/examples/quick/controls/tabs/main.cpp
+++ b/examples/labs/controls/tabs/main.cpp
diff --git a/examples/quick/controls/tabs/main.qml b/examples/labs/controls/tabs/main.qml
index cf6093b6..50fcde16 100644
--- a/examples/quick/controls/tabs/main.qml
+++ b/examples/labs/controls/tabs/main.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.6
 import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 import QtQuick.XmlListModel 2.0
 
@@ -49,7 +49,7 @@ ApplicationWindow {
     width: 360
     height: 520
     visible: true
-    title: "Qt Quick Controls - Tabs Example"
+    title: "Qt Labs Controls - Tabs Example"
 
     header: TabBar {
         id: bar
diff --git a/examples/quick/controls/tabs/tabs.pro b/examples/labs/controls/tabs/tabs.pro
index 53423689..f9b85c1a 100644
--- a/examples/quick/controls/tabs/tabs.pro
+++ b/examples/labs/controls/tabs/tabs.pro
@@ -11,5 +11,5 @@ OTHER_FILES += \
 RESOURCES += \
     tabs.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/tabs
+target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/tabs
 INSTALLS += target
diff --git a/examples/quick/controls/tabs/tabs.qrc b/examples/labs/controls/tabs/tabs.qrc
index b48259b1..b48259b1 100644
--- a/examples/quick/controls/tabs/tabs.qrc
+++ b/examples/labs/controls/tabs/tabs.qrc
diff --git a/examples/quick/controls/theme/main.cpp b/examples/labs/controls/theme/main.cpp
index 2abdc16d..2abdc16d 100644
--- a/examples/quick/controls/theme/main.cpp
+++ b/examples/labs/controls/theme/main.cpp
diff --git a/examples/quick/controls/theme/main.qml b/examples/labs/controls/theme/main.qml
index 882b426e..d3a3f7a0 100644
--- a/examples/quick/controls/theme/main.qml
+++ b/examples/labs/controls/theme/main.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 ApplicationWindow {
@@ -47,7 +47,7 @@ ApplicationWindow {
     width: 360
     height: 520
     visible: true
-    title: "Qt Quick Controls - Theme Example"
+    title: "Qt Labs Controls - Theme Example"
 
     header: ToolBar {
         ToolButton {
diff --git a/examples/quick/controls/theme/theme.pro b/examples/labs/controls/theme/theme.pro
index 603f4839..7672a2cb 100644
--- a/examples/quick/controls/theme/theme.pro
+++ b/examples/labs/controls/theme/theme.pro
@@ -11,5 +11,5 @@ OTHER_FILES += \
 RESOURCES += \
     theme.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/theme
+target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/theme
 INSTALLS += target
diff --git a/examples/quick/controls/theme/theme.qrc b/examples/labs/controls/theme/theme.qrc
index 5f6483ac..5f6483ac 100644
--- a/examples/quick/controls/theme/theme.qrc
+++ b/examples/labs/controls/theme/theme.qrc
diff --git a/examples/labs/labs.pro b/examples/labs/labs.pro
index 88683726..80f94e86 100644
--- a/examples/labs/labs.pro
+++ b/examples/labs/labs.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    calendar
+    calendar \
+    controls
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
deleted file mode 100644
index ab3cd2b2..00000000
--- a/examples/quick/quick.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-    controls