Rename QtDesktop to QtQuick.Controls

Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

43 files changed, 88 insertions, 90 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7f65bddf..5c3f8d59 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += qtdesktop testplugin
+SUBDIRS += controls testplugin
diff --git a/tests/auto/qtdesktop/qtdesktop.pro b/tests/auto/controls/controls.pro
index 45a1606c..20ee603a 100644
--- a/tests/auto/qtdesktop/qtdesktop.pro
+++ b/tests/auto/controls/controls.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_qtdesktop
+TARGET = tst_controls
 
 IMPORTPATH = $$OUT_PWD/../testplugin
 
@@ -8,7 +8,7 @@ QT += widgets
 CONFIG += qmltestcase
 
 INCLUDEPATH += $$PWD/../../shared
-SOURCES += $$PWD/tst_qtdesktop.cpp
+SOURCES += $$PWD/tst_controls.cpp
 
 TESTDATA = $$PWD/data/*
 
diff --git a/tests/auto/qtdesktop/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml
index ce0a4c15..661e1672 100644
--- a/tests/auto/qtdesktop/data/rangemodel/rangemodel.qml
+++ b/tests/auto/controls/data/rangemodel/rangemodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Private 1.0
 
 RangeModel {
     minimumValue: 0
diff --git a/tests/auto/qtdesktop/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml
index 3da19494..e550aece 100644
--- a/tests/auto/qtdesktop/data/shortcut/shortcuts.qml
+++ b/tests/auto/controls/data/shortcut/shortcuts.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 Rectangle {
     width: 300
diff --git a/tests/auto/qtdesktop/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
index 692e8bc5..b1dd83d3 100644
--- a/tests/auto/qtdesktop/data/tableview/table1_qobjectmodel.qml
+++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktopTest 1.0
+import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
 
 TableView {
     model: TestObject {}
diff --git a/tests/auto/qtdesktop/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml
index c67c7fac..4487f6c1 100644
--- a/tests/auto/qtdesktop/data/tableview/table2_qabstractitemmodel.qml
+++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktopTest 1.0
+import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
 
 TableView {
     model: TestItemModel {}
diff --git a/tests/auto/qtdesktop/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml
index f008a72e..8cb13ccc 100644
--- a/tests/auto/qtdesktop/data/tableview/table3_qobjectlist.qml
+++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktopTest 1.0
+import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
 
 TableView {
     model: model_qobjectlist
diff --git a/tests/auto/qtdesktop/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml
index 2f847cf5..6501dec5 100644
--- a/tests/auto/qtdesktop/data/tableview/table4_qstringlist.qml
+++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktopTest 1.0
+import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
 
 TableView {
     model: model_qstringlist
diff --git a/tests/auto/qtdesktop/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml
index 0b44b918..05d948bc 100644
--- a/tests/auto/qtdesktop/data/tableview/table5_listmodel.qml
+++ b/tests/auto/controls/data/tableview/table5_listmodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TableView {
 
diff --git a/tests/auto/qtdesktop/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml
index e0723550..d5599b44 100644
--- a/tests/auto/qtdesktop/data/tableview/table6_countmodel.qml
+++ b/tests/auto/controls/data/tableview/table6_countmodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TableView {
     model: 3 // qml
diff --git a/tests/auto/qtdesktop/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml
index 53c2a068..700f3635 100644
--- a/tests/auto/qtdesktop/data/tableview/table7_arraymodel.qml
+++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TableView {
     model: ["A", "B", "C"] // qml
diff --git a/tests/auto/qtdesktop/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml
index 621cd597..774bb408 100644
--- a/tests/auto/qtdesktop/data/tableview/table8_itemmodel.qml
+++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TableView {
     model: Item { x: 10 }// qml
diff --git a/tests/auto/qtdesktop/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml
index 2366bf48..d1ec6582 100644
--- a/tests/auto/qtdesktop/data/tst_applicationwindow.qml
+++ b/tests/auto/controls/data/tst_applicationwindow.qml
@@ -49,9 +49,9 @@ TestCase {
     height:400
 
     function test_window() {
-        var tmp = Qt.createQmlObject('import QtDesktop 1.0; ApplicationWindow {id: window}', testCase, '');
-        tmp.statusBar = Qt.createQmlObject('import QtDesktop 1.0; StatusBar {}', testCase, '');
-        tmp.toolBar = Qt.createQmlObject('import QtDesktop 1.0; ToolBar {}', testCase, '');
+        var tmp = Qt.createQmlObject('import QtQuick.Controls 1.0; ApplicationWindow {id: window}', testCase, '');
+        tmp.statusBar = Qt.createQmlObject('import QtQuick.Controls 1.0; StatusBar {}', testCase, '');
+        tmp.toolBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolBar {}', testCase, '');
         verify(tmp.statusBar !== undefined)
         verify(tmp.toolBar !== undefined)
     }
diff --git a/tests/auto/qtdesktop/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index e971c5cc..757bc64b 100644
--- a/tests/auto/qtdesktop/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -49,17 +49,17 @@ TestCase {
     height:400
 
     function test_defaultbutton() {
-        var tmp = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button1}', testCase, '');
+        var tmp = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button1}', testCase, '');
         compare(tmp.defaultbutton, false);
     }
 
     function test_text() {
-        var tmp1 = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button2_1}', testCase, '');
+        var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_1}', testCase, '');
         compare(tmp1.text, "");
         tmp1.text = "Hello";
         compare(tmp1.text, "Hello");
 
-        var tmp2 = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button2_2; text: "Hello"}', testCase, '');
+        var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_2; text: "Hello"}', testCase, '');
         compare(tmp2.text, "Hello");
     }
 }
diff --git a/tests/auto/qtdesktop/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 8b4abede..449439ef 100644
--- a/tests/auto/qtdesktop/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -58,7 +58,7 @@ Item {
         }
 
         function init() {
-            checkBox = Qt.createQmlObject("import QtDesktop 1.0; CheckBox { }", container, "");
+            checkBox = Qt.createQmlObject("import QtQuick.Controls 1.0; CheckBox { }", container, "");
         }
 
         function cleanup() {
@@ -163,7 +163,7 @@ Item {
         }
 
         function test_exclusiveGroup() {
-            var root = Qt.createQmlObject("import QtQuick 2.0; import QtDesktop 1.0; \n"
+            var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n"
                 + "Row { \n"
                 + "    property alias checkBox1: checkBox1 \n"
                 + "    property alias checkBox2: checkBox2 \n"
diff --git a/tests/auto/qtdesktop/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index aaf9e558..08a8c488 100644
--- a/tests/auto/qtdesktop/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -49,7 +49,6 @@ TestCase {
     height:400
 
     property var model
-
     function init() {
         model = Qt.createQmlObject("import QtQuick 2.0; ListModel {}", testCase, '')
         model.append({ text: "Banana", color: "Yellow" })
@@ -58,7 +57,7 @@ TestCase {
     }
 
     function test_keyupdown() {
-        var comboBox = Qt.createQmlObject('import QtDesktop 1.0; ComboBox {}', testCase, '');
+        var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, '');
         comboBox.model = model
 
         compare(comboBox.selectedIndex, 0)
@@ -74,7 +73,7 @@ TestCase {
     }
 
     function test_textrole() {
-        var comboBox = Qt.createQmlObject('import QtDesktop 1.0; ComboBox {}', testCase, '');
+        var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, '');
         comboBox.model = model
         comboBox.textRole = "text"
         compare(comboBox.selectedIndex, 0)
diff --git a/tests/auto/qtdesktop/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index 205c327d..1a83a4a5 100644
--- a/tests/auto/qtdesktop/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -49,6 +49,6 @@ TestCase {
     height:400
 
     function test_createLabel() {
-        var label = Qt.createQmlObject('import QtDesktop 1.0; Label {}', testCase, '');
+        var label = Qt.createQmlObject('import QtQuick.Controls 1.0; Label {}', testCase, '');
     }
 }
diff --git a/tests/auto/qtdesktop/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml
index d7f948a7..6dadfb08 100644
--- a/tests/auto/qtdesktop/data/tst_menu.qml
+++ b/tests/auto/controls/data/tst_menu.qml
@@ -40,8 +40,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtDesktop 1.0
-import "."
+import QtQuick.Controls 1.0
 
 TestCase {
     id: testcase
diff --git a/tests/auto/qtdesktop/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml
index b66845ad..f6c04bd4 100644
--- a/tests/auto/qtdesktop/data/tst_menubar.qml
+++ b/tests/auto/controls/data/tst_menubar.qml
@@ -49,6 +49,6 @@ TestCase {
     height:400
 
     function test_createMenuBar() {
-        var menuBar = Qt.createQmlObject('import QtDesktop 1.0; MenuBar {}', testCase, '');
+        var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.0; MenuBar {}', testCase, '');
     }
 }
diff --git a/tests/auto/qtdesktop/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml
index 365aa5af..0e5ce78e 100644
--- a/tests/auto/qtdesktop/data/tst_page.qml
+++ b/tests/auto/controls/data/tst_page.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_createPage() {
-        var page = Qt.createQmlObject('import QtDesktop 1.0; Page {}', testCase, '');
+        var page = Qt.createQmlObject('import QtQuick.Controls 1.0; Page {}', testCase, '');
     }
 
 
diff --git a/tests/auto/qtdesktop/data/tst_pagestack.qml b/tests/auto/controls/data/tst_pagestack.qml
index 4f6826d7..14068c72 100644
--- a/tests/auto/qtdesktop/data/tst_pagestack.qml
+++ b/tests/auto/controls/data/tst_pagestack.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/qtdesktop/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index bf9056e8..56b2ad0e 100644
--- a/tests/auto/qtdesktop/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_minimumvalue() {
-        var progressBar = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {}', testCase, '');
+        var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, '');
 
         progressBar.minimumValue = 5
         progressBar.maximumValue = 10
@@ -62,7 +62,7 @@ TestCase {
     }
 
     function test_maximumvalue() {
-        var progressBar = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {}', testCase, '');
+        var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, '');
 
         progressBar.minimumValue = 5
         progressBar.maximumValue = 10
@@ -75,7 +75,7 @@ TestCase {
     }
 
     function test_invalidMinMax() {
-        var progressBar = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {}', testCase, '');
+        var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, '');
 
         // minimumValue has priority over maximum if they are inconsistent
 
@@ -92,7 +92,7 @@ TestCase {
         progressBar.value = 12
         compare(progressBar.value, progressBar.minimumValue)
 
-        var progressBar2 = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, '');
+        var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, '');
         compare(progressBar.value, progressBar.minimumValue)
     }
 }
diff --git a/tests/auto/qtdesktop/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index ba4445db..1ad1b032 100644
--- a/tests/auto/qtdesktop/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -58,7 +58,7 @@ Item {
         }
 
         function init() {
-            radioButton = Qt.createQmlObject("import QtDesktop 1.0; RadioButton {}", container, "");
+            radioButton = Qt.createQmlObject('import QtQuick.Controls 1.0; RadioButton {}', container, '');
         }
 
         function cleanup() {
@@ -133,7 +133,7 @@ Item {
         }
 
         function test_exclusiveGroup() {
-            var root = Qt.createQmlObject("import QtQuick 2.0; import QtDesktop 1.0; \n"
+            var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n"
                 + "Row { \n"
                 + "    property alias radioButton1: radioButton1 \n"
                 + "    property alias radioButton2: radioButton2 \n"
diff --git a/tests/auto/qtdesktop/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml
index 259c884c..259c884c 100644
--- a/tests/auto/qtdesktop/data/tst_rangemodel.qml
+++ b/tests/auto/controls/data/tst_rangemodel.qml
diff --git a/tests/auto/qtdesktop/data/tst_scrollarea.qml b/tests/auto/controls/data/tst_scrollarea.qml
index 3e2a70f0..a2c1ed1f 100644
--- a/tests/auto/qtdesktop/data/tst_scrollarea.qml
+++ b/tests/auto/controls/data/tst_scrollarea.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/qtdesktop/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml
index 8266d511..344fc327 100644
--- a/tests/auto/qtdesktop/data/tst_shortcuts.qml
+++ b/tests/auto/controls/data/tst_shortcuts.qml
@@ -40,8 +40,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/qtdesktop/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 41c2d761..70dc3d92 100644
--- a/tests/auto/qtdesktop/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_minimumvalue() {
-        var slider = Qt.createQmlObject('import QtDesktop 1.0; Slider {}', testCase, '');
+        var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, '');
 
         slider.minimumValue = 5
         slider.maximumValue = 10
@@ -59,7 +59,7 @@ TestCase {
     }
 
     function test_maximumvalue() {
-        var slider = Qt.createQmlObject('import QtDesktop 1.0; Slider {}', testCase, '');
+        var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, '');
 
         slider.minimumValue = 5
         slider.maximumValue = 10
diff --git a/tests/auto/qtdesktop/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 9f002c11..fe482308 100644
--- a/tests/auto/qtdesktop/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -56,7 +56,7 @@ Item {
         property point downCoord: "0,0"
 
         function test_increment_key() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {maximumValue: 50}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '')
             spinbox.forceActiveFocus()
 
             compare(spinbox.maximumValue, 50)
@@ -71,7 +71,7 @@ Item {
         }
 
         function test_decrement_key() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {minimumValue: 10}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '')
             spinbox.forceActiveFocus()
 
             compare(spinbox.minimumValue, 10)
@@ -86,7 +86,7 @@ Item {
         }
 
         function test_increment_mouse() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {maximumValue: 50}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '')
             spinbox.forceActiveFocus()
             setCoordinates(spinbox)
 
@@ -101,7 +101,7 @@ Item {
         }
 
         function test_decrement_mouse() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {minimumValue: 10}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '')
             spinbox.forceActiveFocus()
             setCoordinates(spinbox)
 
@@ -116,7 +116,7 @@ Item {
         }
 
         function test_move_mouse() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             spinbox.forceActiveFocus()
             setCoordinates(spinbox)
 
@@ -140,7 +140,7 @@ Item {
         }
 
         function test_maxvalue() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             spinbox.value = spinbox.maximumValue + 1
             compare(spinbox.value, spinbox.maximumValue)
 
@@ -156,7 +156,7 @@ Item {
         }
 
         function test_minvalue() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             spinbox.value = spinbox.minimumValue - 1
             compare(spinbox.value, spinbox.minimumValue)
 
@@ -172,7 +172,7 @@ Item {
         }
 
         function test_nanvalue() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             // It is not possible to set a string to the spinbox value.
             // Nan is a valid number though
             spinbox.value = NaN
@@ -181,7 +181,7 @@ Item {
         }
 
         function test_decimals() {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
 
             spinbox.decimals = 0
             spinbox.value = 1.00001
@@ -208,7 +208,7 @@ Item {
 
         function test_stepsize()
         {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             spinbox.forceActiveFocus()
 
             spinbox.stepSize = 2
@@ -226,7 +226,7 @@ Item {
 
         function test_negativeStepSize()
         {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             spinbox.forceActiveFocus()
 
             spinbox.minimumValue = -50
@@ -257,7 +257,7 @@ Item {
 
         function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents
         {
-            var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '')
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
             spinbox.forceActiveFocus()
             spinbox.minimumValue = -50
             spinbox.maximumValue = 50
diff --git a/tests/auto/qtdesktop/data/tst_splitter.qml b/tests/auto/controls/data/tst_splitter.qml
index cb34cacb..a4a50f50 100644
--- a/tests/auto/qtdesktop/data/tst_splitter.qml
+++ b/tests/auto/controls/data/tst_splitter.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/qtdesktop/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml
index 942ae6c6..4eb9bd82 100644
--- a/tests/auto/qtdesktop/data/tst_statusbar.qml
+++ b/tests/auto/controls/data/tst_statusbar.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_createStatusBar() {
-        var statusBar = Qt.createQmlObject('import QtDesktop 1.0; StatusBar {}', testCase, '');
+        var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.0; StatusBar {}', testCase, '');
     }
 }
 
diff --git a/tests/auto/qtdesktop/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml
index 648aa9d5..c20b2ea2 100644
--- a/tests/auto/qtdesktop/data/tst_tab.qml
+++ b/tests/auto/controls/data/tst_tab.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_createTab() {
-        var tab = Qt.createQmlObject('import QtDesktop 1.0; Tab {}', testCase, '');
+        var tab = Qt.createQmlObject('import QtQuick.Controls 1.0; Tab {}', testCase, '');
     }
 }
 
diff --git a/tests/auto/qtdesktop/data/tst_tabframe.qml b/tests/auto/controls/data/tst_tabframe.qml
index 4d21c148..4c6d7992 100644
--- a/tests/auto/qtdesktop/data/tst_tabframe.qml
+++ b/tests/auto/controls/data/tst_tabframe.qml
@@ -49,11 +49,11 @@ TestCase {
     height:400
 
     function test_createTabFrame() {
-        var tabFrame = Qt.createQmlObject('import QtDesktop 1.0; TabFrame {}', testCase, '');
+        var tabFrame = Qt.createQmlObject('import QtQuick.Controls 1.0; TabFrame {}', testCase, '');
     }
 
     function test_repeater() {
-        var tabFrame = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; TabFrame { Repeater { model: 3; Tab { } } }', testCase, '');
+        var tabFrame = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabFrame { Repeater { model: 3; Tab { } } }', testCase, '');
         compare(tabFrame.count, 3)
     }
 }
diff --git a/tests/auto/qtdesktop/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml
index 4d051ad4..bf7c9bb4 100644
--- a/tests/auto/qtdesktop/data/tst_tableview.qml
+++ b/tests/auto/controls/data/tst_tableview.qml
@@ -40,8 +40,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtDesktop 1.0
-import QtDesktopTest 1.0
+import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/auto/qtdesktop/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml
index 6de32ef1..a7a75759 100644
--- a/tests/auto/qtdesktop/data/tst_tableviewcolumn.qml
+++ b/tests/auto/controls/data/tst_tableviewcolumn.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_createTableViewColumn() {
-        var tableViewColumn = Qt.createQmlObject('import QtDesktop 1.0; TableViewColumn {}', testCase, '');
+        var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.0; TableViewColumn {}', testCase, '');
     }
 }
 
diff --git a/tests/auto/qtdesktop/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index d266a403..105f19c7 100644
--- a/tests/auto/qtdesktop/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -49,7 +49,7 @@ TestCase {
     height: 400
 
     function test_append() {
-        var textarea = Qt.createQmlObject('import QtDesktop 1.0; TextArea {}', testCase, '')
+        var textarea = Qt.createQmlObject('import QtQuick.Controls 1.0; TextArea {}', testCase, '')
 
         compare(textarea.text, "")
 
diff --git a/tests/auto/qtdesktop/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 69cd503c..1f051e74 100644
--- a/tests/auto/qtdesktop/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -49,7 +49,7 @@ TestCase {
     height: 400
 
     function test_text() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
 
         compare(textfield.text, "")
         textfield.text = "hello world"
@@ -57,7 +57,7 @@ TestCase {
     }
 
     function test_maximumLength() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
 
         textfield.text = "hello world"
         textfield.maximumLength = 5
@@ -65,7 +65,7 @@ TestCase {
     }
 
     function test_length() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
 
         textfield.text = "hello world"
         compare(textfield.length, 11)
@@ -73,7 +73,7 @@ TestCase {
 
 
     function test_readonly() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         compare(textfield.readOnly, false)
@@ -84,7 +84,7 @@ TestCase {
     }
 
     function test_inputMask() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         // +/- not required, 1 digit required, 1 aphabetic character required and 2 digits not required
@@ -122,7 +122,7 @@ TestCase {
     }
 
     function test_validator() {
-        var textfield = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
 
         textfield.text = "blu"
         compare(textfield.acceptableInput, false)
@@ -135,7 +135,7 @@ TestCase {
     }
 
     function test_selectAll() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -146,7 +146,7 @@ TestCase {
     }
 
     function test_select() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -160,7 +160,7 @@ TestCase {
     }
 
     function test_cursorPosition() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         compare(textfield.cursorPosition, 0)
@@ -175,7 +175,7 @@ TestCase {
     }
 
     function test_selectWord() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -187,14 +187,14 @@ TestCase {
     }
 
     function copy() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.text = "this is my text"
         textfield.select(0, 5)
         textfield.copy()
     }
 
     function test_getText() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -203,7 +203,7 @@ TestCase {
     }
 
     function test_insert() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -212,7 +212,7 @@ TestCase {
     }
 
     function test_deselect() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -222,7 +222,7 @@ TestCase {
     }
 
     function test_undo() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
@@ -233,7 +233,7 @@ TestCase {
     }
 
     function test_redo() {
-        var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '')
         textfield.forceActiveFocus()
 
         textfield.text = "this is my text"
diff --git a/tests/auto/qtdesktop/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index 534fb5c7..9c125604 100644
--- a/tests/auto/qtdesktop/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_createToolBar() {
-        var toolBar = Qt.createQmlObject('import QtDesktop 1.0; ToolBar {}', testCase, '');
+        var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolBar {}', testCase, '');
     }
 }
 
diff --git a/tests/auto/qtdesktop/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 9708ce8b..61c3d308 100644
--- a/tests/auto/qtdesktop/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -49,7 +49,7 @@ TestCase {
     height:400
 
     function test_createToolButton() {
-        var toolButton = Qt.createQmlObject('import QtDesktop 1.0; ToolButton {}', testCase, '');
+        var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {}', testCase, '');
     }
 }
 
diff --git a/tests/auto/qtdesktop/tst_qtdesktop.cpp b/tests/auto/controls/tst_controls.cpp
index a1c9da35..e63c01b0 100644
--- a/tests/auto/qtdesktop/tst_qtdesktop.cpp
+++ b/tests/auto/controls/tst_controls.cpp
@@ -39,5 +39,5 @@
 **
 ****************************************************************************/
 #include <QtQuickTest/quicktest.h>
-#include "qtdc_quicktest.h"
-QTDC_QUICK_TEST_MAIN(qtdesktop)
+#include "qt_quick_controls_quicktest.h"
+QT_QUICK_CONTROLS_TEST_MAIN(qtquickcontrols)
diff --git a/tests/auto/testplugin/QtDesktopTest/qmldir b/tests/auto/testplugin/QtDesktopTest/qmldir
deleted file mode 100644
index 8b6dadac..00000000
--- a/tests/auto/testplugin/QtDesktopTest/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module QtDesktopTest
-plugin testplugin
diff --git a/tests/auto/testplugin/QtQuickControlsTests/qmldir b/tests/auto/testplugin/QtQuickControlsTests/qmldir
new file mode 100644
index 00000000..10c6cbab
--- /dev/null
+++ b/tests/auto/testplugin/QtQuickControlsTests/qmldir
@@ -0,0 +1,2 @@
+module QtQuickControlsTests
+plugin testplugin
diff --git a/tests/auto/testplugin/testplugin.h b/tests/auto/testplugin/testplugin.h
index ee0d58ac..cc3d854b 100644
--- a/tests/auto/testplugin/testplugin.h
+++ b/tests/auto/testplugin/testplugin.h
@@ -47,7 +47,7 @@
 class TestPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtdesktopcomponents.QQmlExtensionInterface" FILE "testplugin.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "testplugin.json")
 public:
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro
index b0df3acd..12fb19fd 100644
--- a/tests/auto/testplugin/testplugin.pro
+++ b/tests/auto/testplugin/testplugin.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 TARGET  = testplugin
-TARGETPATH = QtDesktopTest
+TARGETPATH = QtQuickControlsTests
 
 QT += qml quick widgets