diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | examples/ApplicationTemplate/qml/main.qml | 2 | ||||
-rw-r--r-- | examples/gallery/content/ChildWindow.qml | 2 | ||||
-rw-r--r-- | examples/gallery/content/Controls.qml | 4 | ||||
-rw-r--r-- | examples/gallery/content/ModelView.qml | 2 | ||||
-rw-r--r-- | examples/gallery/content/Panel.qml | 2 | ||||
-rw-r--r-- | examples/gallery/content/RangeTab.qml | 2 | ||||
-rw-r--r-- | examples/gallery/content/Styles.qml | 4 | ||||
-rw-r--r-- | examples/gallery/main.qml | 4 | ||||
-rw-r--r-- | examples/splitters/main.qml | 2 | ||||
-rw-r--r-- | examples/tableview/main.qml | 4 | ||||
-rw-r--r-- | examples/touch/content/ButtonPage.qml | 4 | ||||
-rw-r--r-- | examples/touch/content/ProgressBarPage.qml | 4 | ||||
-rw-r--r-- | examples/touch/content/SliderPage.qml | 4 | ||||
-rw-r--r-- | examples/touch/content/TabBarPage.qml | 4 | ||||
-rw-r--r-- | examples/touch/content/TextInputPage.qml | 4 | ||||
-rw-r--r-- | examples/touch/main.qml | 2 | ||||
-rw-r--r-- | qtquickcontrols.pro (renamed from qtdesktopcomponents.pro) | 2 | ||||
-rw-r--r-- | src/controls/AbstractCheckable.qml (renamed from src/qtdesktop/AbstractCheckable.qml) | 6 | ||||
-rw-r--r-- | src/controls/ApplicationWindow.qml (renamed from src/qtdesktop/ApplicationWindow.qml) | 6 | ||||
-rw-r--r-- | src/controls/Button.qml (renamed from src/qtdesktop/Button.qml) | 6 | ||||
-rw-r--r-- | src/controls/CheckBox.qml (renamed from src/qtdesktop/CheckBox.qml) | 6 | ||||
-rw-r--r-- | src/controls/ComboBox.qml (renamed from src/qtdesktop/ComboBox.qml) | 6 | ||||
-rw-r--r-- | src/controls/ContextMenu.qml (renamed from src/qtdesktop/ContextMenu.qml) | 2 | ||||
-rw-r--r-- | src/controls/GroupBox.qml (renamed from src/qtdesktop/GroupBox.qml) | 4 | ||||
-rw-r--r-- | src/controls/Label.qml (renamed from src/qtdesktop/Label.qml) | 2 | ||||
-rw-r--r-- | src/controls/Menu.qml (renamed from src/qtdesktop/Menu.qml) | 6 | ||||
-rw-r--r-- | src/controls/MenuBar.qml (renamed from src/qtdesktop/MenuBar.qml) | 8 | ||||
-rw-r--r-- | src/controls/Page.qml (renamed from src/qtdesktop/Page.qml) | 4 | ||||
-rw-r--r-- | src/controls/PageAnimation.qml (renamed from src/qtdesktop/PageAnimation.qml) | 0 | ||||
-rw-r--r-- | src/controls/PageStack.qml (renamed from src/qtdesktop/PageStack.qml) | 6 | ||||
-rw-r--r-- | src/controls/PageTransition.qml (renamed from src/qtdesktop/PageTransition.qml) | 4 | ||||
-rw-r--r-- | src/controls/ProgressBar.qml (renamed from src/qtdesktop/ProgressBar.qml) | 6 | ||||
-rw-r--r-- | src/controls/RadioButton.qml (renamed from src/qtdesktop/RadioButton.qml) | 4 | ||||
-rw-r--r-- | src/controls/ScrollArea.qml (renamed from src/qtdesktop/ScrollArea.qml) | 6 | ||||
-rw-r--r-- | src/controls/Slider.qml (renamed from src/qtdesktop/Slider.qml) | 6 | ||||
-rw-r--r-- | src/controls/SpinBox.qml (renamed from src/qtdesktop/SpinBox.qml) | 6 | ||||
-rw-r--r-- | src/controls/Splitter.qml (renamed from src/qtdesktop/Splitter.qml) | 6 | ||||
-rw-r--r-- | src/controls/StatusBar.qml (renamed from src/qtdesktop/StatusBar.qml) | 6 | ||||
-rw-r--r-- | src/controls/Tab.qml (renamed from src/qtdesktop/Tab.qml) | 2 | ||||
-rw-r--r-- | src/controls/TabFrame.qml (renamed from src/qtdesktop/TabFrame.qml) | 6 | ||||
-rw-r--r-- | src/controls/TableView.qml (renamed from src/qtdesktop/TableView.qml) | 6 | ||||
-rw-r--r-- | src/controls/TableViewColumn.qml (renamed from src/qtdesktop/TableViewColumn.qml) | 2 | ||||
-rw-r--r-- | src/controls/TextArea.qml (renamed from src/qtdesktop/TextArea.qml) | 6 | ||||
-rw-r--r-- | src/controls/TextField.qml (renamed from src/qtdesktop/TextField.qml) | 8 | ||||
-rw-r--r-- | src/controls/ToolBar.qml (renamed from src/qtdesktop/ToolBar.qml) | 6 | ||||
-rw-r--r-- | src/controls/ToolButton.qml (renamed from src/qtdesktop/ToolButton.qml) | 6 | ||||
-rw-r--r-- | src/controls/controls.pro (renamed from src/qtdesktop/qtdesktop.pro) | 4 | ||||
-rw-r--r-- | src/controls/doc/images/placeholder.png (renamed from src/qtdesktop/doc/images/placeholder.png) | bin | 9878 -> 9878 bytes | |||
-rw-r--r-- | src/controls/doc/images/tableview.png (renamed from src/qtdesktop/doc/images/tableview.png) | bin | 55512 -> 55512 bytes | |||
-rw-r--r-- | src/controls/doc/qtquickcontrols.qdocconf (renamed from src/qtdesktop/doc/qtdesktopcomponents.qdocconf) | 36 | ||||
-rw-r--r-- | src/controls/doc/src/applicationwindow.qdoc (renamed from src/qtdesktop/doc/src/applicationwindow.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/doc/src/containers.qdoc (renamed from src/qtdesktop/doc/src/containers.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/doc/src/controls.qdoc (renamed from src/qtdesktop/doc/src/controls.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/doc/src/indicators.qdoc (renamed from src/qtdesktop/doc/src/indicators.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/doc/src/menus.qdoc (renamed from src/qtdesktop/doc/src/menus.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/doc/src/navigation.qdoc (renamed from src/qtdesktop/doc/src/navigation.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc (renamed from src/qtdesktop/doc/src/qtdesktopcomponents-examples.qdoc) | 4 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-index.qdoc (renamed from src/qtdesktop/doc/src/qtdesktopcomponents-index.qdoc) | 18 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-overview.qdoc (renamed from src/qtdesktop/doc/src/qtdesktopcomponents-overview.qdoc) | 4 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols.qdoc (renamed from src/qtdesktop/doc/src/qtdesktopcomponents.qdoc) | 8 | ||||
-rw-r--r-- | src/controls/doc/src/styles.qdoc (renamed from src/qtdesktop/doc/src/styles.qdoc) | 8 | ||||
-rw-r--r-- | src/controls/doc/src/views.qdoc (renamed from src/qtdesktop/doc/src/views.qdoc) | 0 | ||||
-rw-r--r-- | src/controls/plugin.cpp (renamed from src/qtdesktop/plugin.cpp) | 0 | ||||
-rw-r--r-- | src/controls/plugin.json (renamed from src/qtdesktop/plugin.json) | 0 | ||||
-rw-r--r-- | src/controls/plugin.pri (renamed from src/qtdesktop/plugin.pri) | 0 | ||||
-rw-r--r-- | src/controls/plugin_p.h (renamed from src/qtdesktop/plugin_p.h) | 2 | ||||
-rw-r--r-- | src/controls/plugins.qmltypes (renamed from src/qtdesktop/plugins.qmltypes) | 0 | ||||
-rw-r--r-- | src/controls/qmldir (renamed from src/qtdesktop/qmldir) | 2 | ||||
-rw-r--r-- | src/controls/qpagestatus.h (renamed from src/qtdesktop/qpagestatus.h) | 0 | ||||
-rw-r--r-- | src/controls/qquicklayout.cpp (renamed from src/qtdesktop/qquicklayout.cpp) | 0 | ||||
-rw-r--r-- | src/controls/qquicklayout_p.h (renamed from src/qtdesktop/qquicklayout_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qquicklayoutengine.cpp (renamed from src/qtdesktop/qquicklayoutengine.cpp) | 0 | ||||
-rw-r--r-- | src/controls/qquicklayoutengine_p.h (renamed from src/qtdesktop/qquicklayoutengine_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qquicklinearlayout.cpp (renamed from src/qtdesktop/qquicklinearlayout.cpp) | 4 | ||||
-rw-r--r-- | src/controls/qquicklinearlayout_p.h (renamed from src/qtdesktop/qquicklinearlayout_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qtaction.cpp (renamed from src/qtdesktop/qtaction.cpp) | 2 | ||||
-rw-r--r-- | src/controls/qtaction_p.h (renamed from src/qtdesktop/qtaction_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qtexclusivegroup.cpp (renamed from src/qtdesktop/qtexclusivegroup.cpp) | 2 | ||||
-rw-r--r-- | src/controls/qtexclusivegroup_p.h (renamed from src/qtdesktop/qtexclusivegroup_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qtmenu.cpp (renamed from src/qtdesktop/qtmenu.cpp) | 2 | ||||
-rw-r--r-- | src/controls/qtmenu_p.h (renamed from src/qtdesktop/qtmenu_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qtmenubar.cpp (renamed from src/qtdesktop/qtmenubar.cpp) | 2 | ||||
-rw-r--r-- | src/controls/qtmenubar_p.h (renamed from src/qtdesktop/qtmenubar_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qtmenuitem.cpp (renamed from src/qtdesktop/qtmenuitem.cpp) | 4 | ||||
-rw-r--r-- | src/controls/qtmenuitem_p.h (renamed from src/qtdesktop/qtmenuitem_p.h) | 0 | ||||
-rw-r--r-- | src/controls/qtmenupopupwindow.cpp (renamed from src/qtdesktop/qtmenupopupwindow.cpp) | 0 | ||||
-rw-r--r-- | src/controls/qtmenupopupwindow_p.h (renamed from src/qtdesktop/qtmenupopupwindow_p.h) | 0 | ||||
-rw-r--r-- | src/experimental/Dial.qml | 4 | ||||
-rw-r--r-- | src/experimental/Dialog.qml | 4 | ||||
-rw-r--r-- | src/experimental/experimental.pro | 2 | ||||
-rw-r--r-- | src/experimental/qmldir | 2 | ||||
-rw-r--r-- | src/private/BasicButton.qml | 6 | ||||
-rw-r--r-- | src/private/ButtonBehavior.qml | 4 | ||||
-rw-r--r-- | src/private/Control.qml | 4 | ||||
-rw-r--r-- | src/private/FocusFrame.qml | 4 | ||||
-rw-r--r-- | src/private/ModalPopupBehavior.qml | 2 | ||||
-rw-r--r-- | src/private/PageSlideTransition.qml | 4 | ||||
-rw-r--r-- | src/private/ScrollAreaHelper.qml | 6 | ||||
-rw-r--r-- | src/private/ScrollBar.qml | 6 | ||||
-rw-r--r-- | src/private/TabBar.qml | 4 | ||||
-rw-r--r-- | src/private/private.pro | 2 | ||||
-rw-r--r-- | src/private/qmldir | 2 | ||||
-rw-r--r-- | src/private/qprivateplugin_p.h | 2 | ||||
-rw-r--r-- | src/private/qstyleitem.cpp | 4 | ||||
-rw-r--r-- | src/src.pro | 2 | ||||
-rw-r--r-- | src/styles/ButtonStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/CheckBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/ComboBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/ButtonStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/CheckBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/ComboBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/GroupBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/MenuBarStyle.qml | 6 | ||||
-rw-r--r-- | src/styles/Desktop/MenuStyle.qml | 6 | ||||
-rw-r--r-- | src/styles/Desktop/ProgressBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/RadioButtonStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/ScrollAreaStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/ScrollBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/SliderStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/SpinBoxStyle.qml | 6 | ||||
-rw-r--r-- | src/styles/Desktop/TabFrameStyle.qml | 6 | ||||
-rw-r--r-- | src/styles/Desktop/TextFieldStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/ToolBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Desktop/ToolButtonStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/GroupBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/MenuBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/MenuStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/ProgressBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/RadioButtonStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/ScrollAreaStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/ScrollBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/SliderStyle.qml | 6 | ||||
-rw-r--r-- | src/styles/SpinBoxStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/Style.qml | 2 | ||||
-rw-r--r-- | src/styles/TabFrameStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/TextFieldStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/ToolBarStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/ToolButtonStyle.qml | 4 | ||||
-rw-r--r-- | src/styles/qmldir | 2 | ||||
-rw-r--r-- | src/styles/styles.pro | 2 | ||||
-rw-r--r-- | tests/auto/auto.pro | 2 | ||||
-rw-r--r-- | tests/auto/controls/controls.pro (renamed from tests/auto/qtdesktop/qtdesktop.pro) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/rangemodel/rangemodel.qml (renamed from tests/auto/qtdesktop/data/rangemodel/rangemodel.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/shortcut/shortcuts.qml (renamed from tests/auto/qtdesktop/data/shortcut/shortcuts.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table1_qobjectmodel.qml (renamed from tests/auto/qtdesktop/data/tableview/table1_qobjectmodel.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml (renamed from tests/auto/qtdesktop/data/tableview/table2_qabstractitemmodel.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table3_qobjectlist.qml (renamed from tests/auto/qtdesktop/data/tableview/table3_qobjectlist.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table4_qstringlist.qml (renamed from tests/auto/qtdesktop/data/tableview/table4_qstringlist.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table5_listmodel.qml (renamed from tests/auto/qtdesktop/data/tableview/table5_listmodel.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table6_countmodel.qml (renamed from tests/auto/qtdesktop/data/tableview/table6_countmodel.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table7_arraymodel.qml (renamed from tests/auto/qtdesktop/data/tableview/table7_arraymodel.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tableview/table8_itemmodel.qml (renamed from tests/auto/qtdesktop/data/tableview/table8_itemmodel.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_applicationwindow.qml (renamed from tests/auto/qtdesktop/data/tst_applicationwindow.qml) | 6 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_button.qml (renamed from tests/auto/qtdesktop/data/tst_button.qml) | 6 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_checkbox.qml (renamed from tests/auto/qtdesktop/data/tst_checkbox.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_combobox.qml (renamed from tests/auto/qtdesktop/data/tst_combobox.qml) | 5 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_label.qml (renamed from tests/auto/qtdesktop/data/tst_label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_menu.qml (renamed from tests/auto/qtdesktop/data/tst_menu.qml) | 3 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_menubar.qml (renamed from tests/auto/qtdesktop/data/tst_menubar.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_page.qml (renamed from tests/auto/qtdesktop/data/tst_page.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_pagestack.qml (renamed from tests/auto/qtdesktop/data/tst_pagestack.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_progressbar.qml (renamed from tests/auto/qtdesktop/data/tst_progressbar.qml) | 8 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_radiobutton.qml (renamed from tests/auto/qtdesktop/data/tst_radiobutton.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_rangemodel.qml (renamed from tests/auto/qtdesktop/data/tst_rangemodel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_scrollarea.qml (renamed from tests/auto/qtdesktop/data/tst_scrollarea.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_shortcuts.qml (renamed from tests/auto/qtdesktop/data/tst_shortcuts.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_slider.qml (renamed from tests/auto/qtdesktop/data/tst_slider.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_spinbox.qml (renamed from tests/auto/qtdesktop/data/tst_spinbox.qml) | 24 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_splitter.qml (renamed from tests/auto/qtdesktop/data/tst_splitter.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_statusbar.qml (renamed from tests/auto/qtdesktop/data/tst_statusbar.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tab.qml (renamed from tests/auto/qtdesktop/data/tst_tab.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tabframe.qml (renamed from tests/auto/qtdesktop/data/tst_tabframe.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tableview.qml (renamed from tests/auto/qtdesktop/data/tst_tableview.qml) | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tableviewcolumn.qml (renamed from tests/auto/qtdesktop/data/tst_tableviewcolumn.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_textarea.qml (renamed from tests/auto/qtdesktop/data/tst_textarea.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_textfield.qml (renamed from tests/auto/qtdesktop/data/tst_textfield.qml) | 32 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_toolbar.qml (renamed from tests/auto/qtdesktop/data/tst_toolbar.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_toolbutton.qml (renamed from tests/auto/qtdesktop/data/tst_toolbutton.qml) | 2 | ||||
-rw-r--r-- | tests/auto/controls/tst_controls.cpp (renamed from tests/auto/qtdesktop/tst_qtdesktop.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/testplugin/QtDesktopTest/qmldir | 2 | ||||
-rw-r--r-- | tests/auto/testplugin/QtQuickControlsTests/qmldir | 2 | ||||
-rw-r--r-- | tests/auto/testplugin/testplugin.h | 2 | ||||
-rw-r--r-- | tests/auto/testplugin/testplugin.pro | 2 | ||||
-rw-r--r-- | tests/manual/ContextMenu.qml | 2 | ||||
-rw-r--r-- | tests/manual/Dialog.qml | 2 | ||||
-rw-r--r-- | tests/manual/Layout.qml | 2 | ||||
-rw-r--r-- | tests/manual/PageStack.qml | 2 | ||||
-rw-r--r-- | tests/manual/SplitterGallery.qml | 2 | ||||
-rw-r--r-- | tests/manual/WindowContextMenu.qml | 2 | ||||
-rw-r--r-- | tests/manual/keynavigation.qml | 2 | ||||
-rw-r--r-- | tests/manual/scrollbars.qml | 2 | ||||
-rw-r--r-- | tests/manual/splitter.qml | 2 | ||||
-rw-r--r-- | tests/manual/stretching.qml | 4 | ||||
-rw-r--r-- | tests/manual/stretchingcustom.qml | 4 | ||||
-rw-r--r-- | tests/manual/tableviewmodels/qml/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/testbench/content/Components.qml | 2 | ||||
-rw-r--r-- | tests/manual/testbench/content/PropertyLayouts.qml | 2 | ||||
-rw-r--r-- | tests/manual/testbench/main.qml | 14 | ||||
-rw-r--r-- | tests/shared/qt_quick_controls_quicktest.h (renamed from tests/shared/qtdc_quicktest.h) | 12 |
200 files changed, 373 insertions, 375 deletions
@@ -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 dcfe6064..4217907a 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 9dd1f147..312e2c63 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 4f188a90..1c2db2aa 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 a3c67fc0..2590d502 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 bd70439d..aeb38e8a 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 5f773b02..8289c789 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 cf7813fd..9a639534 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 60e1f63c..6f71515b 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 f1a4873f..6f7e2228 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 dcebb4d2..78dee116 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 06b983db..8e97a2d8 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 f8885a42..88143b53 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 e14ecaa5..b345d351 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 ae4a73b8..792f1a25 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 3174c1b7..1bf8f20a 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 6a26b9d5..b5061c16 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 index 289b0181..bc5ed5e8 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 index c3451c26..206361e2 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 index 662e5fb5..6a33c26f 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 index 37d71566..529d602a 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 index f87ef26c..574f35e5 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 index 9b42e357..5458807b 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 index c7e7502e..42c2adcb 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 index 17351b8d..2e5b35d6 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 index 4cce0083..0dd5dec2 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 index a85c4655..3176436f 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 index c1fdd970..db1cb3f6 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 index f044b8c8..c7d08c29 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 index ace0e2e4..ace0e2e4 100644 --- a/src/qtdesktop/PageAnimation.qml +++ b/src/controls/PageAnimation.qml diff --git a/src/qtdesktop/PageStack.qml b/src/controls/PageStack.qml index c5d23c71..42483443 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 index 37f04e13..bd69dc5a 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 index d83d1660..9d67b690 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 index 0088bc51..ce819164 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 index ede61d05..8a48303e 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 index 7def55d4..9c274463 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 index 9bc15b95..25c70fc6 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 index d15c205d..16796f1a 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 index c8d3363d..965af47b 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 index 3850026c..014bb023 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 index 7be1ba78..91ea18f6 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 index 080bcab0..bcfc8d8b 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 index ba83524e..f14b3f03 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 index 14f3f6ba..bcedbe75 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 index ba185f0c..c209e532 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 index 423978cd..2c359239 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 index 722e79f8..d3fd441a 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 index 451068cb..7af5a965 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 Binary files differindex c64ff5bd..c64ff5bd 100644 --- a/src/qtdesktop/doc/images/placeholder.png +++ b/src/controls/doc/images/placeholder.png diff --git a/src/qtdesktop/doc/images/tableview.png b/src/controls/doc/images/tableview.png Binary files differindex e7e5e27d..e7e5e27d 100644 --- a/src/qtdesktop/doc/images/tableview.png +++ b/src/controls/doc/images/tableview.png diff --git a/src/qtdesktop/doc/qtdesktopcomponents.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index a7f77599..3977be50 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 index f9e2d97f..f9e2d97f 100644 --- a/src/qtdesktop/doc/src/applicationwindow.qdoc +++ b/src/controls/doc/src/applicationwindow.qdoc diff --git a/src/qtdesktop/doc/src/containers.qdoc b/src/controls/doc/src/containers.qdoc index 6a0ab02d..6a0ab02d 100644 --- a/src/qtdesktop/doc/src/containers.qdoc +++ b/src/controls/doc/src/containers.qdoc diff --git a/src/qtdesktop/doc/src/controls.qdoc b/src/controls/doc/src/controls.qdoc index d1e4d052..d1e4d052 100644 --- a/src/qtdesktop/doc/src/controls.qdoc +++ b/src/controls/doc/src/controls.qdoc diff --git a/src/qtdesktop/doc/src/indicators.qdoc b/src/controls/doc/src/indicators.qdoc index f31dec9e..f31dec9e 100644 --- a/src/qtdesktop/doc/src/indicators.qdoc +++ b/src/controls/doc/src/indicators.qdoc diff --git a/src/qtdesktop/doc/src/menus.qdoc b/src/controls/doc/src/menus.qdoc index ae8554ea..ae8554ea 100644 --- a/src/qtdesktop/doc/src/menus.qdoc +++ b/src/controls/doc/src/menus.qdoc diff --git a/src/qtdesktop/doc/src/navigation.qdoc b/src/controls/doc/src/navigation.qdoc index b1bd8ef8..b1bd8ef8 100644 --- a/src/qtdesktop/doc/src/navigation.qdoc +++ b/src/controls/doc/src/navigation.qdoc diff --git a/src/qtdesktop/doc/src/qtdesktopcomponents-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index cfc2ba90..04fa1f4a 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 index 0751317d..1f3ab44e 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 index 9350f675..82da0b22 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 index ac8bbc8b..ddbfc5d6 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 index 4dfed970..36dc302f 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 index c92cb7da..c92cb7da 100644 --- a/src/qtdesktop/doc/src/views.qdoc +++ b/src/controls/doc/src/views.qdoc diff --git a/src/qtdesktop/plugin.cpp b/src/controls/plugin.cpp index d8bdd9ef..d8bdd9ef 100644 --- a/src/qtdesktop/plugin.cpp +++ b/src/controls/plugin.cpp diff --git a/src/qtdesktop/plugin.json b/src/controls/plugin.json index 0967ef42..0967ef42 100644 --- a/src/qtdesktop/plugin.json +++ b/src/controls/plugin.json diff --git a/src/qtdesktop/plugin.pri b/src/controls/plugin.pri index 5637e75c..5637e75c 100644 --- a/src/qtdesktop/plugin.pri +++ b/src/controls/plugin.pri diff --git a/src/qtdesktop/plugin_p.h b/src/controls/plugin_p.h index 6d9574c2..c6c3fee3 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 index 734c3878..734c3878 100644 --- a/src/qtdesktop/plugins.qmltypes +++ b/src/controls/plugins.qmltypes diff --git a/src/qtdesktop/qmldir b/src/controls/qmldir index ca2b5600..b3de1110 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 index 6ba8930a..6ba8930a 100644 --- a/src/qtdesktop/qpagestatus.h +++ b/src/controls/qpagestatus.h diff --git a/src/qtdesktop/qquicklayout.cpp b/src/controls/qquicklayout.cpp index f0decf88..f0decf88 100644 --- a/src/qtdesktop/qquicklayout.cpp +++ b/src/controls/qquicklayout.cpp diff --git a/src/qtdesktop/qquicklayout_p.h b/src/controls/qquicklayout_p.h index d435f35f..d435f35f 100644 --- a/src/qtdesktop/qquicklayout_p.h +++ b/src/controls/qquicklayout_p.h diff --git a/src/qtdesktop/qquicklayoutengine.cpp b/src/controls/qquicklayoutengine.cpp index 2ede7af9..2ede7af9 100644 --- a/src/qtdesktop/qquicklayoutengine.cpp +++ b/src/controls/qquicklayoutengine.cpp diff --git a/src/qtdesktop/qquicklayoutengine_p.h b/src/controls/qquicklayoutengine_p.h index 85eca8c3..85eca8c3 100644 --- a/src/qtdesktop/qquicklayoutengine_p.h +++ b/src/controls/qquicklayoutengine_p.h diff --git a/src/qtdesktop/qquicklinearlayout.cpp b/src/controls/qquicklinearlayout.cpp index 29fb026f..015b8cba 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 index 9b71c896..9b71c896 100644 --- a/src/qtdesktop/qquicklinearlayout_p.h +++ b/src/controls/qquicklinearlayout_p.h diff --git a/src/qtdesktop/qtaction.cpp b/src/controls/qtaction.cpp index ba059a05..debdd762 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 index 1e44b003..1e44b003 100644 --- a/src/qtdesktop/qtaction_p.h +++ b/src/controls/qtaction_p.h diff --git a/src/qtdesktop/qtexclusivegroup.cpp b/src/controls/qtexclusivegroup.cpp index 5eccfd0e..fde2a9df 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 index 7d980bd0..7d980bd0 100644 --- a/src/qtdesktop/qtexclusivegroup_p.h +++ b/src/controls/qtexclusivegroup_p.h diff --git a/src/qtdesktop/qtmenu.cpp b/src/controls/qtmenu.cpp index 144f60a6..bd7af0c2 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 index d34138ac..d34138ac 100644 --- a/src/qtdesktop/qtmenu_p.h +++ b/src/controls/qtmenu_p.h diff --git a/src/qtdesktop/qtmenubar.cpp b/src/controls/qtmenubar.cpp index 06d7dbbe..ff4a2031 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 index eb9e8ea5..eb9e8ea5 100644 --- a/src/qtdesktop/qtmenubar_p.h +++ b/src/controls/qtmenubar_p.h diff --git a/src/qtdesktop/qtmenuitem.cpp b/src/controls/qtmenuitem.cpp index d7a4538f..6da06c4e 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 index f9227f26..f9227f26 100644 --- a/src/qtdesktop/qtmenuitem_p.h +++ b/src/controls/qtmenuitem_p.h diff --git a/src/qtdesktop/qtmenupopupwindow.cpp b/src/controls/qtmenupopupwindow.cpp index 4baec976..4baec976 100644 --- a/src/qtdesktop/qtmenupopupwindow.cpp +++ b/src/controls/qtmenupopupwindow.cpp diff --git a/src/qtdesktop/qtmenupopupwindow_p.h b/src/controls/qtmenupopupwindow_p.h index b1a9c051..b1a9c051 100644 --- a/src/qtdesktop/qtmenupopupwindow_p.h +++ b/src/controls/qtmenupopupwindow_p.h diff --git a/src/experimental/Dial.qml b/src/experimental/Dial.qml index 95e32f05..960c1070 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 abbda95e..05abb852 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 32fdaa26..b0a91658 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 556b5780..c9d4cc31 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 db2229c3..0f3774ff 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 f49d4e02..78d947ad 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 4c0dad6e..c26c4ab8 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 5ce0d5f0..963938f4 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 7ccae208..cb4d35d4 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 029403fb..1f55f513 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 2b409aba..fc687f74 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 9d48a602..5ce4d0e2 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 8be53f7a..af66fde9 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 8434f911..07224131 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 0ed608c7..6a5abc9b 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 7d742508..46d504b6 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 ab42c272..c5729f96 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 224acacf..77753b0a 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 a94ef750..10c6ebf6 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 68f4c422..a4885d11 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 b79b6ec5..0942b02b 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 68c37e44..f6e7ee20 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 5ebcc061..341ff53e 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 06f1b876..72d97a6c 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 14bd3909..9de3f359 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 34ddad67..1642d2a4 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 cca7e63c..a45fe229 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 00085802..886cf61b 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 2330e9bd..c5fc5a22 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 0374aa77..a9b84fcb 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 0ea61df4..9a22b00e 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 cbc22f6e..a99180db 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 149b078c..a66ba3c2 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 7c5f7531..4a986666 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 529f09bf..99872bf7 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 e5ba9945..d49c1e62 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 69099586..b29a30c3 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 a042bfd7..61866571 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 e4ccadd4..b29a2260 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 15276394..633fbba4 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 7eebf9d8..157379d5 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 b6b9c388..f156598b 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 59a3700c..06e54f40 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 d5477ff7..d2c94fc6 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 e376fce4..d3bb26c1 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 1e138598..f2d4fd3f 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 c9db6cc6..55fef860 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 4d156d61..0d545e62 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 30a22467..1093e460 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 2ac0dae2..874c18f2 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 fca522e0..2d94749a 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 c645ca53..223c2178 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 7e2ff0c1..a7a72793 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 7f65bddf..5c3f8d59 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS += qtdesktop testplugin +SUBDIRS += controls testplugin diff --git a/tests/auto/qtdesktop/qtdesktop.pro b/tests/auto/controls/controls.pro index 45a1606c..20ee603a 100644 --- a/tests/auto/qtdesktop/qtdesktop.pro +++ b/tests/auto/controls/controls.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = tst_qtdesktop +TARGET = tst_controls IMPORTPATH = $$OUT_PWD/../testplugin @@ -8,7 +8,7 @@ QT += widgets CONFIG += qmltestcase INCLUDEPATH += $$PWD/../../shared -SOURCES += $$PWD/tst_qtdesktop.cpp +SOURCES += $$PWD/tst_controls.cpp TESTDATA = $$PWD/data/* diff --git a/tests/auto/qtdesktop/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml index ce0a4c15..661e1672 100644 --- a/tests/auto/qtdesktop/data/rangemodel/rangemodel.qml +++ b/tests/auto/controls/data/rangemodel/rangemodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop.Private 1.0 +import QtQuick.Controls.Private 1.0 RangeModel { minimumValue: 0 diff --git a/tests/auto/qtdesktop/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml index 3da19494..e550aece 100644 --- a/tests/auto/qtdesktop/data/shortcut/shortcuts.qml +++ b/tests/auto/controls/data/shortcut/shortcuts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 Rectangle { width: 300 diff --git a/tests/auto/qtdesktop/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml index 692e8bc5..b1dd83d3 100644 --- a/tests/auto/qtdesktop/data/tableview/table1_qobjectmodel.qml +++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 -import QtDesktopTest 1.0 +import QtQuick.Controls 1.0 +import QtQuickControlsTests 1.0 TableView { model: TestObject {} diff --git a/tests/auto/qtdesktop/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml index c67c7fac..4487f6c1 100644 --- a/tests/auto/qtdesktop/data/tableview/table2_qabstractitemmodel.qml +++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 -import QtDesktopTest 1.0 +import QtQuick.Controls 1.0 +import QtQuickControlsTests 1.0 TableView { model: TestItemModel {} diff --git a/tests/auto/qtdesktop/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml index f008a72e..8cb13ccc 100644 --- a/tests/auto/qtdesktop/data/tableview/table3_qobjectlist.qml +++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 -import QtDesktopTest 1.0 +import QtQuick.Controls 1.0 +import QtQuickControlsTests 1.0 TableView { model: model_qobjectlist diff --git a/tests/auto/qtdesktop/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml index 2f847cf5..6501dec5 100644 --- a/tests/auto/qtdesktop/data/tableview/table4_qstringlist.qml +++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 -import QtDesktopTest 1.0 +import QtQuick.Controls 1.0 +import QtQuickControlsTests 1.0 TableView { model: model_qstringlist diff --git a/tests/auto/qtdesktop/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml index 0b44b918..05d948bc 100644 --- a/tests/auto/qtdesktop/data/tableview/table5_listmodel.qml +++ b/tests/auto/controls/data/tableview/table5_listmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TableView { diff --git a/tests/auto/qtdesktop/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml index e0723550..d5599b44 100644 --- a/tests/auto/qtdesktop/data/tableview/table6_countmodel.qml +++ b/tests/auto/controls/data/tableview/table6_countmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TableView { model: 3 // qml diff --git a/tests/auto/qtdesktop/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml index 53c2a068..700f3635 100644 --- a/tests/auto/qtdesktop/data/tableview/table7_arraymodel.qml +++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TableView { model: ["A", "B", "C"] // qml diff --git a/tests/auto/qtdesktop/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml index 621cd597..774bb408 100644 --- a/tests/auto/qtdesktop/data/tableview/table8_itemmodel.qml +++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TableView { model: Item { x: 10 }// qml diff --git a/tests/auto/qtdesktop/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml index 2366bf48..d1ec6582 100644 --- a/tests/auto/qtdesktop/data/tst_applicationwindow.qml +++ b/tests/auto/controls/data/tst_applicationwindow.qml @@ -49,9 +49,9 @@ TestCase { height:400 function test_window() { - var tmp = Qt.createQmlObject('import QtDesktop 1.0; ApplicationWindow {id: window}', testCase, ''); - tmp.statusBar = Qt.createQmlObject('import QtDesktop 1.0; StatusBar {}', testCase, ''); - tmp.toolBar = Qt.createQmlObject('import QtDesktop 1.0; ToolBar {}', testCase, ''); + var tmp = Qt.createQmlObject('import QtQuick.Controls 1.0; ApplicationWindow {id: window}', testCase, ''); + tmp.statusBar = Qt.createQmlObject('import QtQuick.Controls 1.0; StatusBar {}', testCase, ''); + tmp.toolBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolBar {}', testCase, ''); verify(tmp.statusBar !== undefined) verify(tmp.toolBar !== undefined) } diff --git a/tests/auto/qtdesktop/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index e971c5cc..757bc64b 100644 --- a/tests/auto/qtdesktop/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -49,17 +49,17 @@ TestCase { height:400 function test_defaultbutton() { - var tmp = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button1}', testCase, ''); + var tmp = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button1}', testCase, ''); compare(tmp.defaultbutton, false); } function test_text() { - var tmp1 = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button2_1}', testCase, ''); + var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_1}', testCase, ''); compare(tmp1.text, ""); tmp1.text = "Hello"; compare(tmp1.text, "Hello"); - var tmp2 = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button2_2; text: "Hello"}', testCase, ''); + var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_2; text: "Hello"}', testCase, ''); compare(tmp2.text, "Hello"); } } diff --git a/tests/auto/qtdesktop/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 8b4abede..449439ef 100644 --- a/tests/auto/qtdesktop/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -58,7 +58,7 @@ Item { } function init() { - checkBox = Qt.createQmlObject("import QtDesktop 1.0; CheckBox { }", container, ""); + checkBox = Qt.createQmlObject("import QtQuick.Controls 1.0; CheckBox { }", container, ""); } function cleanup() { @@ -163,7 +163,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.0; import QtDesktop 1.0; \n" + var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" diff --git a/tests/auto/qtdesktop/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index aaf9e558..08a8c488 100644 --- a/tests/auto/qtdesktop/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -49,7 +49,6 @@ TestCase { height:400 property var model - function init() { model = Qt.createQmlObject("import QtQuick 2.0; ListModel {}", testCase, '') model.append({ text: "Banana", color: "Yellow" }) @@ -58,7 +57,7 @@ TestCase { } function test_keyupdown() { - var comboBox = Qt.createQmlObject('import QtDesktop 1.0; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); comboBox.model = model compare(comboBox.selectedIndex, 0) @@ -74,7 +73,7 @@ TestCase { } function test_textrole() { - var comboBox = Qt.createQmlObject('import QtDesktop 1.0; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); comboBox.model = model comboBox.textRole = "text" compare(comboBox.selectedIndex, 0) diff --git a/tests/auto/qtdesktop/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index 205c327d..1a83a4a5 100644 --- a/tests/auto/qtdesktop/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -49,6 +49,6 @@ TestCase { height:400 function test_createLabel() { - var label = Qt.createQmlObject('import QtDesktop 1.0; Label {}', testCase, ''); + var label = Qt.createQmlObject('import QtQuick.Controls 1.0; Label {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index d7f948a7..6dadfb08 100644 --- a/tests/auto/qtdesktop/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -40,8 +40,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtDesktop 1.0 -import "." +import QtQuick.Controls 1.0 TestCase { id: testcase diff --git a/tests/auto/qtdesktop/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml index b66845ad..f6c04bd4 100644 --- a/tests/auto/qtdesktop/data/tst_menubar.qml +++ b/tests/auto/controls/data/tst_menubar.qml @@ -49,6 +49,6 @@ TestCase { height:400 function test_createMenuBar() { - var menuBar = Qt.createQmlObject('import QtDesktop 1.0; MenuBar {}', testCase, ''); + var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.0; MenuBar {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index 365aa5af..0e5ce78e 100644 --- a/tests/auto/qtdesktop/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createPage() { - var page = Qt.createQmlObject('import QtDesktop 1.0; Page {}', testCase, ''); + var page = Qt.createQmlObject('import QtQuick.Controls 1.0; Page {}', testCase, ''); } diff --git a/tests/auto/qtdesktop/data/tst_pagestack.qml b/tests/auto/controls/data/tst_pagestack.qml index 4f6826d7..14068c72 100644 --- a/tests/auto/qtdesktop/data/tst_pagestack.qml +++ b/tests/auto/controls/data/tst_pagestack.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TestCase { id: testCase diff --git a/tests/auto/qtdesktop/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index bf9056e8..56b2ad0e 100644 --- a/tests/auto/qtdesktop/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_minimumvalue() { - var progressBar = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, ''); progressBar.minimumValue = 5 progressBar.maximumValue = 10 @@ -62,7 +62,7 @@ TestCase { } function test_maximumvalue() { - var progressBar = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, ''); progressBar.minimumValue = 5 progressBar.maximumValue = 10 @@ -75,7 +75,7 @@ TestCase { } function test_invalidMinMax() { - var progressBar = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, ''); // minimumValue has priority over maximum if they are inconsistent @@ -92,7 +92,7 @@ TestCase { progressBar.value = 12 compare(progressBar.value, progressBar.minimumValue) - var progressBar2 = Qt.createQmlObject('import QtDesktop 1.0; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, ''); + var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, ''); compare(progressBar.value, progressBar.minimumValue) } } diff --git a/tests/auto/qtdesktop/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index ba4445db..1ad1b032 100644 --- a/tests/auto/qtdesktop/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -58,7 +58,7 @@ Item { } function init() { - radioButton = Qt.createQmlObject("import QtDesktop 1.0; RadioButton {}", container, ""); + radioButton = Qt.createQmlObject('import QtQuick.Controls 1.0; RadioButton {}', container, ''); } function cleanup() { @@ -133,7 +133,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.0; import QtDesktop 1.0; \n" + var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n" + "Row { \n" + " property alias radioButton1: radioButton1 \n" + " property alias radioButton2: radioButton2 \n" diff --git a/tests/auto/qtdesktop/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml index 259c884c..259c884c 100644 --- a/tests/auto/qtdesktop/data/tst_rangemodel.qml +++ b/tests/auto/controls/data/tst_rangemodel.qml diff --git a/tests/auto/qtdesktop/data/tst_scrollarea.qml b/tests/auto/controls/data/tst_scrollarea.qml index 3e2a70f0..a2c1ed1f 100644 --- a/tests/auto/qtdesktop/data/tst_scrollarea.qml +++ b/tests/auto/controls/data/tst_scrollarea.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TestCase { id: testCase diff --git a/tests/auto/qtdesktop/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml index 8266d511..344fc327 100644 --- a/tests/auto/qtdesktop/data/tst_shortcuts.qml +++ b/tests/auto/controls/data/tst_shortcuts.qml @@ -40,8 +40,8 @@ import QtQuick 2.0 import QtTest 1.0 -import QtDesktop 1.0 -import QtDesktop.Private 1.0 +import QtQuick.Controls 1.0 +import QtQuick.Controls.Private 1.0 TestCase { id: testCase diff --git a/tests/auto/qtdesktop/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 41c2d761..70dc3d92 100644 --- a/tests/auto/qtdesktop/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_minimumvalue() { - var slider = Qt.createQmlObject('import QtDesktop 1.0; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -59,7 +59,7 @@ TestCase { } function test_maximumvalue() { - var slider = Qt.createQmlObject('import QtDesktop 1.0; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 diff --git a/tests/auto/qtdesktop/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 9f002c11..fe482308 100644 --- a/tests/auto/qtdesktop/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -56,7 +56,7 @@ Item { property point downCoord: "0,0" function test_increment_key() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {maximumValue: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '') spinbox.forceActiveFocus() compare(spinbox.maximumValue, 50) @@ -71,7 +71,7 @@ Item { } function test_decrement_key() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {minimumValue: 10}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '') spinbox.forceActiveFocus() compare(spinbox.minimumValue, 10) @@ -86,7 +86,7 @@ Item { } function test_increment_mouse() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {maximumValue: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -101,7 +101,7 @@ Item { } function test_decrement_mouse() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {minimumValue: 10}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -116,7 +116,7 @@ Item { } function test_move_mouse() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -140,7 +140,7 @@ Item { } function test_maxvalue() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.value = spinbox.maximumValue + 1 compare(spinbox.value, spinbox.maximumValue) @@ -156,7 +156,7 @@ Item { } function test_minvalue() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.value = spinbox.minimumValue - 1 compare(spinbox.value, spinbox.minimumValue) @@ -172,7 +172,7 @@ Item { } function test_nanvalue() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') // It is not possible to set a string to the spinbox value. // Nan is a valid number though spinbox.value = NaN @@ -181,7 +181,7 @@ Item { } function test_decimals() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.decimals = 0 spinbox.value = 1.00001 @@ -208,7 +208,7 @@ Item { function test_stepsize() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.stepSize = 2 @@ -226,7 +226,7 @@ Item { function test_negativeStepSize() { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = -50 @@ -257,7 +257,7 @@ Item { function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents { - var spinbox = Qt.createQmlObject('import QtDesktop 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = -50 spinbox.maximumValue = 50 diff --git a/tests/auto/qtdesktop/data/tst_splitter.qml b/tests/auto/controls/data/tst_splitter.qml index cb34cacb..a4a50f50 100644 --- a/tests/auto/qtdesktop/data/tst_splitter.qml +++ b/tests/auto/controls/data/tst_splitter.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtDesktop 1.0 +import QtQuick.Controls 1.0 TestCase { id: testCase diff --git a/tests/auto/qtdesktop/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml index 942ae6c6..4eb9bd82 100644 --- a/tests/auto/qtdesktop/data/tst_statusbar.qml +++ b/tests/auto/controls/data/tst_statusbar.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createStatusBar() { - var statusBar = Qt.createQmlObject('import QtDesktop 1.0; StatusBar {}', testCase, ''); + var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.0; StatusBar {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml index 648aa9d5..c20b2ea2 100644 --- a/tests/auto/qtdesktop/data/tst_tab.qml +++ b/tests/auto/controls/data/tst_tab.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createTab() { - var tab = Qt.createQmlObject('import QtDesktop 1.0; Tab {}', testCase, ''); + var tab = Qt.createQmlObject('import QtQuick.Controls 1.0; Tab {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/data/tst_tabframe.qml b/tests/auto/controls/data/tst_tabframe.qml index 4d21c148..4c6d7992 100644 --- a/tests/auto/qtdesktop/data/tst_tabframe.qml +++ b/tests/auto/controls/data/tst_tabframe.qml @@ -49,11 +49,11 @@ TestCase { height:400 function test_createTabFrame() { - var tabFrame = Qt.createQmlObject('import QtDesktop 1.0; TabFrame {}', testCase, ''); + var tabFrame = Qt.createQmlObject('import QtQuick.Controls 1.0; TabFrame {}', testCase, ''); } function test_repeater() { - var tabFrame = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; TabFrame { Repeater { model: 3; Tab { } } }', testCase, ''); + var tabFrame = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabFrame { Repeater { model: 3; Tab { } } }', testCase, ''); compare(tabFrame.count, 3) } } diff --git a/tests/auto/qtdesktop/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 4d051ad4..bf7c9bb4 100644 --- a/tests/auto/qtdesktop/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -40,8 +40,8 @@ import QtQuick 2.0 import QtTest 1.0 -import QtDesktop 1.0 -import QtDesktopTest 1.0 +import QtQuick.Controls 1.0 +import QtQuickControlsTests 1.0 TestCase { id: testCase diff --git a/tests/auto/qtdesktop/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml index 6de32ef1..a7a75759 100644 --- a/tests/auto/qtdesktop/data/tst_tableviewcolumn.qml +++ b/tests/auto/controls/data/tst_tableviewcolumn.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createTableViewColumn() { - var tableViewColumn = Qt.createQmlObject('import QtDesktop 1.0; TableViewColumn {}', testCase, ''); + var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.0; TableViewColumn {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index d266a403..105f19c7 100644 --- a/tests/auto/qtdesktop/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -49,7 +49,7 @@ TestCase { height: 400 function test_append() { - var textarea = Qt.createQmlObject('import QtDesktop 1.0; TextArea {}', testCase, '') + var textarea = Qt.createQmlObject('import QtQuick.Controls 1.0; TextArea {}', testCase, '') compare(textarea.text, "") diff --git a/tests/auto/qtdesktop/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 69cd503c..1f051e74 100644 --- a/tests/auto/qtdesktop/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -49,7 +49,7 @@ TestCase { height: 400 function test_text() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') compare(textfield.text, "") textfield.text = "hello world" @@ -57,7 +57,7 @@ TestCase { } function test_maximumLength() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.text = "hello world" textfield.maximumLength = 5 @@ -65,7 +65,7 @@ TestCase { } function test_length() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.text = "hello world" compare(textfield.length, 11) @@ -73,7 +73,7 @@ TestCase { function test_readonly() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() compare(textfield.readOnly, false) @@ -84,7 +84,7 @@ TestCase { } function test_inputMask() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() // +/- not required, 1 digit required, 1 aphabetic character required and 2 digits not required @@ -122,7 +122,7 @@ TestCase { } function test_validator() { - var textfield = Qt.createQmlObject('import QtQuick 2.0; import QtDesktop 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') textfield.text = "blu" compare(textfield.acceptableInput, false) @@ -135,7 +135,7 @@ TestCase { } function test_selectAll() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -146,7 +146,7 @@ TestCase { } function test_select() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -160,7 +160,7 @@ TestCase { } function test_cursorPosition() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() compare(textfield.cursorPosition, 0) @@ -175,7 +175,7 @@ TestCase { } function test_selectWord() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -187,14 +187,14 @@ TestCase { } function copy() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.text = "this is my text" textfield.select(0, 5) textfield.copy() } function test_getText() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -203,7 +203,7 @@ TestCase { } function test_insert() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -212,7 +212,7 @@ TestCase { } function test_deselect() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -222,7 +222,7 @@ TestCase { } function test_undo() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -233,7 +233,7 @@ TestCase { } function test_redo() { - var textfield = Qt.createQmlObject('import QtDesktop 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') textfield.forceActiveFocus() textfield.text = "this is my text" diff --git a/tests/auto/qtdesktop/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index 534fb5c7..9c125604 100644 --- a/tests/auto/qtdesktop/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createToolBar() { - var toolBar = Qt.createQmlObject('import QtDesktop 1.0; ToolBar {}', testCase, ''); + var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolBar {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 9708ce8b..61c3d308 100644 --- a/tests/auto/qtdesktop/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createToolButton() { - var toolButton = Qt.createQmlObject('import QtDesktop 1.0; ToolButton {}', testCase, ''); + var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {}', testCase, ''); } } diff --git a/tests/auto/qtdesktop/tst_qtdesktop.cpp b/tests/auto/controls/tst_controls.cpp index a1c9da35..e63c01b0 100644 --- a/tests/auto/qtdesktop/tst_qtdesktop.cpp +++ b/tests/auto/controls/tst_controls.cpp @@ -39,5 +39,5 @@ ** ****************************************************************************/ #include <QtQuickTest/quicktest.h> -#include "qtdc_quicktest.h" -QTDC_QUICK_TEST_MAIN(qtdesktop) +#include "qt_quick_controls_quicktest.h" +QT_QUICK_CONTROLS_TEST_MAIN(qtquickcontrols) diff --git a/tests/auto/testplugin/QtDesktopTest/qmldir b/tests/auto/testplugin/QtDesktopTest/qmldir deleted file mode 100644 index 8b6dadac..00000000 --- a/tests/auto/testplugin/QtDesktopTest/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module QtDesktopTest -plugin testplugin diff --git a/tests/auto/testplugin/QtQuickControlsTests/qmldir b/tests/auto/testplugin/QtQuickControlsTests/qmldir new file mode 100644 index 00000000..10c6cbab --- /dev/null +++ b/tests/auto/testplugin/QtQuickControlsTests/qmldir @@ -0,0 +1,2 @@ +module QtQuickControlsTests +plugin testplugin diff --git a/tests/auto/testplugin/testplugin.h b/tests/auto/testplugin/testplugin.h index ee0d58ac..cc3d854b 100644 --- a/tests/auto/testplugin/testplugin.h +++ b/tests/auto/testplugin/testplugin.h @@ -47,7 +47,7 @@ class TestPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtdesktopcomponents.QQmlExtensionInterface" FILE "testplugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "testplugin.json") public: void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro index b0df3acd..12fb19fd 100644 --- a/tests/auto/testplugin/testplugin.pro +++ b/tests/auto/testplugin/testplugin.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin TARGET = testplugin -TARGETPATH = QtDesktopTest +TARGETPATH = QtQuickControlsTests QT += qml quick widgets diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml index a40effad..1c14f76d 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 18942b5a..e184aff8 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 590008e6..167d0357 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 9857a66d..b0a94eb0 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 8472ca04..0f93e31d 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 4ddd15ae..085757c1 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 e1efb566..e01701c4 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 c23ea96c..67a53550 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 4f6bcdf8..e1217394 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 5d9290e9..8e46dfbc 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 81b4d474..4184702b 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 abdedc81..69cf2e3e 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 985e0dad..ef80f0d7 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 61ebc201..dbd6b4e8 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 3f3f9a9a..c6b1cdf0 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 index a53654f0..9164de1f 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; \ } |