diff --git a/README b/README
index f0294c0138ee7e54f264a0b4349986f9e5208b17..692e8a4c7577839a5ec4446c1ac919c92889882b 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
ABOUT
-This project aims to deliver widgets/components for Desktop usage on Qt Quick.
+This project aims to deliver widgets/controls functionality with Qt Quick.
Some more information can be found on the following blog entries:
diff --git a/examples/ApplicationTemplate/qml/main.qml b/examples/ApplicationTemplate/qml/main.qml
index dcfe6064d5de87494e7ff822325d0c6f76a79985..4217907a76bdd45b176f030498021900ba059034 100644
--- a/examples/ApplicationTemplate/qml/main.qml
+++ b/examples/ApplicationTemplate/qml/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
ApplicationWindow {
width: 640
diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml
index 9dd1f14745bfd7cd98326157868df9e5e44d135f..312e2c6300ca7bf30e268fcc5d9119b31a14facf 100644
--- a/examples/gallery/content/ChildWindow.qml
+++ b/examples/gallery/content/ChildWindow.qml
@@ -40,7 +40,7 @@
import QtQuick 2.0
import QtQuick.Window 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Window {
id: window1
diff --git a/examples/gallery/content/Controls.qml b/examples/gallery/content/Controls.qml
index 4f188a90b55511b69eaf650f2a412b2831a2e0dd..1c2db2aacdd7ca3814ad7470c4e785bae402ffc8 100644
--- a/examples/gallery/content/Controls.qml
+++ b/examples/gallery/content/Controls.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Item {
id: flickable
diff --git a/examples/gallery/content/ModelView.qml b/examples/gallery/content/ModelView.qml
index a3c67fc0c38be5e7fb369f70dfdba564ad61ad86..2590d50234f9706b95939b11cca1922e8dee72ef 100644
--- a/examples/gallery/content/ModelView.qml
+++ b/examples/gallery/content/ModelView.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
//import QtQuick.XmlListModel 2.0
Item {
diff --git a/examples/gallery/content/Panel.qml b/examples/gallery/content/Panel.qml
index bd70439d28378ae78d519817868b1c4f71b4adfc..aeb38e8a4ee521d349324b98ab614168f19d3ec0 100644
--- a/examples/gallery/content/Panel.qml
+++ b/examples/gallery/content/Panel.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Rectangle {
id:root
diff --git a/examples/gallery/content/RangeTab.qml b/examples/gallery/content/RangeTab.qml
index 5f773b02a29155969224b160be0b8fc62c0916fa..8289c789b210fab8b3614f5bd51d6c9fb019a000 100644
--- a/examples/gallery/content/RangeTab.qml
+++ b/examples/gallery/content/RangeTab.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Row {
anchors.fill: parent
diff --git a/examples/gallery/content/Styles.qml b/examples/gallery/content/Styles.qml
index cf7813fdb608738572da51958bd81f16d61b3301..9a639534dd48df14c71af5e24ef5a2436817099c 100644
--- a/examples/gallery/content/Styles.qml
+++ b/examples/gallery/content/Styles.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Item {
id: root
diff --git a/examples/gallery/main.qml b/examples/gallery/main.qml
index 60e1f63caf04cfb0a4a3f06564fcf1fcbf71b003..6f71515b8d31e5efba42e053f2224c892be2b545 100644
--- a/examples/gallery/main.qml
+++ b/examples/gallery/main.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "content"
ApplicationWindow {
diff --git a/examples/splitters/main.qml b/examples/splitters/main.qml
index f1a4873f2f8b54bc6f5e0f476432a4d241cf3573..6f7e2228c20fd661782cd9d85f7480ec917775ce 100644
--- a/examples/splitters/main.qml
+++ b/examples/splitters/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
ApplicationWindow {
width: 600
diff --git a/examples/tableview/main.qml b/examples/tableview/main.qml
index dcebb4d24a2b93e2e8bcf24abced7a83d919a81c..78dee116d0b37933aec4c102420126edf8ac8e63 100644
--- a/examples/tableview/main.qml
+++ b/examples/tableview/main.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import QtQuick.XmlListModel 2.0
Rectangle {
diff --git a/examples/touch/content/ButtonPage.qml b/examples/touch/content/ButtonPage.qml
index 06b983db86c56311a916d1cf1cc15340602f5a1b..8e97a2d8c4c8099130b850c489a0ccbfd3627cec 100644
--- a/examples/touch/content/ButtonPage.qml
+++ b/examples/touch/content/ButtonPage.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Page {
diff --git a/examples/touch/content/ProgressBarPage.qml b/examples/touch/content/ProgressBarPage.qml
index f8885a4289f63aee9052ad07209dff459fc2f7d4..88143b53d63feee7fb14a138998898c60e9b2b4d 100644
--- a/examples/touch/content/ProgressBarPage.qml
+++ b/examples/touch/content/ProgressBarPage.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Page {
diff --git a/examples/touch/content/SliderPage.qml b/examples/touch/content/SliderPage.qml
index e14ecaa572a407d9ac809d60de9f2c7637f88deb..b345d35128a6deab84cccb889bbbd6bebe11408b 100644
--- a/examples/touch/content/SliderPage.qml
+++ b/examples/touch/content/SliderPage.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Page {
Column {
diff --git a/examples/touch/content/TabBarPage.qml b/examples/touch/content/TabBarPage.qml
index ae4a73b888c68e6c7055434a50711615a81ae42d..792f1a25f744367044d99c61153159b0f1dbe976 100644
--- a/examples/touch/content/TabBarPage.qml
+++ b/examples/touch/content/TabBarPage.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Page {
diff --git a/examples/touch/content/TextInputPage.qml b/examples/touch/content/TextInputPage.qml
index 3174c1b7170a86dff595d408dc64345343152bfe..1bf8f20a25e6d6b45b57607afd1dd8dc63f0c84d 100644
--- a/examples/touch/content/TextInputPage.qml
+++ b/examples/touch/content/TextInputPage.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Page {
diff --git a/examples/touch/main.qml b/examples/touch/main.qml
index 6a26b9d5d6d1d0970b6bbf8746814902570221f7..b5061c163b35b105a81779f50df1b8bf50b838e3 100644
--- a/examples/touch/main.qml
+++ b/examples/touch/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
import "content"
ApplicationWindow {
diff --git a/qtdesktopcomponents.pro b/qtquickcontrols.pro
similarity index 85%
rename from qtdesktopcomponents.pro
rename to qtquickcontrols.pro
index 289b018109fefdd30299b0c2e2c9d23df4c5e80e..bc5ed5e819b52e987442838086bcedbd3d67ba4f 100644
--- a/qtdesktopcomponents.pro
+++ b/qtquickcontrols.pro
@@ -2,5 +2,5 @@ load(qt_parts)
# We need accessibility
!contains(QT_CONFIG, accessibility) {
- error("Building Qt without accessibility is not supported for desktop components.")
+ error("Building Qt without accessibility is not supported for qt quick controls.")
}
diff --git a/src/qtdesktop/AbstractCheckable.qml b/src/controls/AbstractCheckable.qml
similarity index 97%
rename from src/qtdesktop/AbstractCheckable.qml
rename to src/controls/AbstractCheckable.qml
index c3451c26543518b9e51668d492c334e96c81fe06..206361e2e39e9bdeadd22f6ec0cc6f476260a016 100644
--- a/src/qtdesktop/AbstractCheckable.qml
+++ b/src/controls/AbstractCheckable.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Private 1.0
/****************************************************************************
**
@@ -42,11 +42,11 @@ import QtDesktop.Private 1.0
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype AbstractCheckable
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief An abstract representation of a checkable control
\qmlabstract
diff --git a/src/qtdesktop/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
similarity index 98%
rename from src/qtdesktop/ApplicationWindow.qml
rename to src/controls/ApplicationWindow.qml
index 662e5fb588b4cbaf79218c3fdc414bcb330044dd..6a33c26fa7ab4c862bf27445f69813ceed87f061 100644
--- a/src/qtdesktop/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -40,12 +40,12 @@
import QtQuick 2.0
import QtQuick.Window 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype ApplicationWindow
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup applicationwindow
\brief ApplicationWindow provides a top-level application window.
diff --git a/src/qtdesktop/Button.qml b/src/controls/Button.qml
similarity index 96%
rename from src/qtdesktop/Button.qml
rename to src/controls/Button.qml
index 37d71566897b23e76cea31caa904de3417270056..529d602a087017b9e625731762ee2d4263fc2e3e 100644
--- a/src/qtdesktop/Button.qml
+++ b/src/controls/Button.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype Button
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief A normal button
diff --git a/src/qtdesktop/CheckBox.qml b/src/controls/CheckBox.qml
similarity index 98%
rename from src/qtdesktop/CheckBox.qml
rename to src/controls/CheckBox.qml
index f87ef26ca4536d8433d31ef043fbd55d03f513f3..574f35e533666acdca3fd37f56c2b8c66f066bf1 100644
--- a/src/qtdesktop/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
import "Styles/Settings.js" as Settings
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype CheckBox
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief A checkbox with a text label
diff --git a/src/qtdesktop/ComboBox.qml b/src/controls/ComboBox.qml
similarity index 98%
rename from src/qtdesktop/ComboBox.qml
rename to src/controls/ComboBox.qml
index 9b42e357db2847171bdf0560e7d8e55e294c6329..5458807b4f94d2b088a91aaef4f2b8895ddbac3b 100644
--- a/src/qtdesktop/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype ComboBox
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief ComboBox is a combined button and popup list. The popup menu itself is platform
native, and cannot by styled from QML code.
diff --git a/src/qtdesktop/ContextMenu.qml b/src/controls/ContextMenu.qml
similarity index 99%
rename from src/qtdesktop/ContextMenu.qml
rename to src/controls/ContextMenu.qml
index c7e7502e35a5dd3f89ca6f0b0042ff8031ca504c..42c2adcbe1070efd09fa295826c122709bed8b9c 100644
--- a/src/qtdesktop/ContextMenu.qml
+++ b/src/controls/ContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Menu {
id: root
diff --git a/src/qtdesktop/GroupBox.qml b/src/controls/GroupBox.qml
similarity index 99%
rename from src/qtdesktop/GroupBox.qml
rename to src/controls/GroupBox.qml
index 17351b8de9435e8280ce2e1e52e216a39f37777d..2e5b35d6938a4cc1d66911525c3060fbaf14b262 100644
--- a/src/qtdesktop/GroupBox.qml
+++ b/src/controls/GroupBox.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype GroupBox
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief GroupBox provides a group box frame with a title
diff --git a/src/qtdesktop/Label.qml b/src/controls/Label.qml
similarity index 98%
rename from src/qtdesktop/Label.qml
rename to src/controls/Label.qml
index 4cce008313d0de39a68c00c9bb73437b002c43ba..0dd5dec29faedcc0a7a7b2cd6ffc5fd5147805fa 100644
--- a/src/qtdesktop/Label.qml
+++ b/src/controls/Label.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
/*!
\qmltype Label
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief Label is a text display.
diff --git a/src/qtdesktop/Menu.qml b/src/controls/Menu.qml
similarity index 99%
rename from src/qtdesktop/Menu.qml
rename to src/controls/Menu.qml
index a85c46558e9d7c0439f62552ac948c4f208ae204..3176436f252ef9cf0c0eae096908ef11de4a2614 100644
--- a/src/qtdesktop/Menu.qml
+++ b/src/controls/Menu.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype Menu
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\inherits MenuItem
\brief Menu provides a menu component for use in menu bars, context menus, and other popup menus.
diff --git a/src/qtdesktop/MenuBar.qml b/src/controls/MenuBar.qml
similarity index 98%
rename from src/qtdesktop/MenuBar.qml
rename to src/controls/MenuBar.qml
index c1fdd97089b41e838046c8c92bdffe9f6dad13e1..db1cb3f633012fbccbbda427779d84652a709faf 100644
--- a/src/qtdesktop/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype MenuBar
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\inherits Item
\brief The MenuBar item provides a horizontal menu bar.
diff --git a/src/qtdesktop/Page.qml b/src/controls/Page.qml
similarity index 98%
rename from src/qtdesktop/Page.qml
rename to src/controls/Page.qml
index f044b8c8e3ba2f598a7206c3f6dadafc2b7c5582..c7d08c2903c6f5d00a347914673805b5089fd0f4 100644
--- a/src/qtdesktop/Page.qml
+++ b/src/controls/Page.qml
@@ -39,11 +39,11 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype Page
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup navigation
\brief A Page is an Item you can push on a PageStack
diff --git a/src/qtdesktop/PageAnimation.qml b/src/controls/PageAnimation.qml
similarity index 100%
rename from src/qtdesktop/PageAnimation.qml
rename to src/controls/PageAnimation.qml
diff --git a/src/qtdesktop/PageStack.qml b/src/controls/PageStack.qml
similarity index 99%
rename from src/qtdesktop/PageStack.qml
rename to src/controls/PageStack.qml
index c5d23c719fa15bf4f3e1aed1c95efe93c097486b..4248344381d1fc6ba956b58dfbaea490a8501eee 100644
--- a/src/qtdesktop/PageStack.qml
+++ b/src/controls/PageStack.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Private/PageStack.js" as JSArray
/*!
\qmltype PageStack
\inherits Item
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief The central component for building page-based applications
diff --git a/src/qtdesktop/PageTransition.qml b/src/controls/PageTransition.qml
similarity index 95%
rename from src/qtdesktop/PageTransition.qml
rename to src/controls/PageTransition.qml
index 37f04e135b8de5ad19c029ebf319179976641145..bd69dc5aaaf5f8992069c9e9f49771e0d33de3a1 100644
--- a/src/qtdesktop/PageTransition.qml
+++ b/src/controls/PageTransition.qml
@@ -42,11 +42,11 @@ import QtQuick 2.0
/*!
\qmltype PageTransition
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief The component for managing page transitions
- See the documentation for the \l {QtDesktop1::PageStack} {PageStack}
+ See the documentation for the \l {QtQuick.Controls1::PageStack} {PageStack}
component.
*/
diff --git a/src/qtdesktop/ProgressBar.qml b/src/controls/ProgressBar.qml
similarity index 97%
rename from src/qtdesktop/ProgressBar.qml
rename to src/controls/ProgressBar.qml
index d83d16603662b843ef080c127f4a9d51f0e5ab62..9d67b690f7535aa9695c576ceb994ac1a3628376 100644
--- a/src/qtdesktop/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype ProgressBar
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup indicators
\brief A progress bar
diff --git a/src/qtdesktop/RadioButton.qml b/src/controls/RadioButton.qml
similarity index 97%
rename from src/qtdesktop/RadioButton.qml
rename to src/controls/RadioButton.qml
index 0088bc517a4f33efda2c579cd1e7d5c32e19c290..ce819164e1df56c6b2c792b54a30aa396ca96e2c 100644
--- a/src/qtdesktop/RadioButton.qml
+++ b/src/controls/RadioButton.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
import "Styles/Settings.js" as Settings
// jb : Size should not depend on background, we should make it consistent
/*!
\qmltype RadioButton
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief A radio button with a text label
diff --git a/src/qtdesktop/ScrollArea.qml b/src/controls/ScrollArea.qml
similarity index 99%
rename from src/qtdesktop/ScrollArea.qml
rename to src/controls/ScrollArea.qml
index ede61d053e6b2bfc25b57a1cacbac39f69929a91..8a48303eae2f587e7a212cb71db489f321ca3eb9 100644
--- a/src/qtdesktop/ScrollArea.qml
+++ b/src/controls/ScrollArea.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype ScrollArea
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup navigation
\brief The ScrollArea class provides a scrolling view onto another Item.
diff --git a/src/qtdesktop/Slider.qml b/src/controls/Slider.qml
similarity index 98%
rename from src/qtdesktop/Slider.qml
rename to src/controls/Slider.qml
index 7def55d49390a10bb913cf8bdd091dcb322b2ee3..9c274463e73b13484732833c0c2047fac593893d 100644
--- a/src/qtdesktop/Slider.qml
+++ b/src/controls/Slider.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype Slider
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief Slider provides a vertical or horizontal slider control.
diff --git a/src/qtdesktop/SpinBox.qml b/src/controls/SpinBox.qml
similarity index 99%
rename from src/qtdesktop/SpinBox.qml
rename to src/controls/SpinBox.qml
index 9bc15b957261b39edd86d347bad341ecad4ecb60..25c70fc661e568792b4730f3a60333f3a459a7a5 100644
--- a/src/qtdesktop/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype SpinBox
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief SpinBox provides a spin box control.
diff --git a/src/qtdesktop/Splitter.qml b/src/controls/Splitter.qml
similarity index 99%
rename from src/qtdesktop/Splitter.qml
rename to src/controls/Splitter.qml
index d15c205d348628b9f7b84f9b1b61993edf7641cf..16796f1a3ee20215d26c17f17e5959d6ebc3b056 100644
--- a/src/qtdesktop/Splitter.qml
+++ b/src/controls/Splitter.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0 as Private
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0 as Private
/*!
\qmltype Splitter
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief Splitter is a component that lays out items horisontally or
vertically with a draggable splitter between each item.
*/
diff --git a/src/qtdesktop/StatusBar.qml b/src/controls/StatusBar.qml
similarity index 96%
rename from src/qtdesktop/StatusBar.qml
rename to src/controls/StatusBar.qml
index c8d3363d3a60eeaadabf8bfea60bf952cd525a71..965af47b54d95457f8ebb7e1dadf3ee9f52784b4 100644
--- a/src/qtdesktop/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBar
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup applicationwindow
\brief StatusBar is for containing status informating in your app
diff --git a/src/qtdesktop/Tab.qml b/src/controls/Tab.qml
similarity index 98%
rename from src/qtdesktop/Tab.qml
rename to src/controls/Tab.qml
index 3850026cd8d9b86ad7c6150400e43136396e74fd..014bb023b4bc22ab2c9dcbfe9eca590b1b5378c7 100644
--- a/src/qtdesktop/Tab.qml
+++ b/src/controls/Tab.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
/*!
\qmltype Tab
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup navigation
\brief Tab is doing bla...bla...
*/
diff --git a/src/qtdesktop/TabFrame.qml b/src/controls/TabFrame.qml
similarity index 98%
rename from src/qtdesktop/TabFrame.qml
rename to src/controls/TabFrame.qml
index 7be1ba78b8ee0207ff7c7c35b98c7130ff31490b..91ea18f62c46950b2f7bfbee0215bfbdcb3954b0 100644
--- a/src/qtdesktop/TabFrame.qml
+++ b/src/controls/TabFrame.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
/*!
\qmltype TabFrame
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup navigation
\brief Represents a control that contains multiple items that share the same space on the screen.
diff --git a/src/qtdesktop/TableView.qml b/src/controls/TableView.qml
similarity index 99%
rename from src/qtdesktop/TableView.qml
rename to src/controls/TableView.qml
index 080bcab073e212a957632c976fc09194de2e8bae..bcfc8d8b19cf22548f4ac23053a399b4565cdcdb 100644
--- a/src/qtdesktop/TableView.qml
+++ b/src/controls/TableView.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype TableView
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup views
\brief Provides a list view with scroll bars, styling and header sections.
diff --git a/src/qtdesktop/TableViewColumn.qml b/src/controls/TableViewColumn.qml
similarity index 98%
rename from src/qtdesktop/TableViewColumn.qml
rename to src/controls/TableViewColumn.qml
index ba83524e9164fd3c93319309c8149f7e90acb7b2..f14b3f03dbdcfb94ec0cf14a4ea8abc173c671c9 100644
--- a/src/qtdesktop/TableViewColumn.qml
+++ b/src/controls/TableViewColumn.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
/*!
\qmltype TableViewColumn
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup views
\brief Used by the \l TableView to define a column header.
*/
diff --git a/src/qtdesktop/TextArea.qml b/src/controls/TextArea.qml
similarity index 99%
rename from src/qtdesktop/TextArea.qml
rename to src/controls/TextArea.qml
index 14f3f6ba3dda7722443c8a60b35559850b40bcd6..bcedbe7502b2b1abc55a9e4e392cfaff6516def0 100644
--- a/src/qtdesktop/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -39,11 +39,11 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype TextArea
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief TextArea displays multiple lines of editable formatted text.
diff --git a/src/qtdesktop/TextField.qml b/src/controls/TextField.qml
similarity index 99%
rename from src/qtdesktop/TextField.qml
rename to src/controls/TextField.qml
index ba185f0cd43ef681bdb8ef42079380cc2d93ec13..c209e53298199420f1d43c10f3c1bffef19c3d54 100644
--- a/src/qtdesktop/TextField.qml
+++ b/src/controls/TextField.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "Styles"
import "Styles/Settings.js" as Settings
/*!
\qmltype TextField
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup controls
\brief TextField displays a single line of editable plain text
@@ -351,7 +351,7 @@ Control {
\code
import QtQuick 2.0
- import QtDesktop 1.0
+ import QtQuick.Controls 1.0
TextField {
validator: IntValidator {bottom: 11; top: 31;}
diff --git a/src/qtdesktop/ToolBar.qml b/src/controls/ToolBar.qml
similarity index 96%
rename from src/qtdesktop/ToolBar.qml
rename to src/controls/ToolBar.qml
index 423978cdebf6bbe9907da421d366c610340d4009..2c35923939dd5143f3d64426c4a0fa10e105b3e4 100644
--- a/src/qtdesktop/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype ToolBar
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup applicationwindow
\brief ToolBar is for containing ToolButton and related controls.
diff --git a/src/qtdesktop/ToolButton.qml b/src/controls/ToolButton.qml
similarity index 96%
rename from src/qtdesktop/ToolButton.qml
rename to src/controls/ToolButton.qml
index 722e79f85aafca593f418f71752a9058cd11eff6..d3fd441a563fba48aa9d558a53666528b7f2cb34 100644
--- a/src/qtdesktop/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0 as Private
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0 as Private
import "Styles/Settings.js" as Settings
/*!
\qmltype ToolButton
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup applicationwindow
\brief ToolButton provides a button type that is typically used within a ToolBar
diff --git a/src/qtdesktop/qtdesktop.pro b/src/controls/controls.pro
similarity index 90%
rename from src/qtdesktop/qtdesktop.pro
rename to src/controls/controls.pro
index 451068cb1f8a92d8173bd11d131c46fbe7ce6fb0..7af5a965f195d33a6af2ad7565394496935ac78b 100644
--- a/src/qtdesktop/qtdesktop.pro
+++ b/src/controls/controls.pro
@@ -1,10 +1,10 @@
CXX_MODULE = qml
TARGET = plugin
-TARGETPATH = QtDesktop
+TARGETPATH = QtQuick/Controls
QT += qml quick widgets gui-private core-private
-QMAKE_DOCS = $$PWD/doc/qtdesktopcomponents.qdocconf
+QMAKE_DOCS = $$PWD/doc/qtquickcontrols.qdocconf
QML_FILES = \
AbstractCheckable.qml \
diff --git a/src/qtdesktop/doc/images/placeholder.png b/src/controls/doc/images/placeholder.png
similarity index 100%
rename from src/qtdesktop/doc/images/placeholder.png
rename to src/controls/doc/images/placeholder.png
diff --git a/src/qtdesktop/doc/images/tableview.png b/src/controls/doc/images/tableview.png
similarity index 100%
rename from src/qtdesktop/doc/images/tableview.png
rename to src/controls/doc/images/tableview.png
diff --git a/src/qtdesktop/doc/qtdesktopcomponents.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
similarity index 70%
rename from src/qtdesktop/doc/qtdesktopcomponents.qdocconf
rename to src/controls/doc/qtquickcontrols.qdocconf
index a7f775991ac223355f8f18b9068a4a8a253e6f62..3977be504c1bbc8d264c89f55b7d587174790ab7 100644
--- a/src/qtdesktop/doc/qtdesktopcomponents.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -1,8 +1,8 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
# Name of the project.
-project = QtDesktopComponents
-description = Qt Desktop Components Documentation
+project = QtQuickControls
+description = Qt Quick Controls Documentation
depends = qtqml qtquick qtwidgets qtdoc
@@ -59,32 +59,32 @@ imagedirs += images
# Defines the name of the project. You cannot use operators (+, =, -) in
# the name. Properties for this project are set using a qhp.<projectname>.property
# format.
-qhp.projects = qtdesktopcomponents
+qhp.projects = qtquickcontrols
# Sets the name of the output qhp file.
-qhp.qtdesktopcomponents.file = qtdesktopcomponents.qhp
+qhp.qtquickcontrols.file = qtquickcontrols.qhp
# Namespace for the output file. This namespace is used to distinguish between
# different documentation files in Creator/Assistant.
-qhp.qtdesktopcomponents.namespace = qtdesktopcomponents.100
+qhp.qtquickcontrols.namespace = qtquickcontrols.100
# Title for the package, will be the main title for the package in
# Assistant/Creator.
-qhp.qtdesktopcomponents.indexTitle = Qt Desktop Components
+qhp.qtquickcontrols.indexTitle = Qt Quick Controls
# Extra files to add to the output which are not linked to from anywhere
# using a qdoc \l command.
-#qhp.qtdesktopcomponents.extraFiles = style/qtdesktopcomponents.css
+#qhp.qtquickcontrols.extraFiles = style/qtquickcontrols.css
# Only update the name of the project for the next variables.
-qhp.qtdesktopcomponents.virtualFolder = qtdesktopcomponents
-
-qhp.qtdesktopcomponents.subprojects = desktopqmltypes styleqmltypes
-qhp.qtdesktopcomponents.subprojects.desktopqmltypes.title = Desktop QML Types
-qhp.qtdesktopcomponents.subprojects.desktopqmltypes.indexTitle = Qt Desktop QML Types
-qhp.qtdesktopcomponents.subprojects.desktopqmltypes.selectors = class fake:headerfile
-qhp.qtdesktopcomponents.subprojects.desktopqmltypes.sortPages = true
-qhp.qtdesktopcomponents.subprojects.styleqmltypes.title = Desktop Styles QML Types
-qhp.qtdesktopcomponents.subprojects.styleqmltypes.indexTitle = Qt Desktop Styles QML Types
-qhp.qtdesktopcomponents.subprojects.styleqmltypes.selectors = class fake:headerfile
-qhp.qtdesktopcomponents.subprojects.styleqmltypes.sortPages = true
+qhp.qtquickcontrols.virtualFolder = qtquickcontrols
+
+qhp.qtquickcontrols.subprojects = qtquickcontrolsqmltypes styleqmltypes
+qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.title = Qt Quick Controls QML Types
+qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.indexTitle = Qt Quick Controls QML Types
+qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.selectors = class fake:headerfile
+qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.sortPages = true
+qhp.qtquickcontrols.subprojects.styleqmltypes.title = Styles QML Types
+qhp.qtquickcontrols.subprojects.styleqmltypes.indexTitle = Qt Quick Controls Styles QML Types
+qhp.qtquickcontrols.subprojects.styleqmltypes.selectors = class fake:headerfile
+qhp.qtquickcontrols.subprojects.styleqmltypes.sortPages = true
diff --git a/src/qtdesktop/doc/src/applicationwindow.qdoc b/src/controls/doc/src/applicationwindow.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/applicationwindow.qdoc
rename to src/controls/doc/src/applicationwindow.qdoc
diff --git a/src/qtdesktop/doc/src/containers.qdoc b/src/controls/doc/src/containers.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/containers.qdoc
rename to src/controls/doc/src/containers.qdoc
diff --git a/src/qtdesktop/doc/src/controls.qdoc b/src/controls/doc/src/controls.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/controls.qdoc
rename to src/controls/doc/src/controls.qdoc
diff --git a/src/qtdesktop/doc/src/indicators.qdoc b/src/controls/doc/src/indicators.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/indicators.qdoc
rename to src/controls/doc/src/indicators.qdoc
diff --git a/src/qtdesktop/doc/src/menus.qdoc b/src/controls/doc/src/menus.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/menus.qdoc
rename to src/controls/doc/src/menus.qdoc
diff --git a/src/qtdesktop/doc/src/navigation.qdoc b/src/controls/doc/src/navigation.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/navigation.qdoc
rename to src/controls/doc/src/navigation.qdoc
diff --git a/src/qtdesktop/doc/src/qtdesktopcomponents-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc
similarity index 94%
rename from src/qtdesktop/doc/src/qtdesktopcomponents-examples.qdoc
rename to src/controls/doc/src/qtquickcontrols-examples.qdoc
index cfc2ba90b30662d61c38548868c040737f7a6544..04fa1f4ac43954f5455fec962fb754499ef62520 100644
--- a/src/qtdesktop/doc/src/qtdesktopcomponents-examples.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \group qtdesktopcomponents_examples
+ \group qtquickcontrols_examples
\ingroup all-examples
- \title Qt Desktop Components Examples
+ \title Qt Quick Controls Examples
\brief Demonstrates the ... functionality provided by Qt.
*/
diff --git a/src/qtdesktop/doc/src/qtdesktopcomponents-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc
similarity index 82%
rename from src/qtdesktop/doc/src/qtdesktopcomponents-index.qdoc
rename to src/controls/doc/src/qtquickcontrols-index.qdoc
index 0751317d252ec42fe34f1ce41a7080847540f792..1f3ab44e0a13a0e879601182f2d844b5c21f284e 100644
--- a/src/qtdesktop/doc/src/qtdesktopcomponents-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-index.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \page qtdesktopcomponents-index.html
- \title Qt Desktop Components
+ \page qtquickcontrols-index.html
+ \title Qt Quick Controls
- \brief The Qt Desktop Components module is an add-on module of Qt.
+ \brief The Qt Quick Controls module is an add-on module of Qt.
\image placeholder.png
@@ -38,8 +38,8 @@
The QML types can be imported into your applciation using the following import statement in your \c {.qml} file.
\code
- import QtDesktop 1.0
- import QtDesktop.Styles 1.0
+ import QtQuick.Controls 1.0
+ import QtQuick.Controls.Styles 1.0
\endcode
\section1 Components
@@ -63,17 +63,17 @@
\section2 Guides
\list
- \li \l{Qt Desktop Components Overview}
+ \li \l{Qt Quick Controls Overview}
\endlist
\section2 Reference
\list
- \li \l{Qt Desktop QML Types}{Qt Desktop QML Types}
- \li \l{Qt Desktop Styles QML Types}{Qt Desktop Styles QML Types}
+ \li \l{Qt Quick Controls QML Types}{Qt Quick Controls QML Types}
+ \li \l{Qt Quick Controls Styles QML Types}{Qt Quick Controls Styles QML Types}
\endlist
\section2 Examples
\list
- \li \l{Qt Desktop Components Examples}
+ \li \l{Qt Quick Controls Examples}
\endlist
*/
diff --git a/src/qtdesktop/doc/src/qtdesktopcomponents-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc
similarity index 93%
rename from src/qtdesktop/doc/src/qtdesktopcomponents-overview.qdoc
rename to src/controls/doc/src/qtquickcontrols-overview.qdoc
index 9350f675556a75acb71a53bad98e144536e427ed..82da0b2201f2bb362db39619cb5b36945e337728 100644
--- a/src/qtdesktop/doc/src/qtdesktopcomponents-overview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-overview.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \page qtdesktopcomponents-overview.html
- \title Qt Desktop Components Overview
+ \page qtquickcontrols-overview.html
+ \title Qt Quick Controls Overview
\brief A set of APIs for working with ...
*/
diff --git a/src/qtdesktop/doc/src/qtdesktopcomponents.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc
similarity index 87%
rename from src/qtdesktop/doc/src/qtdesktopcomponents.qdoc
rename to src/controls/doc/src/qtquickcontrols.qdoc
index ac8bbc8b07a5fbffbdf96417befefe8b17a0ad22..ddbfc5d62cd730502a6e2ac39d93b20429275f28 100644
--- a/src/qtdesktop/doc/src/qtdesktopcomponents.qdoc
+++ b/src/controls/doc/src/qtquickcontrols.qdoc
@@ -26,16 +26,16 @@
****************************************************************************/
/*!
- \qmlmodule QtDesktop 1
- \title Qt Desktop QML Types
+ \qmlmodule QtQuick.Controls 1
+ \title Qt Quick Controls QML Types
\ingroup qmlmodules
- \brief Provides QML types for qt desktop components support.
+ \brief Provides QML types for qt quick controls support.
This is just a demo page.
\section1 Overview
- The QML types for Qt Desktop Components support the basic use cases such as:
+ The QML types for Qt Quick Controls support the basic use cases such as:
\list
\li sth 1,
\li sth 2,
diff --git a/src/qtdesktop/doc/src/styles.qdoc b/src/controls/doc/src/styles.qdoc
similarity index 85%
rename from src/qtdesktop/doc/src/styles.qdoc
rename to src/controls/doc/src/styles.qdoc
index 4dfed97019e8b8967f8611fb0b3aa9b4452d3243..36dc302f668ec4098e394cf32b272040696bda5e 100644
--- a/src/qtdesktop/doc/src/styles.qdoc
+++ b/src/controls/doc/src/styles.qdoc
@@ -26,16 +26,16 @@
****************************************************************************/
/*!
- \qmlmodule QtDesktop.Styles 1
- \title Qt Desktop Styles QML Types
+ \qmlmodule QtQuick.Controls.Styles 1
+ \title Qt Quick Controls Styles QML Types
\ingroup qmlmodules
- \brief Provides QML types for qt desktop components styles support.
+ \brief Provides QML types for qt quick controls styles support.
This is just a demo page.
\section1 Overview
- The QML types for Qt Desktop Components Styles support the basic use cases such as:
+ The QML types for Qt Quick Controls Styles support the basic use cases such as:
\list
\li sth 1,
\li sth 2,
diff --git a/src/qtdesktop/doc/src/views.qdoc b/src/controls/doc/src/views.qdoc
similarity index 100%
rename from src/qtdesktop/doc/src/views.qdoc
rename to src/controls/doc/src/views.qdoc
diff --git a/src/qtdesktop/plugin.cpp b/src/controls/plugin.cpp
similarity index 100%
rename from src/qtdesktop/plugin.cpp
rename to src/controls/plugin.cpp
diff --git a/src/qtdesktop/plugin.json b/src/controls/plugin.json
similarity index 100%
rename from src/qtdesktop/plugin.json
rename to src/controls/plugin.json
diff --git a/src/qtdesktop/plugin.pri b/src/controls/plugin.pri
similarity index 100%
rename from src/qtdesktop/plugin.pri
rename to src/controls/plugin.pri
diff --git a/src/qtdesktop/plugin_p.h b/src/controls/plugin_p.h
similarity index 95%
rename from src/qtdesktop/plugin_p.h
rename to src/controls/plugin_p.h
index 6d9574c2b30ebba271ba58a86f2b0d39984fa35c..c6c3fee3183bf7d68c1496d42d9ab73562915afc 100644
--- a/src/qtdesktop/plugin_p.h
+++ b/src/controls/plugin_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
class StylePlugin : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtdesktopcomponents.QQmlExtensionInterface" FILE "plugin.json")
+ Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "plugin.json")
public:
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri);
diff --git a/src/qtdesktop/plugins.qmltypes b/src/controls/plugins.qmltypes
similarity index 100%
rename from src/qtdesktop/plugins.qmltypes
rename to src/controls/plugins.qmltypes
diff --git a/src/qtdesktop/qmldir b/src/controls/qmldir
similarity index 97%
rename from src/qtdesktop/qmldir
rename to src/controls/qmldir
index ca2b5600fe79437a46b7c8435bbb8cd66cc60f7b..b3de1110b71dcc24d3d18ca3a27357251b2cdd2d 100644
--- a/src/qtdesktop/qmldir
+++ b/src/controls/qmldir
@@ -1,4 +1,4 @@
-module QtDesktop
+module QtQuick.Controls
plugin plugin
ApplicationWindow 1.0 ApplicationWindow.qml
Button 1.0 Button.qml
diff --git a/src/qtdesktop/qpagestatus.h b/src/controls/qpagestatus.h
similarity index 100%
rename from src/qtdesktop/qpagestatus.h
rename to src/controls/qpagestatus.h
diff --git a/src/qtdesktop/qquicklayout.cpp b/src/controls/qquicklayout.cpp
similarity index 100%
rename from src/qtdesktop/qquicklayout.cpp
rename to src/controls/qquicklayout.cpp
diff --git a/src/qtdesktop/qquicklayout_p.h b/src/controls/qquicklayout_p.h
similarity index 100%
rename from src/qtdesktop/qquicklayout_p.h
rename to src/controls/qquicklayout_p.h
diff --git a/src/qtdesktop/qquicklayoutengine.cpp b/src/controls/qquicklayoutengine.cpp
similarity index 100%
rename from src/qtdesktop/qquicklayoutengine.cpp
rename to src/controls/qquicklayoutengine.cpp
diff --git a/src/qtdesktop/qquicklayoutengine_p.h b/src/controls/qquicklayoutengine_p.h
similarity index 100%
rename from src/qtdesktop/qquicklayoutengine_p.h
rename to src/controls/qquicklayoutengine_p.h
diff --git a/src/qtdesktop/qquicklinearlayout.cpp b/src/controls/qquicklinearlayout.cpp
similarity index 99%
rename from src/qtdesktop/qquicklinearlayout.cpp
rename to src/controls/qquicklinearlayout.cpp
index 29fb026f48f79cac5ebe3a528867cce125f89bc5..015b8cba92918d308c1d04bf5c61e24b5f499d17 100644
--- a/src/qtdesktop/qquicklinearlayout.cpp
+++ b/src/controls/qquicklinearlayout.cpp
@@ -45,14 +45,14 @@
/*!
\qmltype RowLayout
\instantiates QQuickComponentsRowLayout
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief RowLayout is doing bla...bla...
*/
/*!
\qmltype ColumnLayout
\instantiates QQuickComponentsColumnLayout
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief ColumnLayout is doing bla...bla...
*/
diff --git a/src/qtdesktop/qquicklinearlayout_p.h b/src/controls/qquicklinearlayout_p.h
similarity index 100%
rename from src/qtdesktop/qquicklinearlayout_p.h
rename to src/controls/qquicklinearlayout_p.h
diff --git a/src/qtdesktop/qtaction.cpp b/src/controls/qtaction.cpp
similarity index 99%
rename from src/qtdesktop/qtaction.cpp
rename to src/controls/qtaction.cpp
index ba059a05e002f4054d58de4da775323a3bb3e61a..debdd762e202c38464683b851018f40f6a5d8747 100644
--- a/src/qtdesktop/qtaction.cpp
+++ b/src/controls/qtaction.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype Action
\instantiates QtAction
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief Action provides an abstract user interface action that can be bound to items
\sa MenuItem, Menu, ExclusiveGroup
diff --git a/src/qtdesktop/qtaction_p.h b/src/controls/qtaction_p.h
similarity index 100%
rename from src/qtdesktop/qtaction_p.h
rename to src/controls/qtaction_p.h
diff --git a/src/qtdesktop/qtexclusivegroup.cpp b/src/controls/qtexclusivegroup.cpp
similarity index 99%
rename from src/qtdesktop/qtexclusivegroup.cpp
rename to src/controls/qtexclusivegroup.cpp
index 5eccfd0eef6a3dceddfef64c27d2f4c83c6a0470..fde2a9dfbc04b3aa979e51ef1c25a27b8b6e906b 100644
--- a/src/qtdesktop/qtexclusivegroup.cpp
+++ b/src/controls/qtexclusivegroup.cpp
@@ -64,7 +64,7 @@ static bool isChecked(const QObject *o)
/*!
\qmltype ExclusiveGroup
\instantiates QtExclusiveGroup
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\ingroup containers
\brief ExclusiveGroup provides a way to declare several checkable controls as mutually exclusive.
diff --git a/src/qtdesktop/qtexclusivegroup_p.h b/src/controls/qtexclusivegroup_p.h
similarity index 100%
rename from src/qtdesktop/qtexclusivegroup_p.h
rename to src/controls/qtexclusivegroup_p.h
diff --git a/src/qtdesktop/qtmenu.cpp b/src/controls/qtmenu.cpp
similarity index 99%
rename from src/qtdesktop/qtmenu.cpp
rename to src/controls/qtmenu.cpp
index 144f60a64222431652c45741832b8dd45b4d3af6..bd7af0c2d2a09d8efac1001ae79a1e024dcd7928 100644
--- a/src/qtdesktop/qtmenu.cpp
+++ b/src/controls/qtmenu.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
\qmltype MenuPrivate
\instantiates QtMenu
\internal
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
*/
/*!
diff --git a/src/qtdesktop/qtmenu_p.h b/src/controls/qtmenu_p.h
similarity index 100%
rename from src/qtdesktop/qtmenu_p.h
rename to src/controls/qtmenu_p.h
diff --git a/src/qtdesktop/qtmenubar.cpp b/src/controls/qtmenubar.cpp
similarity index 99%
rename from src/qtdesktop/qtmenubar.cpp
rename to src/controls/qtmenubar.cpp
index 06d7dbbe2817d71a4816580d3ce065a4f92e8d26..ff4a2031e161ee2b626594cfc17162c8d6bd2c93 100644
--- a/src/qtdesktop/qtmenubar.cpp
+++ b/src/controls/qtmenubar.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
\qmltype MenuBarPrivate
\instantiates QtMenuBar
\internal
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
*/
QtMenuBar::QtMenuBar(QQuickItem *parent)
: QQuickItem(parent)
diff --git a/src/qtdesktop/qtmenubar_p.h b/src/controls/qtmenubar_p.h
similarity index 100%
rename from src/qtdesktop/qtmenubar_p.h
rename to src/controls/qtmenubar_p.h
diff --git a/src/qtdesktop/qtmenuitem.cpp b/src/controls/qtmenuitem.cpp
similarity index 99%
rename from src/qtdesktop/qtmenuitem.cpp
rename to src/controls/qtmenuitem.cpp
index d7a4538f104f437618802030288e6c7b22766911..6da06c4e24be5e9bc8f87f889adedb2707097961 100644
--- a/src/qtdesktop/qtmenuitem.cpp
+++ b/src/controls/qtmenuitem.cpp
@@ -82,7 +82,7 @@ void QtMenuBase::setVisualItem(QQuickItem *item)
/*!
\qmltype MenuSeparator
\instantiates QtMenuSeparator
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\inherits Item
\ingroup menus
\brief MenuSeparator provides a separator for your items inside a menu.
@@ -102,7 +102,7 @@ QtMenuSeparator::QtMenuSeparator(QObject *parent)
\qmltype MenuItem
\instantiates QtMenuItem
\ingroup menus
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief MenuItem provides an item to add in a menu or a menu bar.
\code
diff --git a/src/qtdesktop/qtmenuitem_p.h b/src/controls/qtmenuitem_p.h
similarity index 100%
rename from src/qtdesktop/qtmenuitem_p.h
rename to src/controls/qtmenuitem_p.h
diff --git a/src/qtdesktop/qtmenupopupwindow.cpp b/src/controls/qtmenupopupwindow.cpp
similarity index 100%
rename from src/qtdesktop/qtmenupopupwindow.cpp
rename to src/controls/qtmenupopupwindow.cpp
diff --git a/src/qtdesktop/qtmenupopupwindow_p.h b/src/controls/qtmenupopupwindow_p.h
similarity index 100%
rename from src/qtdesktop/qtmenupopupwindow_p.h
rename to src/controls/qtmenupopupwindow_p.h
diff --git a/src/experimental/Dial.qml b/src/experimental/Dial.qml
index 95e32f0528782c5f444c8f5dad51dee728481cca..960c1070387cb1e3bb9632220bcf60c7f178619d 100644
--- a/src/experimental/Dial.qml
+++ b/src/experimental/Dial.qml
@@ -39,11 +39,11 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype Dial
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief Dial provides a dial control.
*/
diff --git a/src/experimental/Dialog.qml b/src/experimental/Dialog.qml
index abbda95e7e88a5e05a788e29f4334ce866910f06..05abb85261d9780590686cac5c6cc61e863a9f6c 100644
--- a/src/experimental/Dialog.qml
+++ b/src/experimental/Dialog.qml
@@ -40,11 +40,11 @@
import QtQuick 2.0
import QtQuick.Window 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype Dialog
- \inqmlmodule QtDesktop 1.0
+ \inqmlmodule QtQuick.Controls 1.0
\brief Dialog is doing bla...bla...
*/
diff --git a/src/experimental/experimental.pro b/src/experimental/experimental.pro
index 32fdaa264548aa6134d46f244e754bbb4c98bf8d..b0a916583bf699a496550edbbd6f3132f36a2896 100644
--- a/src/experimental/experimental.pro
+++ b/src/experimental/experimental.pro
@@ -1,4 +1,4 @@
-TARGETPATH = QtDesktop/Experimental
+TARGETPATH = QtQuick/Controls/Experimental
QML_FILES = \
Dial.qml \
diff --git a/src/experimental/qmldir b/src/experimental/qmldir
index 556b578053cf559a9e4eab85ec09ecf0462d3f3c..c9d4cc31550f3c8ab2c5351a92e7b1a597ed018e 100644
--- a/src/experimental/qmldir
+++ b/src/experimental/qmldir
@@ -1,3 +1,3 @@
-module QtDesktop.Experimental
+module QtQuick.Controls.Experimental
Dial 1.0 Dial.qml
Dialog 1.0 Dialog.qml
diff --git a/src/private/BasicButton.qml b/src/private/BasicButton.qml
index db2229c35018ec9f0e431f499905a8df326d72ec..0f3774ff47c2cf4acdd284b60b5dff6c8ad23459 100644
--- a/src/private/BasicButton.qml
+++ b/src/private/BasicButton.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Private 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls.Private 1.0
+import QtQuick.Controls.Styles 1.0
/*!
\qmltype BasicButton
\internal
\qmlabstract
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
Control {
diff --git a/src/private/ButtonBehavior.qml b/src/private/ButtonBehavior.qml
index f49d4e02d72c39afba346c0d289a960b123135e9..78d947ad247a1c078b863296fad1332ec9925cf6 100644
--- a/src/private/ButtonBehavior.qml
+++ b/src/private/ButtonBehavior.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ButtonBehavior
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
MouseArea {
id: behavior
diff --git a/src/private/Control.qml b/src/private/Control.qml
index 4c0dad6e9efbf36af880e208c256ccb62bfda9d7..c26c4ab822dd64049d5fa7289b7a04dfd774005b 100644
--- a/src/private/Control.qml
+++ b/src/private/Control.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls.Styles 1.0
/*!
\qmltype Control
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
FocusScope {
id: root
diff --git a/src/private/FocusFrame.qml b/src/private/FocusFrame.qml
index 5ce0d5f00ee47634d0830e71c99ebd799d8936b4..963938f497de7706d218fc6f2265bf0f692b09b2 100644
--- a/src/private/FocusFrame.qml
+++ b/src/private/FocusFrame.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype FocusFrame
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
StyleItem {
z: 2
diff --git a/src/private/ModalPopupBehavior.qml b/src/private/ModalPopupBehavior.qml
index 7ccae208b542f5c2e55986d4eb9be0a234ff0a85..cb4d35d4d0cd35a49b9e066451d1c6aeb36271af 100644
--- a/src/private/ModalPopupBehavior.qml
+++ b/src/private/ModalPopupBehavior.qml
@@ -46,7 +46,7 @@ import QtQuick 2.0
/*!
\qmltype ModalPopupBehavior
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
Item {
id: popupBehavior
diff --git a/src/private/PageSlideTransition.qml b/src/private/PageSlideTransition.qml
index 029403fb9b926d93f9e978b22212a106c341a019..1f55f513a7389b50ac8bb893d8ba992303ecc839 100644
--- a/src/private/PageSlideTransition.qml
+++ b/src/private/PageSlideTransition.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype PageSlideTransition
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
PageTransition {
id: root
diff --git a/src/private/ScrollAreaHelper.qml b/src/private/ScrollAreaHelper.qml
index 2b409aba1e0e4cd8dc1af47f29b55f954426d7b9..fc687f74cbd0e6173e500bae3a775dfb021eb7b4 100644
--- a/src/private/ScrollAreaHelper.qml
+++ b/src/private/ScrollAreaHelper.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype ScrollAreaHeader
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
Item {
id: wheelarea
diff --git a/src/private/ScrollBar.qml b/src/private/ScrollBar.qml
index 9d48a6022f47ba4b989acf5dfd174bad3cc8f92e..5ce4d0e25329a793d0a94ddac779c946ec783528 100644
--- a/src/private/ScrollBar.qml
+++ b/src/private/ScrollBar.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
import "../Styles/Settings.js" as Settings
/*!
\qmltype ScrollBar
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
Item {
id: scrollbar
diff --git a/src/private/TabBar.qml b/src/private/TabBar.qml
index 8be53f7a121b6c54d2e03d59ae92f2806b54adac..af66fde9e22e81fc27e9c38396d175ec3f0ba7ea 100644
--- a/src/private/TabBar.qml
+++ b/src/private/TabBar.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype TabBar
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
Item {
id: tabbar
diff --git a/src/private/private.pro b/src/private/private.pro
index 8434f911deb1cb161765d64207d1c7943123bf40..072241317e3ae334370b400188b4e02735940d3f 100644
--- a/src/private/private.pro
+++ b/src/private/private.pro
@@ -1,6 +1,6 @@
CXX_MODULE = qml
TARGET = privateplugin
-TARGETPATH = QtDesktop/Private
+TARGETPATH = QtQuick/Controls/Private
QT += qml quick widgets gui-private core-private
diff --git a/src/private/qmldir b/src/private/qmldir
index 0ed608c789664089f079157bd7d1c61a793722cd..6a5abc9b0392dde1a513cd216c0dca9e6af75fb2 100644
--- a/src/private/qmldir
+++ b/src/private/qmldir
@@ -1,4 +1,4 @@
-module QtDesktop.Private
+module QtQuick.Controls.Private
plugin privateplugin
ButtonBehavior 1.0 ButtonBehavior.qml
Control 1.0 Control.qml
diff --git a/src/private/qprivateplugin_p.h b/src/private/qprivateplugin_p.h
index 7d7425089a154a572546977dfd200c610d45254e..46d504b6f5503b505fa0b8306c38baf2a6302860 100644
--- a/src/private/qprivateplugin_p.h
+++ b/src/private/qprivateplugin_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
class StylePlugin : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtdesktopcomponents.QQmlExtensionInterface" FILE "privateplugin.json")
+ Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "privateplugin.json")
public:
void registerTypes(const char *uri);
};
diff --git a/src/private/qstyleitem.cpp b/src/private/qstyleitem.cpp
index ab42c27212c710e9a337f42dcd2a017f80e528d4..c5729f963f410a020a3f9750927d01bb298d5334 100644
--- a/src/private/qstyleitem.cpp
+++ b/src/private/qstyleitem.cpp
@@ -138,7 +138,7 @@ QStyleItem::QStyleItem(QQuickItem *parent)
{
if (!qApp->style()) {
- qWarning("\nError: No widget style available. \n\nQt Desktop Components "
+ qWarning("\nError: No widget style available. \n\nQt Quick Controls"
"currently depend on the widget module to function. \n"
"Use QApplication when creating standalone executables.\n\n");
exit(-1);
@@ -180,7 +180,7 @@ QStyleItem::QStyleItem(QQuickItem *parent)
\qmltype StyleItem
\instantiates QStyleItem
\internal
- \inqmlmodule QtDesktop.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private 1.0
*/
QStyleItem::~QStyleItem()
diff --git a/src/src.pro b/src/src.pro
index 224acacf25f3dd0aacd1f133174d17ccff0f99bb..77753b0a696dce2702cd8da21b59d02641612fdf 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS += qtdesktop styles experimental private
+SUBDIRS += controls styles experimental private
diff --git a/src/styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml
index a94ef7506323df60cf2f9674312546a1730d7e5b..10c6ebf67bd0c83d99dd6fcbc09181af264e5783 100644
--- a/src/styles/ButtonStyle.qml
+++ b/src/styles/ButtonStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ButtonStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for Button
*/
diff --git a/src/styles/CheckBoxStyle.qml b/src/styles/CheckBoxStyle.qml
index 68f4c422a63ca85c0aa9850463f19104fd5c5df7..a4885d11a62eb015dbdcafdac5fbe2e75f0a5dcd 100644
--- a/src/styles/CheckBoxStyle.qml
+++ b/src/styles/CheckBoxStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype CheckBoxStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for CheckBox
*/
Style {
diff --git a/src/styles/ComboBoxStyle.qml b/src/styles/ComboBoxStyle.qml
index b79b6ec575699d8330dad3296d0a5f34e8233b95..0942b02bebf8edcbccfcb3a571e4772750fc54fa 100644
--- a/src/styles/ComboBoxStyle.qml
+++ b/src/styles/ComboBoxStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls.Styles 1.0
/*!
\qmltype ComboBoxStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Style {
diff --git a/src/styles/Desktop/ButtonStyle.qml b/src/styles/Desktop/ButtonStyle.qml
index 68c37e44b7861c0c21a4f7ce822161160398e4f7..f6e7ee20f0e28ef0df182ef4228cc952a34f8727 100644
--- a/src/styles/Desktop/ButtonStyle.qml
+++ b/src/styles/Desktop/ButtonStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: StyleItem {
diff --git a/src/styles/Desktop/CheckBoxStyle.qml b/src/styles/Desktop/CheckBoxStyle.qml
index 5ebcc06118c1cef1a0e27bdfc2455626caf30438..341ff53e4239732f557bc44427c578266fd0cf10 100644
--- a/src/styles/Desktop/CheckBoxStyle.qml
+++ b/src/styles/Desktop/CheckBoxStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: Item {
diff --git a/src/styles/Desktop/ComboBoxStyle.qml b/src/styles/Desktop/ComboBoxStyle.qml
index 06f1b876662b762beba203bcd8dd70933c4958b3..72d97a6c8f55f5b39f7c2d45676424d30ab9b3f7 100644
--- a/src/styles/Desktop/ComboBoxStyle.qml
+++ b/src/styles/Desktop/ComboBoxStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: Item {
diff --git a/src/styles/Desktop/GroupBoxStyle.qml b/src/styles/Desktop/GroupBoxStyle.qml
index 14bd3909efae022e72eca0344ca325deddf7bdbe..9de3f35978846f1bb9baaafe44979da9e9e92bbc 100644
--- a/src/styles/Desktop/GroupBoxStyle.qml
+++ b/src/styles/Desktop/GroupBoxStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
StyleItem {
id: styleitem
diff --git a/src/styles/Desktop/MenuBarStyle.qml b/src/styles/Desktop/MenuBarStyle.qml
index 34ddad6725e21b1fb4dc468221071ca7b7f08040..1642d2a421aec89c64821039a37c1b5817c97ba8 100644
--- a/src/styles/Desktop/MenuBarStyle.qml
+++ b/src/styles/Desktop/MenuBarStyle.qml
@@ -39,9 +39,9 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/styles/Desktop/MenuStyle.qml b/src/styles/Desktop/MenuStyle.qml
index cca7e63cc565d4744324f05cb66de8977d48ed66..a45fe229102fa6948a335503716e2e4d49723b52 100644
--- a/src/styles/Desktop/MenuStyle.qml
+++ b/src/styles/Desktop/MenuStyle.qml
@@ -39,9 +39,9 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
id: styleRoot
diff --git a/src/styles/Desktop/ProgressBarStyle.qml b/src/styles/Desktop/ProgressBarStyle.qml
index 000858025e5e755b0020c5a451016d7a8b15f09c..886cf61bf51586864143261eccd3648139114bb0 100644
--- a/src/styles/Desktop/ProgressBarStyle.qml
+++ b/src/styles/Desktop/ProgressBarStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: StyleItem {
diff --git a/src/styles/Desktop/RadioButtonStyle.qml b/src/styles/Desktop/RadioButtonStyle.qml
index 2330e9bd39a029ebb5d33eb2d8212dd07765510d..c5fc5a22072942d7f228516f07892221e6b6064f 100644
--- a/src/styles/Desktop/RadioButtonStyle.qml
+++ b/src/styles/Desktop/RadioButtonStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: Item {
diff --git a/src/styles/Desktop/ScrollAreaStyle.qml b/src/styles/Desktop/ScrollAreaStyle.qml
index 0374aa776b2455cf63659053023b3e16205f0420..a9b84fcb7ebcc53752f22030e8978d5cc11dd592 100644
--- a/src/styles/Desktop/ScrollAreaStyle.qml
+++ b/src/styles/Desktop/ScrollAreaStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
StyleItem {
id: styleitem
diff --git a/src/styles/Desktop/ScrollBarStyle.qml b/src/styles/Desktop/ScrollBarStyle.qml
index 0ea61df4f2d83f4da898ed17d2accdfa76943dff..9a22b00e39ce81554dfc8f7da49fe1f830d59fc6 100644
--- a/src/styles/Desktop/ScrollBarStyle.qml
+++ b/src/styles/Desktop/ScrollBarStyle.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
StyleItem {
id: styleitem
diff --git a/src/styles/Desktop/SliderStyle.qml b/src/styles/Desktop/SliderStyle.qml
index cbc22f6eaeead6bf80df45659f941642ab337d5c..a99180db6093d7a466bf0c466090bf3aae2c734d 100644
--- a/src/styles/Desktop/SliderStyle.qml
+++ b/src/styles/Desktop/SliderStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: StyleItem {
diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml
index 149b078cf673d7e82f0423cd3541a38d402269a2..a66ba3c2da089821fb12a111e5e25ade6f3f1a0a 100644
--- a/src/styles/Desktop/SpinBoxStyle.qml
+++ b/src/styles/Desktop/SpinBoxStyle.qml
@@ -38,9 +38,9 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: Item {
diff --git a/src/styles/Desktop/TabFrameStyle.qml b/src/styles/Desktop/TabFrameStyle.qml
index 7c5f7531bfbde2262842b461b83e7bc6ce0d9f54..4a9866660b9b5a2f9ebc7bc7e33003c8aaf554f4 100644
--- a/src/styles/Desktop/TabFrameStyle.qml
+++ b/src/styles/Desktop/TabFrameStyle.qml
@@ -38,9 +38,9 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
+import QtQuick.Controls.Styles 1.0
Style {
id: root
diff --git a/src/styles/Desktop/TextFieldStyle.qml b/src/styles/Desktop/TextFieldStyle.qml
index 529f09bfdc51cfd3ece6afc5c53b3b1386a4f28c..99872bf78cb7f6c8ea007ca298ac08a9734a339c 100644
--- a/src/styles/Desktop/TextFieldStyle.qml
+++ b/src/styles/Desktop/TextFieldStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: StyleItem {
diff --git a/src/styles/Desktop/ToolBarStyle.qml b/src/styles/Desktop/ToolBarStyle.qml
index e5ba99453569afae7c9533d84cfa1fdbb38efe29..d49c1e628c43aa77847531efd97559825b9e5d96 100644
--- a/src/styles/Desktop/ToolBarStyle.qml
+++ b/src/styles/Desktop/ToolBarStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
StyleItem {
id: toolbar
diff --git a/src/styles/Desktop/ToolButtonStyle.qml b/src/styles/Desktop/ToolButtonStyle.qml
index 69099586df28f376c7d7a00d7bee0e52d723c97e..b29a30c39614b30205289f66efae4cc0f49f3815 100644
--- a/src/styles/Desktop/ToolButtonStyle.qml
+++ b/src/styles/Desktop/ToolButtonStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
Style {
property Component panel: StyleItem {
diff --git a/src/styles/GroupBoxStyle.qml b/src/styles/GroupBoxStyle.qml
index a042bfd7bf15dafc3d80a8060436fc76625566a8..61866571f0efa0335c81466af8d45e67c2f3d7bd 100644
--- a/src/styles/GroupBoxStyle.qml
+++ b/src/styles/GroupBoxStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype GroupBoxStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Item {
implicitWidth: Math.max(200, contentWidth + 30)
diff --git a/src/styles/MenuBarStyle.qml b/src/styles/MenuBarStyle.qml
index e4ccadd428119856ecbeaf5a2ac11f6c1f597c1f..b29a22605710a2a555cd3e550ba292ac25de1b97 100644
--- a/src/styles/MenuBarStyle.qml
+++ b/src/styles/MenuBarStyle.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls.Styles 1.0
/*!
\qmltype MenuBarStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Style {
diff --git a/src/styles/MenuStyle.qml b/src/styles/MenuStyle.qml
index 152763944290f004b4cf80607b43f65b9eff9181..633fbba4ed37ea3669c09096140f4c58a5d22f06 100644
--- a/src/styles/MenuStyle.qml
+++ b/src/styles/MenuStyle.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Style {
id: styleRoot
diff --git a/src/styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml
index 7eebf9d809f7fb12d356294c2319a98710e3eba6..157379d55b1d1f49c3071eea1c55b3db9d27433f 100644
--- a/src/styles/ProgressBarStyle.qml
+++ b/src/styles/ProgressBarStyle.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ProgressBarStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for ProgressBar
*/
diff --git a/src/styles/RadioButtonStyle.qml b/src/styles/RadioButtonStyle.qml
index b6b9c38896edc2cf44f8ee27d24f5f1efdce1752..f156598bb06d50a830aad741011fce910cf2d4b5 100644
--- a/src/styles/RadioButtonStyle.qml
+++ b/src/styles/RadioButtonStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype RadioButtonStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for RadioButton
*/
Style {
diff --git a/src/styles/ScrollAreaStyle.qml b/src/styles/ScrollAreaStyle.qml
index 59a3700cd3cfc65c3f274cf2a89613683c501361..06e54f403e247263fb027d3d99b8ca226b434f61 100644
--- a/src/styles/ScrollAreaStyle.qml
+++ b/src/styles/ScrollAreaStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ScrollAreaStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Rectangle {
height:20
diff --git a/src/styles/ScrollBarStyle.qml b/src/styles/ScrollBarStyle.qml
index d5477ff705ba66c6c2a79e6e22e242e56a5cee28..d2c94fc6516ec34743d7d3a0bdd690f2ac977e07 100644
--- a/src/styles/ScrollBarStyle.qml
+++ b/src/styles/ScrollBarStyle.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ScrollBarStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Rectangle {
id: styleitem
diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml
index e376fce4d741f0fbcc32d9200ebab99856653be3..d3bb26c11a9360e8426062226b1e63bd0dc72e08 100644
--- a/src/styles/SliderStyle.qml
+++ b/src/styles/SliderStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Private 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Private 1.0
/*!
\qmltype SliderStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Style {
id: styleitem
diff --git a/src/styles/SpinBoxStyle.qml b/src/styles/SpinBoxStyle.qml
index 1e138598232e7460891b218c6140e4f96cebe613..f2d4fd3f33fb799a808867c0a0b5119554b25a4c 100644
--- a/src/styles/SpinBoxStyle.qml
+++ b/src/styles/SpinBoxStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype SpinBoxStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for SpinBox
*/
diff --git a/src/styles/Style.qml b/src/styles/Style.qml
index c9db6cc66de24b73844a8345addb82d7d56dafea..55fef86050028de3d34715313ff017b87ffba47d 100644
--- a/src/styles/Style.qml
+++ b/src/styles/Style.qml
@@ -43,7 +43,7 @@ import QtQuick 2.0
/*!
\qmltype Style
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
QtObject { }
diff --git a/src/styles/TabFrameStyle.qml b/src/styles/TabFrameStyle.qml
index 4d156d6186d473613fa70d42307ea74045f19a16..0d545e6222b8c71baf0474bb2fd9cec09214d63a 100644
--- a/src/styles/TabFrameStyle.qml
+++ b/src/styles/TabFrameStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls.Styles 1.0
/*!
\qmltype TabFrameStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for TabFrame
*/
diff --git a/src/styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml
index 30a224672e61e3483bccb89e42b2adc2721abe72..1093e460918dcc070e8965ddcb93660a717f7ae7 100644
--- a/src/styles/TextFieldStyle.qml
+++ b/src/styles/TextFieldStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype TextFieldStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
\brief provides custom styling for TextField.
*/
diff --git a/src/styles/ToolBarStyle.qml b/src/styles/ToolBarStyle.qml
index 2ac0dae282a8120b197000b1c532763f8fccc7db..874c18f2def8eb177f9c44f4c058ce87c7863816 100644
--- a/src/styles/ToolBarStyle.qml
+++ b/src/styles/ToolBarStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ToolBarStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Item {
diff --git a/src/styles/ToolButtonStyle.qml b/src/styles/ToolButtonStyle.qml
index fca522e0ad1784c065e0531cb36928f6b98acd45..2d94749a3c58aa8aef8148040a6a15535310f086 100644
--- a/src/styles/ToolButtonStyle.qml
+++ b/src/styles/ToolButtonStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
/*!
\qmltype ToolButtonStyle
\internal
- \inqmlmodule QtDesktop.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles 1.0
*/
Rectangle {
id: styleitem
diff --git a/src/styles/qmldir b/src/styles/qmldir
index c645ca53482d1cf5a0e89688a0fed81478b8367d..223c2178b8b171029156e8ffc9c526231e58daa5 100644
--- a/src/styles/qmldir
+++ b/src/styles/qmldir
@@ -1,4 +1,4 @@
-module QtDesktop.Styles
+module QtQuick.Controls.Styles
ButtonStyle 1.0 ButtonStyle.qml
CheckBoxStyle 1.0 CheckBoxStyle.qml
ComboBoxStyle 1.0 ComboBoxStyle.qml
diff --git a/src/styles/styles.pro b/src/styles/styles.pro
index 7e2ff0c15a35f2a1f8c9320af6d4f85d1b958efc..a7a7279383ed9c9deb1e0a06eab2e1e48ef15bfe 100644
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -1,4 +1,4 @@
-TARGETPATH = QtDesktop/Styles
+TARGETPATH = QtQuick/Controls/Styles
QML_FILES = \
ButtonStyle.qml \
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7f65bddf0c62b7b4a565191ba94b83b4dcad4d01..5c3f8d59242cac4b8e3a23ee71745e7d5b3be9a2 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
similarity index 94%
rename from tests/auto/qtdesktop/qtdesktop.pro
rename to tests/auto/controls/controls.pro
index 45a1606cd1ada2d56b942742c71bd17a8d14fdb4..20ee603a6d80af79921f36a9f76cef295bfe9f24 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
similarity index 98%
rename from tests/auto/qtdesktop/data/rangemodel/rangemodel.qml
rename to tests/auto/controls/data/rangemodel/rangemodel.qml
index ce0a4c1519f0ca956185b0b6343f44c8d708a446..661e167225ec16b24c6d8149e2e6ac5b131489c4 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
similarity index 99%
rename from tests/auto/qtdesktop/data/shortcut/shortcuts.qml
rename to tests/auto/controls/data/shortcut/shortcuts.qml
index 3da19494269d3e98b8419b25513644ca04f9665a..e550aece9efca10987feb039b2724527b88725c7 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
similarity index 97%
rename from tests/auto/qtdesktop/data/tableview/table1_qobjectmodel.qml
rename to tests/auto/controls/data/tableview/table1_qobjectmodel.qml
index 692e8bc50c6ebc42cf465721e18a7462f517af52..b1dd83d39a76d47635d3513b7c12c8ef8f41b926 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
similarity index 97%
rename from tests/auto/qtdesktop/data/tableview/table2_qabstractitemmodel.qml
rename to tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml
index c67c7fac03916c3a35510623c857f367ac94f54c..4487f6c1f42a8afa33e522bb23ad33bf1f014aa0 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
similarity index 97%
rename from tests/auto/qtdesktop/data/tableview/table3_qobjectlist.qml
rename to tests/auto/controls/data/tableview/table3_qobjectlist.qml
index f008a72e78382d977b410ef8769d2b1e7046f682..8cb13cccfbb5f13e1daa44b6e547f33dac0a4786 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
similarity index 97%
rename from tests/auto/qtdesktop/data/tableview/table4_qstringlist.qml
rename to tests/auto/controls/data/tableview/table4_qstringlist.qml
index 2f847cf5cbb2b6a6c40ce0392818e86cf8972348..6501dec5c75db8d769647fd56c650c999dd72788 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tableview/table5_listmodel.qml
rename to tests/auto/controls/data/tableview/table5_listmodel.qml
index 0b44b918a53857107fda2ea15a2f79dbf3812cbe..05d948bc34acf569b0c56708e89fa7ff509626bf 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tableview/table6_countmodel.qml
rename to tests/auto/controls/data/tableview/table6_countmodel.qml
index e07235506293871ad2d18e0ad740a19155c7e58a..d5599b4433a0213a08c393b8899cb0f8e4611b41 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tableview/table7_arraymodel.qml
rename to tests/auto/controls/data/tableview/table7_arraymodel.qml
index 53c2a068d6ce5bf2504c9140e33bd39d6d8f9abd..700f3635562c14d3cadb2cb493ae6286c1a8c679 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tableview/table8_itemmodel.qml
rename to tests/auto/controls/data/tableview/table8_itemmodel.qml
index 621cd59779254999ee4d913a1b23c195221c4af4..774bb40836238eefa94e3e7963f4c398307f26f8 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
similarity index 87%
rename from tests/auto/qtdesktop/data/tst_applicationwindow.qml
rename to tests/auto/controls/data/tst_applicationwindow.qml
index 2366bf485478d896c52097f32106697cbebca29d..d1ec6582e8bc0a6b5c823799e4609ca3b797308f 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
similarity index 87%
rename from tests/auto/qtdesktop/data/tst_button.qml
rename to tests/auto/controls/data/tst_button.qml
index e971c5cc0752558a4c340fea220753b4fd25a754..757bc64b9a9c05d5d026210ec05421f73938f142 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tst_checkbox.qml
rename to tests/auto/controls/data/tst_checkbox.qml
index 8b4abedee9882f33e1f03a203bfd009fe391a16f..449439ef567de9dc88963bc45b0e77ccb0411983 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
similarity index 93%
rename from tests/auto/qtdesktop/data/tst_combobox.qml
rename to tests/auto/controls/data/tst_combobox.qml
index aaf9e558fd34c9a7b4bad9704528c0d5de18d98a..08a8c48864b12049292be23f3f2b46312334c56d 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_label.qml
rename to tests/auto/controls/data/tst_label.qml
index 205c327debbf605aa9071fe541f4b94c11c4dca6..1a83a4a5cb67c81f067432928c76f183cb630a7d 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
similarity index 99%
rename from tests/auto/qtdesktop/data/tst_menu.qml
rename to tests/auto/controls/data/tst_menu.qml
index d7f948a7b6a795fa5d6d5fd5734b9af4a454a859..6dadfb083ad6d1f84d2ca67a9c10a43e72180e5b 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_menubar.qml
rename to tests/auto/controls/data/tst_menubar.qml
index b66845addc528dc1b00be9460ce5523188fe8982..f6c04bd48cd659695da2ef1a44b0da02800153a6 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_page.qml
rename to tests/auto/controls/data/tst_page.qml
index 365aa5af621690ebaeac204653f4e0b3b42f1fe4..0e5ce78e840e1c8cb2fdbc5c66470becf4a74278 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
similarity index 99%
rename from tests/auto/qtdesktop/data/tst_pagestack.qml
rename to tests/auto/controls/data/tst_pagestack.qml
index 4f6826d73b69e0617c9d6b800f0a7664d10cf86a..14068c72a319c1d989a13b9b654e2aa313d45c6f 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
similarity index 87%
rename from tests/auto/qtdesktop/data/tst_progressbar.qml
rename to tests/auto/controls/data/tst_progressbar.qml
index bf9056e89fb755e67b748a619ae34de65f2e5613..56b2ad0e9641f752ebcb14d131ac0ade5185f24b 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
similarity index 97%
rename from tests/auto/qtdesktop/data/tst_radiobutton.qml
rename to tests/auto/controls/data/tst_radiobutton.qml
index ba4445db2cb41190f60947ed090e711d5538f66f..1ad1b03217086edb34e010117b62cf263567b1ee 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
similarity index 100%
rename from tests/auto/qtdesktop/data/tst_rangemodel.qml
rename to 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
similarity index 99%
rename from tests/auto/qtdesktop/data/tst_scrollarea.qml
rename to tests/auto/controls/data/tst_scrollarea.qml
index 3e2a70f05e028c4a5d5654f8f87b0e2200758b96..a2c1ed1f7c226fc3f6a06ae219b58a5f2c2a7398 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tst_shortcuts.qml
rename to tests/auto/controls/data/tst_shortcuts.qml
index 8266d511bfb571174a565b9b975e2f871795313d..344fc327a3b13dc51325214bbd61d9846fa0e67d 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
similarity index 92%
rename from tests/auto/qtdesktop/data/tst_slider.qml
rename to tests/auto/controls/data/tst_slider.qml
index 41c2d7618f1bfddcd2578a099eec5c201e3b6003..70dc3d92af82fce883e4a5234edf667443d2f278 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
similarity index 88%
rename from tests/auto/qtdesktop/data/tst_spinbox.qml
rename to tests/auto/controls/data/tst_spinbox.qml
index 9f002c11fbcd0a6a2340effa9941cfced8ea7839..fe482308a5e3303967e3dd894901aa678aa7eb0d 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
similarity index 98%
rename from tests/auto/qtdesktop/data/tst_splitter.qml
rename to tests/auto/controls/data/tst_splitter.qml
index cb34cacb19ef6f2c3592efccfd523cbc133899ff..a4a50f504af19db668f21d54d442831a95bd0610 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_statusbar.qml
rename to tests/auto/controls/data/tst_statusbar.qml
index 942ae6c6ac5c0275747681e714a180012f34d4e7..4eb9bd827d87ece01bc0bd2c17c3ff9ffc5c49f9 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_tab.qml
rename to tests/auto/controls/data/tst_tab.qml
index 648aa9d5b00418f084aa94669204e37c0882ae82..c20b2ea2b83f35869ddffa058c7f482c0ab9356a 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
similarity index 92%
rename from tests/auto/qtdesktop/data/tst_tabframe.qml
rename to tests/auto/controls/data/tst_tabframe.qml
index 4d21c14861f2826fab6b707a1088d71f30ce2276..4c6d7992dd05f40e03a1557510a88c304f7b0a16 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
similarity index 99%
rename from tests/auto/qtdesktop/data/tst_tableview.qml
rename to tests/auto/controls/data/tst_tableview.qml
index 4d051ad48375b1a4ad5ca68398c4337c5c92eff2..bf7c9bb40c61e9471e070708131f6fa744d34bc2 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_tableviewcolumn.qml
rename to tests/auto/controls/data/tst_tableviewcolumn.qml
index 6de32ef15f2231ec9154edd14c82fd858bedf1fe..a7a75759e23f91b5b8ea264aac8ccbde2c2e3510 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_textarea.qml
rename to tests/auto/controls/data/tst_textarea.qml
index d266a4039e23264382f09b89e40d8d0159594178..105f19c70db6770a69d7ebe1c7948215db46d5d4 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
similarity index 80%
rename from tests/auto/qtdesktop/data/tst_textfield.qml
rename to tests/auto/controls/data/tst_textfield.qml
index 69cd503c53d6cb0dc24ce1a9c80fb66234bed1b9..1f051e74bd3a85da591b905a52cf594809f1a2cd 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_toolbar.qml
rename to tests/auto/controls/data/tst_toolbar.qml
index 534fb5c7b098cfe82522f8102d24bcf9a7f0c4bd..9c125604a4f82b7158630ecf0c3c94c084479c85 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
similarity index 95%
rename from tests/auto/qtdesktop/data/tst_toolbutton.qml
rename to tests/auto/controls/data/tst_toolbutton.qml
index 9708ce8b5042018573df72cbcb4897dc86e78adc..61c3d308b9896f6ee826b97fef53f53c105f2ffa 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
similarity index 95%
rename from tests/auto/qtdesktop/tst_qtdesktop.cpp
rename to tests/auto/controls/tst_controls.cpp
index a1c9da35949c3a8a4b27c382b198e7b4f8cfad0d..e63c01b0a2ba75472c60d84b2f8af1ba8856e66d 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 8b6dadac23735696a38416563fc126c13ac905be..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..10c6cbab8cfb1c5fc0129fb308d2d8751e3d7419
--- /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 ee0d58ac93e9982b0bbd0145652f23175caeb333..cc3d854b6a2fc1cc4f1e3ed29bf5ebd609c3d627 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 b0df3acd0285875aaddb5302d9cd831c9ad74ec0..12fb19fd647d8924adb33076d14caa990f2d5b6a 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
diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml
index a40effadb63ab09caf0fe8c7531af0e7d19636b8..1c14f76df5a47930a6560371221d128bd94c3383 100644
--- a/tests/manual/ContextMenu.qml
+++ b/tests/manual/ContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Rectangle {
diff --git a/tests/manual/Dialog.qml b/tests/manual/Dialog.qml
index 18942b5a54b85feffe9c467e79dd1cb10c70857f..e184aff8554740bd5464dcfb41fab6fabf2e6cf2 100644
--- a/tests/manual/Dialog.qml
+++ b/tests/manual/Dialog.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/manual/Layout.qml b/tests/manual/Layout.qml
index 590008e673cf5001567fdf31ce3df76fb131bdee..167d0357ab7906225d1e9c91df17e8ef519c275f 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Item {
width: 600
diff --git a/tests/manual/PageStack.qml b/tests/manual/PageStack.qml
index 9857a66d60272635d2d89477efef6e69c83e2a40..b0a94eb0b557fc2f78d6ee7fc746f58fd9615e2a 100644
--- a/tests/manual/PageStack.qml
+++ b/tests/manual/PageStack.qml
@@ -40,7 +40,7 @@
import QtQuick 2.0
import QtQuick.Window 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Window {
width: 480
diff --git a/tests/manual/SplitterGallery.qml b/tests/manual/SplitterGallery.qml
index 8472ca044bd07942a7f795ca2188504b0d79c947..0f93e31d8627ea74f1daf5002b7dd3d610ff8a74 100644
--- a/tests/manual/SplitterGallery.qml
+++ b/tests/manual/SplitterGallery.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Rectangle {
width: 800
diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml
index 4ddd15ae0db34fa2cd463f5bb246d6e4b3217bb7..085757c121c20450134c989f40b2391eb415d955 100644
--- a/tests/manual/WindowContextMenu.qml
+++ b/tests/manual/WindowContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
import QtQuick.Window 2.0
Window {
diff --git a/tests/manual/keynavigation.qml b/tests/manual/keynavigation.qml
index e1efb566095109c4ca30619bff3ae07ccc0f448b..e01701c4a0306aa5b966fd03afc1ac9c4277231c 100644
--- a/tests/manual/keynavigation.qml
+++ b/tests/manual/keynavigation.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.1
+import QtQuick.Controls 0.1
ApplicationWindow {
width: 400
diff --git a/tests/manual/scrollbars.qml b/tests/manual/scrollbars.qml
index c23ea96c9bb5552a3cca24d28e93816b3e9001b7..67a535508e1a416718d8c7e8c7a55153899f5d59 100644
--- a/tests/manual/scrollbars.qml
+++ b/tests/manual/scrollbars.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
ApplicationWindow {
title: "Component Gallery"
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index 4f6bcdf8e899a3a425d220b3f0985a891edde548..e121739452229ce2287ad41781ab12ab6f00b44f 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
ApplicationWindow {
width: 400
diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml
index 5d9290e9d833c9800e9e9c53380883b86796892b..8e46dfbc459a065fca0bf91ffa43da5b84829b95 100644
--- a/tests/manual/stretching.qml
+++ b/tests/manual/stretching.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Rectangle {
width: 600
diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml
index 81b4d47469709d1985ac579788e5ec335b959608..4184702b57e0dc55a57078d982f03b30e86c786e 100644
--- a/tests/manual/stretchingcustom.qml
+++ b/tests/manual/stretchingcustom.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
-import QtDesktop.Styles 1.0
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
Rectangle {
width: 600
diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml
index abdedc817633147e6773a38490dd509968553480..69cf2e3ebcdc789fd71200c38492454c0039ce85 100644
--- a/tests/manual/tableviewmodels/qml/main.qml
+++ b/tests/manual/tableviewmodels/qml/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Rectangle {
width: 360
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index 985e0dadc4faf76c94d03057fb80380c681d4072..ef80f0d715bcb4f2efc33b88729acfa3bd33d71c 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
Item {
property Component button: Button { text: "Push me"}
diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml
index 61ebc2019a99607462b32636bc58f2decbe9b9c1..dbd6b4e83bc474c5d689859e9d6ed48752c02c81 100644
--- a/tests/manual/testbench/content/PropertyLayouts.qml
+++ b/tests/manual/testbench/content/PropertyLayouts.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
QtObject {
property Component boolLayout: CheckBox {
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index 3f3f9a9aa5fc5b454d48120b0da131269597d925..c6b1cdf08e20bb4fa931eec735fef281a481d56b 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 1.0
+import QtQuick.Controls 1.0
import "content"
ApplicationWindow {
@@ -195,7 +195,7 @@ ApplicationWindow {
case "HorizontalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft});
enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight});
@@ -204,7 +204,7 @@ ApplicationWindow {
case "VerticalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop});
enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom});
@@ -213,7 +213,7 @@ ApplicationWindow {
case "InputMethodHints":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone});
enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText});
@@ -236,7 +236,7 @@ ApplicationWindow {
case "Orientation":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal});
enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical});
@@ -244,7 +244,7 @@ ApplicationWindow {
case "EchoMode":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal});
enumModelData.append({ text: "TextInput.Password", value: TextInput.Password});
@@ -256,7 +256,7 @@ ApplicationWindow {
case "TextColor":
isColor = true
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Amber", value: "#FF7E00"});
enumModelData.append({ text: "Azure", value: "#007FFF"});
diff --git a/tests/shared/qtdc_quicktest.h b/tests/shared/qt_quick_controls_quicktest.h
similarity index 88%
rename from tests/shared/qtdc_quicktest.h
rename to tests/shared/qt_quick_controls_quicktest.h
index a53654f0322f6b98522affec8645566083a10344..9164de1fe69fa0c6da878b96710cb5c43e709261 100644
--- a/tests/shared/qtdc_quicktest.h
+++ b/tests/shared/qt_quick_controls_quicktest.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QTDC_QUICKTEST_H
-#define QTDC_QUICKTEST_H
+#ifndef QT_QUICK_CONTROLS_QUICKTEST_H
+#define QT_QUICK_CONTROLS_QUICKTEST_H
#include <QtQuickTest/quicktestglobal.h>
#include <QtWidgets/QApplication>
@@ -48,18 +48,18 @@
QT_BEGIN_NAMESPACE
#ifdef QUICK_TEST_SOURCE_DIR
-#define QTDC_QUICK_TEST_MAIN_VAR QUICK_TEST_SOURCE_DIR
+#define QT_QUICK_CONTROLS_TEST_MAIN_VAR QUICK_TEST_SOURCE_DIR
#else
-#define QTDC_QUICK_TEST_MAIN_VAR 0
+#define QT_QUICK_CONTROLS_TEST_MAIN_VAR 0
#endif
-#define QTDC_QUICK_TEST_MAIN(name) \
+#define QT_QUICK_CONTROLS_TEST_MAIN(name) \
int main(int argc, char **argv) \
{ \
QApplication* app = 0; \
if (!QCoreApplication::instance()) \
app = new QApplication(argc, argv); \
- int i = quick_test_main(argc, argv, #name, QTDC_QUICK_TEST_MAIN_VAR); \
+ int i = quick_test_main(argc, argv, #name, QT_QUICK_CONTROLS_TEST_MAIN_VAR); \
delete app; \
return i; \
}