From 6ea1b2b1f26d266b88b091ddece0cdaad5d3accc Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Wed, 20 Feb 2013 17:38:44 +0100
Subject: [PATCH] Rename QtDesktop to QtQuick.Controls
Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
README | 2 +-
examples/ApplicationTemplate/qml/main.qml | 2 +-
examples/gallery/content/ChildWindow.qml | 2 +-
examples/gallery/content/Controls.qml | 4 +-
examples/gallery/content/ModelView.qml | 2 +-
examples/gallery/content/Panel.qml | 2 +-
examples/gallery/content/RangeTab.qml | 2 +-
examples/gallery/content/Styles.qml | 4 +-
examples/gallery/main.qml | 4 +-
examples/splitters/main.qml | 2 +-
examples/tableview/main.qml | 4 +-
examples/touch/content/ButtonPage.qml | 4 +-
examples/touch/content/ProgressBarPage.qml | 4 +-
examples/touch/content/SliderPage.qml | 4 +-
examples/touch/content/TabBarPage.qml | 4 +-
examples/touch/content/TextInputPage.qml | 4 +-
examples/touch/main.qml | 2 +-
...sktopcomponents.pro => qtquickcontrols.pro | 2 +-
.../AbstractCheckable.qml | 6 +--
.../ApplicationWindow.qml | 6 +--
src/{qtdesktop => controls}/Button.qml | 6 +--
src/{qtdesktop => controls}/CheckBox.qml | 6 +--
src/{qtdesktop => controls}/ComboBox.qml | 6 +--
src/{qtdesktop => controls}/ContextMenu.qml | 2 +-
src/{qtdesktop => controls}/GroupBox.qml | 4 +-
src/{qtdesktop => controls}/Label.qml | 2 +-
src/{qtdesktop => controls}/Menu.qml | 6 +--
src/{qtdesktop => controls}/MenuBar.qml | 8 ++--
src/{qtdesktop => controls}/Page.qml | 4 +-
src/{qtdesktop => controls}/PageAnimation.qml | 0
src/{qtdesktop => controls}/PageStack.qml | 6 +--
.../PageTransition.qml | 4 +-
src/{qtdesktop => controls}/ProgressBar.qml | 6 +--
src/{qtdesktop => controls}/RadioButton.qml | 4 +-
src/{qtdesktop => controls}/ScrollArea.qml | 6 +--
src/{qtdesktop => controls}/Slider.qml | 6 +--
src/{qtdesktop => controls}/SpinBox.qml | 6 +--
src/{qtdesktop => controls}/Splitter.qml | 6 +--
src/{qtdesktop => controls}/StatusBar.qml | 6 +--
src/{qtdesktop => controls}/Tab.qml | 2 +-
src/{qtdesktop => controls}/TabFrame.qml | 6 +--
src/{qtdesktop => controls}/TableView.qml | 6 +--
.../TableViewColumn.qml | 2 +-
src/{qtdesktop => controls}/TextArea.qml | 6 +--
src/{qtdesktop => controls}/TextField.qml | 8 ++--
src/{qtdesktop => controls}/ToolBar.qml | 6 +--
src/{qtdesktop => controls}/ToolButton.qml | 6 +--
.../qtdesktop.pro => controls/controls.pro} | 4 +-
.../doc/images/placeholder.png | Bin
.../doc/images/tableview.png | Bin
.../doc/qtquickcontrols.qdocconf} | 36 +++++++++---------
.../doc/src/applicationwindow.qdoc | 0
.../doc/src/containers.qdoc | 0
.../doc/src/controls.qdoc | 0
.../doc/src/indicators.qdoc | 0
.../doc/src/menus.qdoc | 0
.../doc/src/navigation.qdoc | 0
.../doc/src/qtquickcontrols-examples.qdoc} | 4 +-
.../doc/src/qtquickcontrols-index.qdoc} | 18 ++++-----
.../doc/src/qtquickcontrols-overview.qdoc} | 4 +-
.../doc/src/qtquickcontrols.qdoc} | 8 ++--
.../doc/src/styles.qdoc | 8 ++--
.../doc/src/views.qdoc | 0
src/{qtdesktop => controls}/plugin.cpp | 0
src/{qtdesktop => controls}/plugin.json | 0
src/{qtdesktop => controls}/plugin.pri | 0
src/{qtdesktop => controls}/plugin_p.h | 2 +-
src/{qtdesktop => controls}/plugins.qmltypes | 0
src/{qtdesktop => controls}/qmldir | 2 +-
src/{qtdesktop => controls}/qpagestatus.h | 0
src/{qtdesktop => controls}/qquicklayout.cpp | 0
src/{qtdesktop => controls}/qquicklayout_p.h | 0
.../qquicklayoutengine.cpp | 0
.../qquicklayoutengine_p.h | 0
.../qquicklinearlayout.cpp | 4 +-
.../qquicklinearlayout_p.h | 0
src/{qtdesktop => controls}/qtaction.cpp | 2 +-
src/{qtdesktop => controls}/qtaction_p.h | 0
.../qtexclusivegroup.cpp | 2 +-
.../qtexclusivegroup_p.h | 0
src/{qtdesktop => controls}/qtmenu.cpp | 2 +-
src/{qtdesktop => controls}/qtmenu_p.h | 0
src/{qtdesktop => controls}/qtmenubar.cpp | 2 +-
src/{qtdesktop => controls}/qtmenubar_p.h | 0
src/{qtdesktop => controls}/qtmenuitem.cpp | 4 +-
src/{qtdesktop => controls}/qtmenuitem_p.h | 0
.../qtmenupopupwindow.cpp | 0
.../qtmenupopupwindow_p.h | 0
src/experimental/Dial.qml | 4 +-
src/experimental/Dialog.qml | 4 +-
src/experimental/experimental.pro | 2 +-
src/experimental/qmldir | 2 +-
src/private/BasicButton.qml | 6 +--
src/private/ButtonBehavior.qml | 4 +-
src/private/Control.qml | 4 +-
src/private/FocusFrame.qml | 4 +-
src/private/ModalPopupBehavior.qml | 2 +-
src/private/PageSlideTransition.qml | 4 +-
src/private/ScrollAreaHelper.qml | 6 +--
src/private/ScrollBar.qml | 6 +--
src/private/TabBar.qml | 4 +-
src/private/private.pro | 2 +-
src/private/qmldir | 2 +-
src/private/qprivateplugin_p.h | 2 +-
src/private/qstyleitem.cpp | 4 +-
src/src.pro | 2 +-
src/styles/ButtonStyle.qml | 4 +-
src/styles/CheckBoxStyle.qml | 4 +-
src/styles/ComboBoxStyle.qml | 4 +-
src/styles/Desktop/ButtonStyle.qml | 4 +-
src/styles/Desktop/CheckBoxStyle.qml | 4 +-
src/styles/Desktop/ComboBoxStyle.qml | 4 +-
src/styles/Desktop/GroupBoxStyle.qml | 4 +-
src/styles/Desktop/MenuBarStyle.qml | 6 +--
src/styles/Desktop/MenuStyle.qml | 6 +--
src/styles/Desktop/ProgressBarStyle.qml | 4 +-
src/styles/Desktop/RadioButtonStyle.qml | 4 +-
src/styles/Desktop/ScrollAreaStyle.qml | 4 +-
src/styles/Desktop/ScrollBarStyle.qml | 4 +-
src/styles/Desktop/SliderStyle.qml | 4 +-
src/styles/Desktop/SpinBoxStyle.qml | 6 +--
src/styles/Desktop/TabFrameStyle.qml | 6 +--
src/styles/Desktop/TextFieldStyle.qml | 4 +-
src/styles/Desktop/ToolBarStyle.qml | 4 +-
src/styles/Desktop/ToolButtonStyle.qml | 4 +-
src/styles/GroupBoxStyle.qml | 4 +-
src/styles/MenuBarStyle.qml | 4 +-
src/styles/MenuStyle.qml | 4 +-
src/styles/ProgressBarStyle.qml | 4 +-
src/styles/RadioButtonStyle.qml | 4 +-
src/styles/ScrollAreaStyle.qml | 4 +-
src/styles/ScrollBarStyle.qml | 4 +-
src/styles/SliderStyle.qml | 6 +--
src/styles/SpinBoxStyle.qml | 4 +-
src/styles/Style.qml | 2 +-
src/styles/TabFrameStyle.qml | 4 +-
src/styles/TextFieldStyle.qml | 4 +-
src/styles/ToolBarStyle.qml | 4 +-
src/styles/ToolButtonStyle.qml | 4 +-
src/styles/qmldir | 2 +-
src/styles/styles.pro | 2 +-
tests/auto/auto.pro | 2 +-
.../qtdesktop.pro => controls/controls.pro} | 4 +-
.../data/rangemodel/rangemodel.qml | 2 +-
.../data/shortcut/shortcuts.qml | 2 +-
.../data/tableview/table1_qobjectmodel.qml | 4 +-
.../tableview/table2_qabstractitemmodel.qml | 4 +-
.../data/tableview/table3_qobjectlist.qml | 4 +-
.../data/tableview/table4_qstringlist.qml | 4 +-
.../data/tableview/table5_listmodel.qml | 2 +-
.../data/tableview/table6_countmodel.qml | 2 +-
.../data/tableview/table7_arraymodel.qml | 2 +-
.../data/tableview/table8_itemmodel.qml | 2 +-
.../data/tst_applicationwindow.qml | 6 +--
.../data/tst_button.qml | 6 +--
.../data/tst_checkbox.qml | 4 +-
.../data/tst_combobox.qml | 5 +--
.../data/tst_label.qml | 2 +-
.../{qtdesktop => controls}/data/tst_menu.qml | 3 +-
.../data/tst_menubar.qml | 2 +-
.../{qtdesktop => controls}/data/tst_page.qml | 2 +-
.../data/tst_pagestack.qml | 2 +-
.../data/tst_progressbar.qml | 8 ++--
.../data/tst_radiobutton.qml | 4 +-
.../data/tst_rangemodel.qml | 0
.../data/tst_scrollarea.qml | 2 +-
.../data/tst_shortcuts.qml | 4 +-
.../data/tst_slider.qml | 4 +-
.../data/tst_spinbox.qml | 24 ++++++------
.../data/tst_splitter.qml | 2 +-
.../data/tst_statusbar.qml | 2 +-
.../{qtdesktop => controls}/data/tst_tab.qml | 2 +-
.../data/tst_tabframe.qml | 4 +-
.../data/tst_tableview.qml | 4 +-
.../data/tst_tableviewcolumn.qml | 2 +-
.../data/tst_textarea.qml | 2 +-
.../data/tst_textfield.qml | 32 ++++++++--------
.../data/tst_toolbar.qml | 2 +-
.../data/tst_toolbutton.qml | 2 +-
.../tst_controls.cpp} | 4 +-
tests/auto/testplugin/QtDesktopTest/qmldir | 2 -
.../testplugin/QtQuickControlsTests/qmldir | 2 +
tests/auto/testplugin/testplugin.h | 2 +-
tests/auto/testplugin/testplugin.pro | 2 +-
tests/manual/ContextMenu.qml | 2 +-
tests/manual/Dialog.qml | 2 +-
tests/manual/Layout.qml | 2 +-
tests/manual/PageStack.qml | 2 +-
tests/manual/SplitterGallery.qml | 2 +-
tests/manual/WindowContextMenu.qml | 2 +-
tests/manual/keynavigation.qml | 2 +-
tests/manual/scrollbars.qml | 2 +-
tests/manual/splitter.qml | 2 +-
tests/manual/stretching.qml | 4 +-
tests/manual/stretchingcustom.qml | 4 +-
tests/manual/tableviewmodels/qml/main.qml | 2 +-
tests/manual/testbench/content/Components.qml | 2 +-
.../testbench/content/PropertyLayouts.qml | 2 +-
tests/manual/testbench/main.qml | 14 +++----
...cktest.h => qt_quick_controls_quicktest.h} | 12 +++---
200 files changed, 373 insertions(+), 375 deletions(-)
rename qtdesktopcomponents.pro => qtquickcontrols.pro (85%)
rename src/{qtdesktop => controls}/AbstractCheckable.qml (97%)
rename src/{qtdesktop => controls}/ApplicationWindow.qml (98%)
rename src/{qtdesktop => controls}/Button.qml (96%)
rename src/{qtdesktop => controls}/CheckBox.qml (98%)
rename src/{qtdesktop => controls}/ComboBox.qml (98%)
rename src/{qtdesktop => controls}/ContextMenu.qml (99%)
rename src/{qtdesktop => controls}/GroupBox.qml (99%)
rename src/{qtdesktop => controls}/Label.qml (98%)
rename src/{qtdesktop => controls}/Menu.qml (99%)
rename src/{qtdesktop => controls}/MenuBar.qml (98%)
rename src/{qtdesktop => controls}/Page.qml (98%)
rename src/{qtdesktop => controls}/PageAnimation.qml (100%)
rename src/{qtdesktop => controls}/PageStack.qml (99%)
rename src/{qtdesktop => controls}/PageTransition.qml (95%)
rename src/{qtdesktop => controls}/ProgressBar.qml (97%)
rename src/{qtdesktop => controls}/RadioButton.qml (97%)
rename src/{qtdesktop => controls}/ScrollArea.qml (99%)
rename src/{qtdesktop => controls}/Slider.qml (98%)
rename src/{qtdesktop => controls}/SpinBox.qml (99%)
rename src/{qtdesktop => controls}/Splitter.qml (99%)
rename src/{qtdesktop => controls}/StatusBar.qml (96%)
rename src/{qtdesktop => controls}/Tab.qml (98%)
rename src/{qtdesktop => controls}/TabFrame.qml (98%)
rename src/{qtdesktop => controls}/TableView.qml (99%)
rename src/{qtdesktop => controls}/TableViewColumn.qml (98%)
rename src/{qtdesktop => controls}/TextArea.qml (99%)
rename src/{qtdesktop => controls}/TextField.qml (99%)
rename src/{qtdesktop => controls}/ToolBar.qml (96%)
rename src/{qtdesktop => controls}/ToolButton.qml (96%)
rename src/{qtdesktop/qtdesktop.pro => controls/controls.pro} (90%)
rename src/{qtdesktop => controls}/doc/images/placeholder.png (100%)
rename src/{qtdesktop => controls}/doc/images/tableview.png (100%)
rename src/{qtdesktop/doc/qtdesktopcomponents.qdocconf => controls/doc/qtquickcontrols.qdocconf} (70%)
rename src/{qtdesktop => controls}/doc/src/applicationwindow.qdoc (100%)
rename src/{qtdesktop => controls}/doc/src/containers.qdoc (100%)
rename src/{qtdesktop => controls}/doc/src/controls.qdoc (100%)
rename src/{qtdesktop => controls}/doc/src/indicators.qdoc (100%)
rename src/{qtdesktop => controls}/doc/src/menus.qdoc (100%)
rename src/{qtdesktop => controls}/doc/src/navigation.qdoc (100%)
rename src/{qtdesktop/doc/src/qtdesktopcomponents-examples.qdoc => controls/doc/src/qtquickcontrols-examples.qdoc} (94%)
rename src/{qtdesktop/doc/src/qtdesktopcomponents-index.qdoc => controls/doc/src/qtquickcontrols-index.qdoc} (82%)
rename src/{qtdesktop/doc/src/qtdesktopcomponents-overview.qdoc => controls/doc/src/qtquickcontrols-overview.qdoc} (93%)
rename src/{qtdesktop/doc/src/qtdesktopcomponents.qdoc => controls/doc/src/qtquickcontrols.qdoc} (87%)
rename src/{qtdesktop => controls}/doc/src/styles.qdoc (85%)
rename src/{qtdesktop => controls}/doc/src/views.qdoc (100%)
rename src/{qtdesktop => controls}/plugin.cpp (100%)
rename src/{qtdesktop => controls}/plugin.json (100%)
rename src/{qtdesktop => controls}/plugin.pri (100%)
rename src/{qtdesktop => controls}/plugin_p.h (95%)
rename src/{qtdesktop => controls}/plugins.qmltypes (100%)
rename src/{qtdesktop => controls}/qmldir (97%)
rename src/{qtdesktop => controls}/qpagestatus.h (100%)
rename src/{qtdesktop => controls}/qquicklayout.cpp (100%)
rename src/{qtdesktop => controls}/qquicklayout_p.h (100%)
rename src/{qtdesktop => controls}/qquicklayoutengine.cpp (100%)
rename src/{qtdesktop => controls}/qquicklayoutengine_p.h (100%)
rename src/{qtdesktop => controls}/qquicklinearlayout.cpp (99%)
rename src/{qtdesktop => controls}/qquicklinearlayout_p.h (100%)
rename src/{qtdesktop => controls}/qtaction.cpp (99%)
rename src/{qtdesktop => controls}/qtaction_p.h (100%)
rename src/{qtdesktop => controls}/qtexclusivegroup.cpp (99%)
rename src/{qtdesktop => controls}/qtexclusivegroup_p.h (100%)
rename src/{qtdesktop => controls}/qtmenu.cpp (99%)
rename src/{qtdesktop => controls}/qtmenu_p.h (100%)
rename src/{qtdesktop => controls}/qtmenubar.cpp (99%)
rename src/{qtdesktop => controls}/qtmenubar_p.h (100%)
rename src/{qtdesktop => controls}/qtmenuitem.cpp (99%)
rename src/{qtdesktop => controls}/qtmenuitem_p.h (100%)
rename src/{qtdesktop => controls}/qtmenupopupwindow.cpp (100%)
rename src/{qtdesktop => controls}/qtmenupopupwindow_p.h (100%)
rename tests/auto/{qtdesktop/qtdesktop.pro => controls/controls.pro} (94%)
rename tests/auto/{qtdesktop => controls}/data/rangemodel/rangemodel.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/shortcut/shortcuts.qml (99%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table1_qobjectmodel.qml (97%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table2_qabstractitemmodel.qml (97%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table3_qobjectlist.qml (97%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table4_qstringlist.qml (97%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table5_listmodel.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table6_countmodel.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table7_arraymodel.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tableview/table8_itemmodel.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tst_applicationwindow.qml (87%)
rename tests/auto/{qtdesktop => controls}/data/tst_button.qml (87%)
rename tests/auto/{qtdesktop => controls}/data/tst_checkbox.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tst_combobox.qml (93%)
rename tests/auto/{qtdesktop => controls}/data/tst_label.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_menu.qml (99%)
rename tests/auto/{qtdesktop => controls}/data/tst_menubar.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_page.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_pagestack.qml (99%)
rename tests/auto/{qtdesktop => controls}/data/tst_progressbar.qml (87%)
rename tests/auto/{qtdesktop => controls}/data/tst_radiobutton.qml (97%)
rename tests/auto/{qtdesktop => controls}/data/tst_rangemodel.qml (100%)
rename tests/auto/{qtdesktop => controls}/data/tst_scrollarea.qml (99%)
rename tests/auto/{qtdesktop => controls}/data/tst_shortcuts.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tst_slider.qml (92%)
rename tests/auto/{qtdesktop => controls}/data/tst_spinbox.qml (88%)
rename tests/auto/{qtdesktop => controls}/data/tst_splitter.qml (98%)
rename tests/auto/{qtdesktop => controls}/data/tst_statusbar.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_tab.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_tabframe.qml (92%)
rename tests/auto/{qtdesktop => controls}/data/tst_tableview.qml (99%)
rename tests/auto/{qtdesktop => controls}/data/tst_tableviewcolumn.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_textarea.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_textfield.qml (80%)
rename tests/auto/{qtdesktop => controls}/data/tst_toolbar.qml (95%)
rename tests/auto/{qtdesktop => controls}/data/tst_toolbutton.qml (95%)
rename tests/auto/{qtdesktop/tst_qtdesktop.cpp => controls/tst_controls.cpp} (95%)
delete mode 100644 tests/auto/testplugin/QtDesktopTest/qmldir
create mode 100644 tests/auto/testplugin/QtQuickControlsTests/qmldir
rename tests/shared/{qtdc_quicktest.h => qt_quick_controls_quicktest.h} (88%)
diff --git a/README b/README
index f0294c013..692e8a4c7 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 dcfe6064d..4217907a7 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 9dd1f1474..312e2c630 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 4f188a90b..1c2db2aac 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 a3c67fc0c..2590d5023 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 bd70439d2..aeb38e8a4 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 5f773b02a..8289c789b 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 cf7813fdb..9a639534d 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 60e1f63ca..6f71515b8 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 f1a4873f2..6f7e2228c 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 dcebb4d24..78dee116d 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 06b983db8..8e97a2d8c 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 f8885a428..88143b53d 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 e14ecaa57..b345d3512 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 ae4a73b88..792f1a25f 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 3174c1b71..1bf8f20a2 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 6a26b9d5d..b5061c163 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 289b01810..bc5ed5e81 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 c3451c265..206361e2e 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 662e5fb58..6a33c26fa 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 37d715668..529d602a0 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 f87ef26ca..574f35e53 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 9b42e357d..5458807b4 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 c7e7502e3..42c2adcbe 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 17351b8de..2e5b35d69 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 4cce00831..0dd5dec29 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 a85c46558..3176436f2 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 c1fdd9708..db1cb3f63 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 f044b8c8e..c7d08c290 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 c5d23c719..424834438 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 37f04e135..bd69dc5aa 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 d83d16603..9d67b690f 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 0088bc517..ce819164e 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 ede61d053..8a48303ea 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 7def55d49..9c274463e 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 9bc15b957..25c70fc66 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 d15c205d3..16796f1a3 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 c8d3363d3..965af47b5 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 3850026cd..014bb023b 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 7be1ba78b..91ea18f62 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 080bcab07..bcfc8d8b1 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 ba83524e9..f14b3f03d 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 14f3f6ba3..bcedbe750 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 ba185f0cd..c209e5329 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 423978cde..2c3592393 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 722e79f85..d3fd441a5 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 451068cb1..7af5a965f 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 a7f775991..3977be504 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 cfc2ba90b..04fa1f4ac 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 0751317d2..1f3ab44e0 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 9350f6755..82da0b220 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 ac8bbc8b0..ddbfc5d62 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 4dfed9701..36dc302f6 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 6d9574c2b..c6c3fee31 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 ca2b5600f..b3de1110b 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 29fb026f4..015b8cba9 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 ba059a05e..debdd762e 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 5eccfd0ee..fde2a9dfb 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 144f60a64..bd7af0c2d 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 06d7dbbe2..ff4a2031e 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 d7a4538f1..6da06c4e2 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 95e32f052..960c10703 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 abbda95e7..05abb8526 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 32fdaa264..b0a916583 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 556b57805..c9d4cc315 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 db2229c35..0f3774ff4 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 f49d4e02d..78d947ad2 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 4c0dad6e9..c26c4ab82 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 5ce0d5f00..963938f49 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 7ccae208b..cb4d35d4d 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 029403fb9..1f55f513a 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 2b409aba1..fc687f74c 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 9d48a6022..5ce4d0e25 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 8be53f7a1..af66fde9e 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 8434f911d..072241317 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 0ed608c78..6a5abc9b0 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 7d7425089..46d504b6f 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 ab42c2721..c5729f963 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 224acacf2..77753b0a6 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 a94ef7506..10c6ebf67 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 68f4c422a..a4885d11a 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 b79b6ec57..0942b02be 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 68c37e44b..f6e7ee20f 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 5ebcc0611..341ff53e4 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 06f1b8766..72d97a6c8 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 14bd3909e..9de3f3597 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 34ddad672..1642d2a42 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 cca7e63cc..a45fe2291 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 000858025..886cf61bf 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 2330e9bd3..c5fc5a220 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 0374aa776..a9b84fcb7 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 0ea61df4f..9a22b00e3 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 cbc22f6ea..a99180db6 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 149b078cf..a66ba3c2d 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 7c5f7531b..4a9866660 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 529f09bfd..99872bf78 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 e5ba99453..d49c1e628 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 69099586d..b29a30c39 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 a042bfd7b..61866571f 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 e4ccadd42..b29a22605 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 152763944..633fbba4e 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 7eebf9d80..157379d55 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 b6b9c3889..f156598bb 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 59a3700cd..06e54f403 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 d5477ff70..d2c94fc65 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 e376fce4d..d3bb26c11 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 1e1385982..f2d4fd3f3 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 c9db6cc66..55fef8605 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 4d156d618..0d545e622 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 30a224672..1093e4609 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 2ac0dae28..874c18f2d 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 fca522e0a..2d94749a3 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 c645ca534..223c2178b 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 7e2ff0c15..a7a727938 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 7f65bddf0..5c3f8d592 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 45a1606cd..20ee603a6 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 ce0a4c151..661e16722 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 3da194942..e550aece9 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 692e8bc50..b1dd83d39 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 c67c7fac0..4487f6c1f 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 f008a72e7..8cb13cccf 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 2f847cf5c..6501dec5c 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 0b44b918a..05d948bc3 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 e07235506..d5599b443 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 53c2a068d..700f36355 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 621cd5977..774bb4083 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 2366bf485..d1ec6582e 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 e971c5cc0..757bc64b9 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 8b4abedee..449439ef5 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 aaf9e558f..08a8c4886 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 205c327de..1a83a4a5c 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 d7f948a7b..6dadfb083 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 b66845add..f6c04bd48 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 365aa5af6..0e5ce78e8 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 4f6826d73..14068c72a 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 bf9056e89..56b2ad0e9 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 ba4445db2..1ad1b0321 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 3e2a70f05..a2c1ed1f7 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 8266d511b..344fc327a 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 41c2d7618..70dc3d92a 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 9f002c11f..fe482308a 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 cb34cacb1..a4a50f504 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 942ae6c6a..4eb9bd827 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 648aa9d5b..c20b2ea2b 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 4d21c1486..4c6d7992d 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 4d051ad48..bf7c9bb40 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 6de32ef15..a7a75759e 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 d266a4039..105f19c70 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 69cd503c5..1f051e74b 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 534fb5c7b..9c125604a 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 9708ce8b5..61c3d308b 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 a1c9da359..e63c01b0a 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 8b6dadac2..000000000
--- 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 000000000..10c6cbab8
--- /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 ee0d58ac9..cc3d854b6 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 b0df3acd0..12fb19fd6 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 a40effadb..1c14f76df 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 18942b5a5..e184aff85 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 590008e67..167d0357a 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 9857a66d6..b0a94eb0b 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 8472ca044..0f93e31d8 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 4ddd15ae0..085757c12 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 e1efb5660..e01701c4a 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 c23ea96c9..67a535508 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 4f6bcdf8e..e12173945 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 5d9290e9d..8e46dfbc4 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 81b4d4746..4184702b5 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 abdedc817..69cf2e3eb 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 985e0dadc..ef80f0d71 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 61ebc2019..dbd6b4e83 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 3f3f9a9aa..c6b1cdf08 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 a53654f03..9164de1fe 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; \
}
--
GitLab