aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-21 14:19:23 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-21 15:48:05 +0000
commit1ef2c051ec88c5579634f05f5983694a868b8efa (patch)
tree9a4f232072834a869ba0fb833871da357dd347b0 /src
parent6a73a4cbbfcd26c4d3a5706105782f3fcb5ebd60 (diff)
import Qt.labs.controls 1.0 => QtQuick.Controls 2.0
Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/BusyIndicator.qml4
-rw-r--r--src/imports/controls/CheckBox.qml2
-rw-r--r--src/imports/controls/CheckDelegate.qml2
-rw-r--r--src/imports/controls/ComboBox.qml2
-rw-r--r--src/imports/controls/Dial.qml2
-rw-r--r--src/imports/controls/Menu.qml2
-rw-r--r--src/imports/controls/ProgressBar.qml2
-rw-r--r--src/imports/controls/RadioButton.qml2
-rw-r--r--src/imports/controls/StackView.qml2
-rw-r--r--src/imports/controls/SwipeView.qml2
-rw-r--r--src/imports/controls/Switch.qml2
-rw-r--r--src/imports/controls/SwitchDelegate.qml2
-rw-r--r--src/imports/controls/ToolTip.qml2
-rw-r--r--src/imports/controls/Tumbler.qml2
-rw-r--r--src/imports/controls/controls.pro4
-rw-r--r--src/imports/controls/doc/snippets/basic-example.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-label.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml2
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc8
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-material.qdoc8
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc8
-rw-r--r--src/imports/controls/material/ApplicationWindow.qml2
-rw-r--r--src/imports/controls/material/BusyIndicator.qml4
-rw-r--r--src/imports/controls/material/Button.qml2
-rw-r--r--src/imports/controls/material/CheckBox.qml4
-rw-r--r--src/imports/controls/material/CheckDelegate.qml4
-rw-r--r--src/imports/controls/material/CheckIndicator.qml2
-rw-r--r--src/imports/controls/material/ComboBox.qml4
-rw-r--r--src/imports/controls/material/Dial.qml2
-rw-r--r--src/imports/controls/material/Drawer.qml2
-rw-r--r--src/imports/controls/material/Frame.qml2
-rw-r--r--src/imports/controls/material/GroupBox.qml2
-rw-r--r--src/imports/controls/material/ItemDelegate.qml2
-rw-r--r--src/imports/controls/material/Label.qml2
-rw-r--r--src/imports/controls/material/Menu.qml4
-rw-r--r--src/imports/controls/material/MenuItem.qml4
-rw-r--r--src/imports/controls/material/Page.qml2
-rw-r--r--src/imports/controls/material/PageIndicator.qml2
-rw-r--r--src/imports/controls/material/Pane.qml2
-rw-r--r--src/imports/controls/material/Popup.qml2
-rw-r--r--src/imports/controls/material/ProgressBar.qml4
-rw-r--r--src/imports/controls/material/RadioButton.qml4
-rw-r--r--src/imports/controls/material/RadioDelegate.qml2
-rw-r--r--src/imports/controls/material/RadioIndicator.qml4
-rw-r--r--src/imports/controls/material/RangeSlider.qml4
-rw-r--r--src/imports/controls/material/Ripple.qml2
-rw-r--r--src/imports/controls/material/ScrollBar.qml2
-rw-r--r--src/imports/controls/material/ScrollIndicator.qml2
-rw-r--r--src/imports/controls/material/Slider.qml4
-rw-r--r--src/imports/controls/material/SliderHandle.qml2
-rw-r--r--src/imports/controls/material/SpinBox.qml4
-rw-r--r--src/imports/controls/material/SwipeDelegate.qml4
-rw-r--r--src/imports/controls/material/Switch.qml4
-rw-r--r--src/imports/controls/material/SwitchDelegate.qml4
-rw-r--r--src/imports/controls/material/SwitchIndicator.qml4
-rw-r--r--src/imports/controls/material/TabBar.qml2
-rw-r--r--src/imports/controls/material/TabButton.qml2
-rw-r--r--src/imports/controls/material/TextArea.qml2
-rw-r--r--src/imports/controls/material/TextField.qml2
-rw-r--r--src/imports/controls/material/ToolBar.qml2
-rw-r--r--src/imports/controls/material/ToolButton.qml2
-rw-r--r--src/imports/controls/material/ToolTip.qml2
-rw-r--r--src/imports/controls/material/Tumbler.qml4
-rw-r--r--src/imports/controls/material/material.pro4
-rw-r--r--src/imports/controls/material/qmldir4
-rw-r--r--src/imports/controls/material/qtquickmaterialstyleplugin.cpp22
-rw-r--r--src/imports/controls/qmldir2
-rw-r--r--src/imports/controls/qtquickcontrols2plugin.cpp106
-rw-r--r--src/imports/controls/universal/ApplicationWindow.qml4
-rw-r--r--src/imports/controls/universal/BusyIndicator.qml4
-rw-r--r--src/imports/controls/universal/Button.qml2
-rw-r--r--src/imports/controls/universal/CheckBox.qml4
-rw-r--r--src/imports/controls/universal/CheckDelegate.qml2
-rw-r--r--src/imports/controls/universal/CheckIndicator.qml2
-rw-r--r--src/imports/controls/universal/ComboBox.qml4
-rw-r--r--src/imports/controls/universal/Dial.qml2
-rw-r--r--src/imports/controls/universal/Drawer.qml2
-rw-r--r--src/imports/controls/universal/Frame.qml2
-rw-r--r--src/imports/controls/universal/GroupBox.qml2
-rw-r--r--src/imports/controls/universal/ItemDelegate.qml2
-rw-r--r--src/imports/controls/universal/Label.qml2
-rw-r--r--src/imports/controls/universal/Menu.qml4
-rw-r--r--src/imports/controls/universal/MenuItem.qml2
-rw-r--r--src/imports/controls/universal/Page.qml2
-rw-r--r--src/imports/controls/universal/PageIndicator.qml2
-rw-r--r--src/imports/controls/universal/Pane.qml2
-rw-r--r--src/imports/controls/universal/Popup.qml2
-rw-r--r--src/imports/controls/universal/ProgressBar.qml4
-rw-r--r--src/imports/controls/universal/RadioButton.qml4
-rw-r--r--src/imports/controls/universal/RadioDelegate.qml2
-rw-r--r--src/imports/controls/universal/RadioIndicator.qml2
-rw-r--r--src/imports/controls/universal/RangeSlider.qml2
-rw-r--r--src/imports/controls/universal/ScrollBar.qml2
-rw-r--r--src/imports/controls/universal/ScrollIndicator.qml2
-rw-r--r--src/imports/controls/universal/Slider.qml2
-rw-r--r--src/imports/controls/universal/SpinBox.qml2
-rw-r--r--src/imports/controls/universal/StackView.qml2
-rw-r--r--src/imports/controls/universal/SwipeDelegate.qml2
-rw-r--r--src/imports/controls/universal/Switch.qml2
-rw-r--r--src/imports/controls/universal/SwitchDelegate.qml2
-rw-r--r--src/imports/controls/universal/SwitchIndicator.qml2
-rw-r--r--src/imports/controls/universal/TabBar.qml2
-rw-r--r--src/imports/controls/universal/TabButton.qml2
-rw-r--r--src/imports/controls/universal/TextArea.qml2
-rw-r--r--src/imports/controls/universal/TextField.qml2
-rw-r--r--src/imports/controls/universal/ToolBar.qml2
-rw-r--r--src/imports/controls/universal/ToolButton.qml2
-rw-r--r--src/imports/controls/universal/ToolTip.qml2
-rw-r--r--src/imports/controls/universal/Tumbler.qml4
-rw-r--r--src/imports/controls/universal/qmldir4
-rw-r--r--src/imports/controls/universal/qtquickuniversalstyleplugin.cpp20
-rw-r--r--src/imports/controls/universal/universal.pro4
-rw-r--r--src/quickcontrols2/qquickstyle.cpp2
-rw-r--r--src/quicktemplates2/qquickapplicationwindow.cpp2
-rw-r--r--src/quicktemplates2/qquickpage.cpp2
-rw-r--r--src/quicktemplates2/qquickpopup.cpp2
-rw-r--r--src/quicktemplates2/qquicktooltip.cpp2
248 files changed, 359 insertions, 359 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index 00a329d6..44c61355 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -35,8 +35,8 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.impl 2.0
import QtQuick.Templates 2.0 as T
T.BusyIndicator {
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 1ac97160..ec0025bc 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls.impl 2.0
T.CheckBox {
id: control
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index d1f43816..0296f0c5 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls.impl 2.0
T.CheckDelegate {
id: control
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index ef0b504e..66d27da4 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.ComboBox {
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index 41e8e5e0..a3dfff08 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls.impl 2.0
import QtQuick.Templates 2.0 as T
T.Dial {
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index c902c66b..4eee635d 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.Menu {
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index 81468385..6de9e1cc 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls.impl 2.0
T.ProgressBar {
id: control
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 6a3cc62d..11e2ca7a 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.RadioButton {
diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml
index 52ba9fe0..aa95c6a7 100644
--- a/src/imports/controls/StackView.qml
+++ b/src/imports/controls/StackView.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.4
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.StackView {
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml
index 3aafbb39..71676f12 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/SwipeView.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.SwipeView {
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index d01d36fe..1b77e25f 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls.impl 2.0
T.Switch {
id: control
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index 725a4c2d..caf8e9e1 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.impl 1.0
+import QtQuick.Controls.impl 2.0
T.SwitchDelegate {
id: control
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml
index b317d57c..0cdfc39b 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/ToolTip.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.ToolTip {
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml
index 54e4301a..680ea956 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/Tumbler.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
T.Tumbler {
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index a08cd675..87601f5d 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -1,6 +1,6 @@
TARGET = qtquickcontrols2plugin
-TARGETPATH = Qt/labs/controls
-IMPORT_VERSION = 1.0
+TARGETPATH = QtQuick/Controls.2
+IMPORT_VERSION = 2.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
diff --git a/src/imports/controls/doc/snippets/basic-example.qml b/src/imports/controls/doc/snippets/basic-example.qml
index 11fee906..62ab2466 100644
--- a/src/imports/controls/doc/snippets/basic-example.qml
+++ b/src/imports/controls/doc/snippets/basic-example.qml
@@ -27,7 +27,7 @@
//! [0]
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ApplicationWindow {
title: "My Application"
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml b/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
index f0cf7203..dfbf4fbc 100644
--- a/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
+++ b/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import Qt.labs.calendar 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
ListView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
index 5ccd8f20..b003cd82 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
BusyIndicator {
background: Rectangle {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
index 8f212c37..87a8a0fe 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
BusyIndicator {
Rectangle {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml
index 703161a4..f895718c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
BusyIndicator {
}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
index 7c0a6b50..4c179384 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
index ee59ab7f..482eee54 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml
index 13037b8d..f4555c90 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml
index ee72caf6..a99346a6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml
index 692d9066..f206bcec 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml
index 9fde2fc4..8a941561 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button.qml
index 86d339b7..9398fc88 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Button {
text: "Button"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
index 566202b5..c53604b9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "CheckBox"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml
index 3acb9321..075e6342 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "Checked"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
index bef150a3..282cfb59 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "CheckBox"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml
index 6069edad..4878cf31 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "Disabled"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml
index a90a42d6..93f1c214 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "Focused"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
index ae9a0b0a..041871f1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "CheckBox"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml
index bc86f927..a840116e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "Normal"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml
index 2bf74b42..31dc23a9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckBox {
text: "CheckBox"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
index fe60d47c..ab868506 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckDelegate {
text: "CheckDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
index d1c83028..377fa39f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckDelegate {
text: "CheckDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
index e3ba48b8..0af46fbe 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
CheckDelegate {
text: "CheckDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
index d6715f07..a61cf18d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ComboBox {
model: ["ComboBox"]
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
index 08523088..cd3383c7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ComboBox {
model: ["ComboBox"]
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml
index 1241eeaa..d8b5d1fa 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml
index 0fea67d1..36569e15 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml
index 4d7fe7fd..b42dd92c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
index 333db1ca..46187995 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Dial {
Rectangle {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml
index 73794cc0..19d943a6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Dial {
id: dial
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml
index b42e418d..2db73616 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Dial {
}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
index 08084e61..90537ddd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Frame {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
index 7fadc9e5..1ede733d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
Frame {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
index 480aa8e6..c379a7ce 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
GroupBox {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
index 1c1232c7..a2999925 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
GroupBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml
index 53da863b..74d0ea52 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
GroupBox {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
index 81b234f4..f79f3aef 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
GroupBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
index 85aba1c8..81148ebd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ItemDelegate {
text: "ItemDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
index aa7d5e2b..76082088 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ItemDelegate {
text: "ItemDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
index 13e8b6cf..9a293d3c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ItemDelegate {
text: "ItemDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
index d02f722a..143b3323 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
ListView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
index 55cbf4eb..b08f2ff5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Label {
text: "Label"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
index cb26658d..4346c0eb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
Label {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
index 0c270d34..ffbaa934 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: window
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml
index b0f32203..363d2d3e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: window
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
index 1c6a53b6..a6a4a9e3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
PageIndicator {
count: 5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
index b36b78bf..039a0507 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
PageIndicator {
count: 5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml
index 39247607..4b3ccf23 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
PageIndicator {
count: 5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
index c37b37c6..237bc6e7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
@@ -25,7 +25,7 @@
**
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
PageIndicator {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
index d1d9f22f..40a07495 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Pane {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
index 09bfa6a0..3d86499f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
Pane {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
index 55e71b81..2a5ddc4e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ProgressBar {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
index 0bb1b418..068eff76 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ProgressBar {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml
index 0f74ea46..81c9f4ac 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ProgressBar {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml
index e1c200b5..a332d4c5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ProgressBar {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
index d7c6d258..21f22e6f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "RadioButton"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml
index 49f82a5c..c1b1acce 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-checked.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "Checked"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
index 14bb7c47..1d54af6b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "RadioButton"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml
index 1a087593..7ab68910 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "Disabled"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml
index 2ad1cbfc..316a4653 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "Focused"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
index d36932dc..b138c25d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "RadioButton"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml
index 8c746468..b5ea853b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "Normal"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml
index 8f898d18..2b41fb65 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioButton {
text: "RadioButton"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
index 8d6fd78a..99123371 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioDelegate {
text: "RadioDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
index a1b08c4e..b14a2f13 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioDelegate {
text: "RadioDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
index ffb91097..d8b0e395 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RadioDelegate {
text: "RadioDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
index 2b8ab5a1..a948f319 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml
index af167461..e239b72f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml
index 04081cb8..a05c8291 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml
index f27f904a..c5f064b0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-first-handle.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml
index 343c24e9..a41fbfad 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml
index 15da7776..ec19d0c0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml
index dd54d2fb..2e2123de 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-second-handle.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml
index 343c24e9..a41fbfad 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
RangeSlider {
first.value: 0.25
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
index 8903f064..086541c8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
index 90d341b9..eebb5157 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ScrollBar {
size: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
index d1ce40d7..f039e291 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ScrollBar {
size: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml
index b677137d..dc2c03d1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Frame {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
index 3399e5fb..c118c7aa 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
index b276e8ae..9e540cf9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ScrollIndicator {
size: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
index ef85fe69..c32539be 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ScrollIndicator {
size: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml
index 8efa0eed..47fe97f8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Frame {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
index 74c4fbb6..94f4a176 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Slider {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml
index 57429fb4..bde161aa 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Slider {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml
index 69a24b1a..b32f8b5a 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Slider {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml
index 58bd139e..20b569f3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Slider {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml
index 331d076a..8363e862 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Slider {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml
index 331d076a..8363e862 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Slider {
value: 0.5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
index 21d1fe92..6cf47ac9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SpinBox {
value: 50
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
index 5d1f66f6..e226fc09 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SpinBox {
value: 50
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml
index 2294741c..419dae5c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SpinBox {
value: 50
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
index b7d7b9b8..814b8b28 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
SpinBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml
index dc6887c0..b4b0fab3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SpinBox {
value: 50
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
index a8adfbd6..6616ed60 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
SpinBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
index be665771..4a37a13f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SwipeDelegate {
text: "SwipeDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
index 897d4792..8284f7e4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SwipeDelegate {
text: "SwipeDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
index e184dc64..2a5be1a0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SwipeDelegate {
text: "SwipeDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
index 97f57dca..7a51314b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ListView {
id: listView
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
index c3a38b92..2ba8df9c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
width: 200
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
index 1829bb26..605df1f4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Switch"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml
index 4a2ff8f9..f9a18b1c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Checked"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
index 99f2af7e..2e68086b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Switch"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml
index c84afdb1..a40586b5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Disabled"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml
index e1b5bd3f..f98f2c90 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Focused"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
index 12d4f20d..7be24128 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Switch"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml
index 9a766524..a55c2854 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Normal"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml
index 9e30f8d5..56ef3985 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Switch {
text: "Switch"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
index 65342e74..27be5e86 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SwitchDelegate {
text: "SwitchDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
index 2aeb9082..121904cd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SwitchDelegate {
text: "SwitchDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
index 258a011a..b3b1d121 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
SwitchDelegate {
text: "SwitchDelegate"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
index a0282d91..b445ee67 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.3
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Column {
width: 300
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
index 5412db66..67e5e1e0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
TabBar {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
index c99fdd13..84994008 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
TextArea {
text: "Text\nArea..."
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
index 87324b2d..8e012d19 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
index e4359d57..ac798f53 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
index 9bbcb8ad..a4e1b3b1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
index de360a33..12c7ead9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml
index 838bd111..53ffd6d6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
TextField {
text: "TextField"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
index 486e841f..6eed06bb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ToolBar {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
index 7def9a83..561bf358 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ToolBar {
RowLayout {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
index 62338070..619fac71 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ToolButton {
text: "ToolButton"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
index 9a25d130..6f78e45d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ToolButton {
text: "ToolButton"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml
index 0db6bfe2..625e214d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
ToolBar {
ToolButton {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
index fe4f33a5..22444739 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
index 2a62c86a..c05ee534 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
index a8df6277..330ab83c 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
Button {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
index 47f1440c..eddb09e6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
//! [1]
Button {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
index cac6872c..e6a386c1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
index 08ee995d..c85f91bb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
@@ -27,7 +27,7 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
index 8a423cac..dcb2d942 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Tumbler {
model: 5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
index 0e26661e..989c4521 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Tumbler {
model: 5
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml
index cf18fd93..4d389ab7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Tumbler {
id: tumbler
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml
index f96ed893..77ddd6b2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
Tumbler {
model: 5
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
index 85f4fa85..0d9d52aa 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
@@ -62,7 +62,7 @@
\code
// main.qml
import QtQuick 2.6
- import Qt.labs.controls 1.0
+ import QtQuick.Controls 2.0
ApplicationWindow {
id: window
@@ -81,7 +81,7 @@
\code
// CustomButton.qml
import QtQuick 2.6
- import Qt.labs.controls 1.0
+ import QtQuick.Controls 2.0
Button {
id: control
@@ -103,8 +103,8 @@
// +material/CustomButton.qml
import QtQuick 2.6
import QtGraphicalEffects 1.0
- import Qt.labs.controls 1.0
- import Qt.labs.controls.material 1.0
+ import QtQuick.Controls 2.0
+ import QtQuick.Controls.Material 2.0
Button {
id: control
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index 8f39497f..5b425741 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -75,8 +75,8 @@
\li
\qml
import QtQuick 2.0
- import Qt.labs.controls 1.0
- import Qt.labs.controls.material 1.0
+ import QtQuick.Controls 2.0
+ import QtQuick.Controls.Material 2.0
Button {
text: "Stop"
@@ -100,8 +100,8 @@
\li
\qml
import QtQuick 2.0
- import Qt.labs.controls 1.0
- import Qt.labs.controls.material 1.0
+ import QtQuick.Controls 2.0
+ import QtQuick.Controls.Material 2.0
ApplicationWindow {
visible: true
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index fe509a6c..507c3a0f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -39,7 +39,7 @@
using the following import statement in your .qml file:
\badcode
- import Qt.labs.controls 1.0
+ import QtQuick.Controls 2.0
\endcode
The calendar related QML types can be imported using the
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index 86d53397..4ed13d75 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -75,8 +75,8 @@
\li
\qml
import QtQuick 2.0
- import Qt.labs.controls 1.0
- import Qt.labs.controls.universal 1.0
+ import QtQuick.Controls 2.0
+ import QtQuick.Controls.Universal 2.0
Button {
text: "Stop"
@@ -100,8 +100,8 @@
\li
\qml
import QtQuick 2.0
- import Qt.labs.controls 1.0
- import Qt.labs.controls.universal 1.0
+ import QtQuick.Controls 2.0
+ import QtQuick.Controls.Universal 2.0
ApplicationWindow {
visible: true
diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml
index 26604fdb..a09cd89f 100644
--- a/src/imports/controls/material/ApplicationWindow.qml
+++ b/src/imports/controls/material/ApplicationWindow.qml
@@ -37,7 +37,7 @@
import QtQuick 2.6
import QtQuick.Window 2.2
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ApplicationWindow {
id: window
diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml
index f631dfb1..bf3d445e 100644
--- a/src/imports/controls/material/BusyIndicator.qml
+++ b/src/imports/controls/material/BusyIndicator.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.BusyIndicator {
id: control
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 330d2eb8..1be54234 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
import QtGraphicalEffects 1.0
T.Button {
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index e9331f60..a93a1bb1 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.CheckBox {
id: control
diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml
index 8381aeed..99248433 100644
--- a/src/imports/controls/material/CheckDelegate.qml
+++ b/src/imports/controls/material/CheckDelegate.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.CheckDelegate {
id: control
diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml
index 31e1abaf..b41321fd 100644
--- a/src/imports/controls/material/CheckIndicator.qml
+++ b/src/imports/controls/material/CheckIndicator.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
Rectangle {
id: indicatorItem
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index cc5268d1..aeeca1ea 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -36,9 +36,9 @@
import QtQuick 2.6
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
import QtGraphicalEffects 1.0
T.ComboBox {
diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml
index 1f1c986c..5d1f6270 100644
--- a/src/imports/controls/material/Dial.qml
+++ b/src/imports/controls/material/Dial.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Dial {
id: control
diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml
index 35a362de..b7d7cfc5 100644
--- a/src/imports/controls/material/Drawer.qml
+++ b/src/imports/controls/material/Drawer.qml
@@ -37,7 +37,7 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Drawer {
id: control
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index 7a7dacf8..65eab21a 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Frame {
id: control
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml
index 2d1f80c2..8e7704a0 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/imports/controls/material/GroupBox.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.GroupBox {
id: control
diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml
index 89a870ac..0135a0ec 100644
--- a/src/imports/controls/material/ItemDelegate.qml
+++ b/src/imports/controls/material/ItemDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ItemDelegate {
id: control
diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml
index c179bdf4..8bda5cc2 100644
--- a/src/imports/controls/material/Label.qml
+++ b/src/imports/controls/material/Label.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Label {
id: control
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml
index c53b031c..2d4e7fac 100644
--- a/src/imports/controls/material/Menu.qml
+++ b/src/imports/controls/material/Menu.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
import QtGraphicalEffects 1.0
T.Menu {
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml
index e687a78f..e537870c 100644
--- a/src/imports/controls/material/MenuItem.qml
+++ b/src/imports/controls/material/MenuItem.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.MenuItem {
id: control
diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml
index adeb8b64..b155b2e1 100644
--- a/src/imports/controls/material/Page.qml
+++ b/src/imports/controls/material/Page.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Page {
id: control
diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml
index 6bde1473..085a131d 100644
--- a/src/imports/controls/material/PageIndicator.qml
+++ b/src/imports/controls/material/PageIndicator.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.PageIndicator {
id: control
diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml
index 642dc1f1..43f9e34a 100644
--- a/src/imports/controls/material/Pane.qml
+++ b/src/imports/controls/material/Pane.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Pane {
id: control
diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml
index bfee632a..08bfaa19 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/imports/controls/material/Popup.qml
@@ -37,7 +37,7 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Popup {
id: control
diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml
index a475c648..cab54952 100644
--- a/src/imports/controls/material/ProgressBar.qml
+++ b/src/imports/controls/material/ProgressBar.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.ProgressBar {
id: control
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index bcfd071f..02687315 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.RadioButton {
id: control
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml
index 88c1aa5c..8bcc86f8 100644
--- a/src/imports/controls/material/RadioDelegate.qml
+++ b/src/imports/controls/material/RadioDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.RadioDelegate {
id: control
diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml
index 0d4b9c9c..dbd950de 100644
--- a/src/imports/controls/material/RadioIndicator.qml
+++ b/src/imports/controls/material/RadioIndicator.qml
@@ -35,8 +35,8 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
Rectangle {
implicitWidth: 20
diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml
index fdca41fb..d7589cfd 100644
--- a/src/imports/controls/material/RangeSlider.qml
+++ b/src/imports/controls/material/RangeSlider.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.RangeSlider {
id: control
diff --git a/src/imports/controls/material/Ripple.qml b/src/imports/controls/material/Ripple.qml
index c3415712..15650384 100644
--- a/src/imports/controls/material/Ripple.qml
+++ b/src/imports/controls/material/Ripple.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
Rectangle {
property Item control
diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml
index a930e167..41ee5eff 100644
--- a/src/imports/controls/material/ScrollBar.qml
+++ b/src/imports/controls/material/ScrollBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ScrollBar {
id: control
diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml
index 9a7b1b5d..0219aa2f 100644
--- a/src/imports/controls/material/ScrollIndicator.qml
+++ b/src/imports/controls/material/ScrollIndicator.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ScrollIndicator {
id: control
diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml
index 3a892fff..8401bea5 100644
--- a/src/imports/controls/material/Slider.qml
+++ b/src/imports/controls/material/Slider.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.Slider {
id: control
diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml
index 5b20dbb9..49f833d0 100644
--- a/src/imports/controls/material/SliderHandle.qml
+++ b/src/imports/controls/material/SliderHandle.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
Item {
id: root
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index 447ac411..828ac9cb 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -37,8 +37,8 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.SpinBox {
id: control
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index da6d7d72..4dc666e7 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.SwipeDelegate {
id: control
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml
index f256781a..37776100 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/imports/controls/material/Switch.qml
@@ -35,8 +35,8 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
import QtQuick.Templates 2.0 as T
T.Switch {
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml
index adfd508d..217cdcca 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/imports/controls/material/SwitchDelegate.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
T.SwitchDelegate {
id: control
diff --git a/src/imports/controls/material/SwitchIndicator.qml b/src/imports/controls/material/SwitchIndicator.qml
index 24d37b8a..403587b9 100644
--- a/src/imports/controls/material/SwitchIndicator.qml
+++ b/src/imports/controls/material/SwitchIndicator.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtGraphicalEffects 1.0
-import Qt.labs.controls.material 1.0
-import Qt.labs.controls.material.impl 1.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material.impl 2.0
Item {
implicitWidth: 38
diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml
index 4d0ed57c..79238da4 100644
--- a/src/imports/controls/material/TabBar.qml
+++ b/src/imports/controls/material/TabBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.TabBar {
id: control
diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml
index 61542fa1..9659205b 100644
--- a/src/imports/controls/material/TabButton.qml
+++ b/src/imports/controls/material/TabButton.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.TabButton {
id: control
diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml
index c087911d..aa9cb12f 100644
--- a/src/imports/controls/material/TextArea.qml
+++ b/src/imports/controls/material/TextArea.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.TextArea {
id: control
diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml
index d037d491..2f3b9f2b 100644
--- a/src/imports/controls/material/TextField.qml
+++ b/src/imports/controls/material/TextField.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.TextField {
id: control
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml
index 432f77fb..b87451a0 100644
--- a/src/imports/controls/material/ToolBar.qml
+++ b/src/imports/controls/material/ToolBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ToolBar {
id: control
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index bdb341f6..a02254c4 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ToolButton {
id: control
diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml
index 1ca0c127..ec0deefe 100644
--- a/src/imports/controls/material/ToolTip.qml
+++ b/src/imports/controls/material/ToolTip.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.ToolTip {
id: control
diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml
index 959415f2..8ac8a7c4 100644
--- a/src/imports/controls/material/Tumbler.qml
+++ b/src/imports/controls/material/Tumbler.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.material 1.0
+import QtQuick.Controls.Material 2.0
T.Tumbler {
id: control
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 33c1d59a..05b7321f 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -1,6 +1,6 @@
TARGET = qtquickmaterialstyleplugin
-TARGETPATH = Qt/labs/controls/material
-IMPORT_VERSION = 1.0
+TARGETPATH = QtQuick/Controls.2/Material
+IMPORT_VERSION = 2.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index f8666f9e..64891e23 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -1,5 +1,5 @@
-module Qt.labs.controls.material
+module QtQuick.Controls.Material
plugin qtquickmaterialstyleplugin
classname QtQuickMaterialStylePlugin
-depends Qt.labs.controls 1.0
+depends QtQuick.Controls 2.0
depends QtGraphicalEffects 1.0
diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
index 2ae2d708..3ed38b67 100644
--- a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
+++ b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
@@ -48,7 +48,7 @@ static inline void initResources()
{
Q_INIT_RESOURCE(qtquickmaterialstyleplugin);
#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_Qt_labs_controls_material);
+ Q_INIT_RESOURCE(qmake_QtQuick_Controls_Material);
#endif
}
@@ -76,7 +76,7 @@ QtQuickMaterialStylePlugin::QtQuickMaterialStylePlugin(QObject *parent) : QQuick
void QtQuickMaterialStylePlugin::registerTypes(const char *uri)
{
- qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property"));
+ qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 2, 0, "Material", tr("Material is an attached property"));
}
void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -84,15 +84,15 @@ void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char
QQuickStylePlugin::initializeEngine(engine, uri);
QByteArray import = QByteArray(uri) + ".impl";
- qmlRegisterType<QQuickPaddedRectangle>(import, 1, 0, "PaddedRectangle");
- qmlRegisterType<QQuickMaterialProgressRing>(import, 1, 0, "ProgressRing");
- qmlRegisterType<QQuickMaterialProgressStrip>(import, 1, 0, "ProgressStrip");
- qmlRegisterType<QQuickMaterialRingAnimator>(import, 1, 0, "RingAnimator");
- qmlRegisterType<QQuickMaterialStripAnimator>(import, 1, 0, "StripAnimator");
- qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 1, 0, "CheckIndicator");
- qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 1, 0, "Ripple");
- qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 1, 0, "SliderHandle");
- qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 1, 0, "SwitchIndicator");
+ qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle");
+ qmlRegisterType<QQuickMaterialProgressRing>(import, 2, 0, "ProgressRing");
+ qmlRegisterType<QQuickMaterialProgressStrip>(import, 2, 0, "ProgressStrip");
+ qmlRegisterType<QQuickMaterialRingAnimator>(import, 2, 0, "RingAnimator");
+ qmlRegisterType<QQuickMaterialStripAnimator>(import, 2, 0, "StripAnimator");
+ qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator");
+ qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 2, 0, "Ripple");
+ qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle");
+ qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator");
}
QString QtQuickMaterialStylePlugin::name() const
diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir
index ef74280e..0ea1412f 100644
--- a/src/imports/controls/qmldir
+++ b/src/imports/controls/qmldir
@@ -1,4 +1,4 @@
-module Qt.labs.controls
+module QtQuick.Controls
plugin qtquickcontrols2plugin
classname QtQuickControls2Plugin
depends QtQuick.Templates 1.0
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index c6982062..b819765c 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -58,7 +58,7 @@ static inline void initResources()
{
Q_INIT_RESOURCE(qtquickcontrols2plugin);
#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_Qt_labs_controls);
+ Q_INIT_RESOURCE(qmake_QtQuick_Controls_2);
#endif
}
@@ -82,11 +82,11 @@ QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlu
void QtQuickControls2Plugin::registerTypes(const char *uri)
{
- qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton");
- qmlRegisterType<QQuickButtonGroup>(uri, 1, 0, "ButtonGroup");
+ qmlRegisterType<QQuickAbstractButton>(uri, 2, 0, "AbstractButton");
+ qmlRegisterType<QQuickButtonGroup>(uri, 2, 0, "ButtonGroup");
qmlRegisterType<QQuickButtonGroupAttached>();
- qmlRegisterType<QQuickContainer>(uri, 1, 0, "Container");
- qmlRegisterType<QQuickControl>(uri, 1, 0, "Control");
+ qmlRegisterType<QQuickContainer>(uri, 2, 0, "Container");
+ qmlRegisterType<QQuickControl>(uri, 2, 0, "Control");
QQuickStyleSelector selector;
selector.setBaseUrl(typeUrl());
@@ -95,45 +95,45 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
if (!style.isEmpty())
QFileSelectorPrivate::addStatics(QStringList() << style);
- qmlRegisterType(selector.select(QStringLiteral("ApplicationWindow.qml")), uri, 1, 0, "ApplicationWindow");
- qmlRegisterType(selector.select(QStringLiteral("BusyIndicator.qml")), uri, 1, 0, "BusyIndicator");
- qmlRegisterType(selector.select(QStringLiteral("Button.qml")), uri, 1, 0, "Button");
- qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 1, 0, "CheckBox");
- qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 1, 0, "CheckDelegate");
- qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 1, 0, "ComboBox");
- qmlRegisterType(selector.select(QStringLiteral("Dial.qml")), uri, 1, 0, "Dial");
- qmlRegisterType(selector.select(QStringLiteral("Drawer.qml")), uri, 1, 0, "Drawer");
- qmlRegisterType(selector.select(QStringLiteral("Frame.qml")), uri, 1, 0, "Frame");
- qmlRegisterType(selector.select(QStringLiteral("GroupBox.qml")), uri, 1, 0, "GroupBox");
- qmlRegisterType(selector.select(QStringLiteral("ItemDelegate.qml")), uri, 1, 0, "ItemDelegate");
- qmlRegisterType(selector.select(QStringLiteral("Label.qml")), uri, 1, 0, "Label");
- qmlRegisterType(selector.select(QStringLiteral("Menu.qml")), uri, 1, 0, "Menu");
- qmlRegisterType(selector.select(QStringLiteral("MenuItem.qml")), uri, 1, 0, "MenuItem");
- qmlRegisterType(selector.select(QStringLiteral("Page.qml")), uri, 1, 0, "Page");
- qmlRegisterType(selector.select(QStringLiteral("PageIndicator.qml")), uri, 1, 0, "PageIndicator");
- qmlRegisterType(selector.select(QStringLiteral("Pane.qml")), uri, 1, 0, "Pane");
- qmlRegisterType(selector.select(QStringLiteral("Popup.qml")), uri, 1, 0, "Popup");
- qmlRegisterType(selector.select(QStringLiteral("ProgressBar.qml")), uri, 1, 0, "ProgressBar");
- qmlRegisterType(selector.select(QStringLiteral("RadioButton.qml")), uri, 1, 0, "RadioButton");
- qmlRegisterType(selector.select(QStringLiteral("RadioDelegate.qml")), uri, 1, 0, "RadioDelegate");
- qmlRegisterType(selector.select(QStringLiteral("RangeSlider.qml")), uri, 1, 0, "RangeSlider");
- qmlRegisterType(selector.select(QStringLiteral("ScrollBar.qml")), uri, 1, 0, "ScrollBar");
- qmlRegisterType(selector.select(QStringLiteral("ScrollIndicator.qml")), uri, 1, 0, "ScrollIndicator");
- qmlRegisterType(selector.select(QStringLiteral("Slider.qml")), uri, 1, 0, "Slider");
- qmlRegisterType(selector.select(QStringLiteral("SpinBox.qml")), uri, 1, 0, "SpinBox");
- qmlRegisterType(selector.select(QStringLiteral("StackView.qml")), uri, 1, 0, "StackView");
- qmlRegisterType(selector.select(QStringLiteral("SwipeDelegate.qml")), uri, 1, 0, "SwipeDelegate");
- qmlRegisterType(selector.select(QStringLiteral("SwipeView.qml")), uri, 1, 0, "SwipeView");
- qmlRegisterType(selector.select(QStringLiteral("Switch.qml")), uri, 1, 0, "Switch");
- qmlRegisterType(selector.select(QStringLiteral("SwitchDelegate.qml")), uri, 1, 0, "SwitchDelegate");
- qmlRegisterType(selector.select(QStringLiteral("TabBar.qml")), uri, 1, 0, "TabBar");
- qmlRegisterType(selector.select(QStringLiteral("TabButton.qml")), uri, 1, 0, "TabButton");
- qmlRegisterType(selector.select(QStringLiteral("TextArea.qml")), uri, 1, 0, "TextArea");
- qmlRegisterType(selector.select(QStringLiteral("TextField.qml")), uri, 1, 0, "TextField");
- qmlRegisterType(selector.select(QStringLiteral("ToolBar.qml")), uri, 1, 0, "ToolBar");
- qmlRegisterType(selector.select(QStringLiteral("ToolButton.qml")), uri, 1, 0, "ToolButton");
- qmlRegisterType(selector.select(QStringLiteral("ToolTip.qml")), uri, 1, 0, "ToolTip");
- qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 1, 0, "Tumbler");
+ qmlRegisterType(selector.select(QStringLiteral("ApplicationWindow.qml")), uri, 2, 0, "ApplicationWindow");
+ qmlRegisterType(selector.select(QStringLiteral("BusyIndicator.qml")), uri, 2, 0, "BusyIndicator");
+ qmlRegisterType(selector.select(QStringLiteral("Button.qml")), uri, 2, 0, "Button");
+ qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox");
+ qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate");
+ qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox");
+ qmlRegisterType(selector.select(QStringLiteral("Dial.qml")), uri, 2, 0, "Dial");
+ qmlRegisterType(selector.select(QStringLiteral("Drawer.qml")), uri, 2, 0, "Drawer");
+ qmlRegisterType(selector.select(QStringLiteral("Frame.qml")), uri, 2, 0, "Frame");
+ qmlRegisterType(selector.select(QStringLiteral("GroupBox.qml")), uri, 2, 0, "GroupBox");
+ qmlRegisterType(selector.select(QStringLiteral("ItemDelegate.qml")), uri, 2, 0, "ItemDelegate");
+ qmlRegisterType(selector.select(QStringLiteral("Label.qml")), uri, 2, 0, "Label");
+ qmlRegisterType(selector.select(QStringLiteral("Menu.qml")), uri, 2, 0, "Menu");
+ qmlRegisterType(selector.select(QStringLiteral("MenuItem.qml")), uri, 2, 0, "MenuItem");
+ qmlRegisterType(selector.select(QStringLiteral("Page.qml")), uri, 2, 0, "Page");
+ qmlRegisterType(selector.select(QStringLiteral("PageIndicator.qml")), uri, 2, 0, "PageIndicator");
+ qmlRegisterType(selector.select(QStringLiteral("Pane.qml")), uri, 2, 0, "Pane");
+ qmlRegisterType(selector.select(QStringLiteral("Popup.qml")), uri, 2, 0, "Popup");
+ qmlRegisterType(selector.select(QStringLiteral("ProgressBar.qml")), uri, 2, 0, "ProgressBar");
+ qmlRegisterType(selector.select(QStringLiteral("RadioButton.qml")), uri, 2, 0, "RadioButton");
+ qmlRegisterType(selector.select(QStringLiteral("RadioDelegate.qml")), uri, 2, 0, "RadioDelegate");
+ qmlRegisterType(selector.select(QStringLiteral("RangeSlider.qml")), uri, 2, 0, "RangeSlider");
+ qmlRegisterType(selector.select(QStringLiteral("ScrollBar.qml")), uri, 2, 0, "ScrollBar");
+ qmlRegisterType(selector.select(QStringLiteral("ScrollIndicator.qml")), uri, 2, 0, "ScrollIndicator");
+ qmlRegisterType(selector.select(QStringLiteral("Slider.qml")), uri, 2, 0, "Slider");
+ qmlRegisterType(selector.select(QStringLiteral("SpinBox.qml")), uri, 2, 0, "SpinBox");
+ qmlRegisterType(selector.select(QStringLiteral("StackView.qml")), uri, 2, 0, "StackView");
+ qmlRegisterType(selector.select(QStringLiteral("SwipeDelegate.qml")), uri, 2, 0, "SwipeDelegate");
+ qmlRegisterType(selector.select(QStringLiteral("SwipeView.qml")), uri, 2, 0, "SwipeView");
+ qmlRegisterType(selector.select(QStringLiteral("Switch.qml")), uri, 2, 0, "Switch");
+ qmlRegisterType(selector.select(QStringLiteral("SwitchDelegate.qml")), uri, 2, 0, "SwitchDelegate");
+ qmlRegisterType(selector.select(QStringLiteral("TabBar.qml")), uri, 2, 0, "TabBar");
+ qmlRegisterType(selector.select(QStringLiteral("TabButton.qml")), uri, 2, 0, "TabButton");
+ qmlRegisterType(selector.select(QStringLiteral("TextArea.qml")), uri, 2, 0, "TextArea");
+ qmlRegisterType(selector.select(QStringLiteral("TextField.qml")), uri, 2, 0, "TextField");
+ qmlRegisterType(selector.select(QStringLiteral("ToolBar.qml")), uri, 2, 0, "ToolBar");
+ qmlRegisterType(selector.select(QStringLiteral("ToolButton.qml")), uri, 2, 0, "ToolButton");
+ qmlRegisterType(selector.select(QStringLiteral("ToolTip.qml")), uri, 2, 0, "ToolTip");
+ qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 2, 0, "Tumbler");
}
void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -143,15 +143,15 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur
engine->addImageProvider(QStringLiteral("default"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/images")));
const QByteArray import = QByteArray(uri) + ".impl";
- qmlRegisterType<QQuickBusyIndicatorRing>(import, 1, 0, "BusyRing");
- qmlRegisterType<QQuickBusyIndicatorAnimator>(import, 1, 0, "BusyRingAnimator");
- qmlRegisterType<QQuickProgressStrip>(import, 1, 0, "ProgressStrip");
- qmlRegisterType<QQuickProgressAnimator>(import, 1, 0, "ProgressStripAnimator");
- qmlRegisterType<QQuickDialRing>(import, 1, 0, "DialRing");
-
- qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 1, 0, "CheckIndicator");
- qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 1, 0, "RadioIndicator");
- qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 1, 0, "SwitchIndicator");
+ qmlRegisterType<QQuickBusyIndicatorRing>(import, 2, 0, "BusyRing");
+ qmlRegisterType<QQuickBusyIndicatorAnimator>(import, 2, 0, "BusyRingAnimator");
+ qmlRegisterType<QQuickProgressStrip>(import, 2, 0, "ProgressStrip");
+ qmlRegisterType<QQuickProgressAnimator>(import, 2, 0, "ProgressStripAnimator");
+ qmlRegisterType<QQuickDialRing>(import, 2, 0, "DialRing");
+
+ qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator");
+ qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator");
+ qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator");
}
QT_END_NAMESPACE
diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml
index 2211bcc5..e0a0b351 100644
--- a/src/imports/controls/universal/ApplicationWindow.qml
+++ b/src/imports/controls/universal/ApplicationWindow.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
-import Qt.labs.controls.universal.impl 1.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Controls.Universal.impl 2.0
T.ApplicationWindow {
id: window
diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml
index b5d11fa8..ef666417 100644
--- a/src/imports/controls/universal/BusyIndicator.qml
+++ b/src/imports/controls/universal/BusyIndicator.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
-import Qt.labs.controls.universal.impl 1.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Controls.Universal.impl 2.0
T.BusyIndicator {
id: control
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index 9e4ac774..fbe79b6b 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Button {
id: control
diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml
index a8365b9a..262f16b1 100644
--- a/src/imports/controls/universal/CheckBox.qml
+++ b/src/imports/controls/universal/CheckBox.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
-import Qt.labs.controls.universal.impl 1.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Controls.Universal.impl 2.0
T.CheckBox {
id: control
diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml
index 344183f5..da8fe326 100644
--- a/src/imports/controls/universal/CheckDelegate.qml
+++ b/src/imports/controls/universal/CheckDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.CheckDelegate {
id: control
diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml
index e9638e1b..a508ad18 100644
--- a/src/imports/controls/universal/CheckIndicator.qml
+++ b/src/imports/controls/universal/CheckIndicator.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
Rectangle {
implicitWidth: 20
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index f0da15ed..07e92a0e 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -36,9 +36,9 @@
import QtQuick 2.6
import QtQuick.Window 2.2
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ComboBox {
id: control
diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index 9595857f..466c6023 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Dial {
id: control
diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml
index 1318c0fa..e23403ae 100644
--- a/src/imports/controls/universal/Drawer.qml
+++ b/src/imports/controls/universal/Drawer.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Drawer {
id: control
diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml
index 1d18c51b..8d8b9d71 100644
--- a/src/imports/controls/universal/Frame.qml
+++ b/src/imports/controls/universal/Frame.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Frame {
id: control
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index 09c9c0ec..a163fb11 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.GroupBox {
id: control
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml
index b05382be..1bdcd620 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/imports/controls/universal/ItemDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ItemDelegate {
id: control
diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml
index d4c693f5..9b50f4f5 100644
--- a/src/imports/controls/universal/Label.qml
+++ b/src/imports/controls/universal/Label.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Label {
id: control
diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml
index 1819bb4e..ed1fecfa 100644
--- a/src/imports/controls/universal/Menu.qml
+++ b/src/imports/controls/universal/Menu.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Menu {
id: control
diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml
index 5941a826..e14884ef 100644
--- a/src/imports/controls/universal/MenuItem.qml
+++ b/src/imports/controls/universal/MenuItem.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.MenuItem {
id: control
diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml
index b1a0c64b..f4509b4b 100644
--- a/src/imports/controls/universal/Page.qml
+++ b/src/imports/controls/universal/Page.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Page {
id: control
diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml
index 6949b34e..636f0297 100644
--- a/src/imports/controls/universal/PageIndicator.qml
+++ b/src/imports/controls/universal/PageIndicator.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.PageIndicator {
id: control
diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml
index cd7aef6d..7a97da55 100644
--- a/src/imports/controls/universal/Pane.qml
+++ b/src/imports/controls/universal/Pane.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Pane {
id: control
diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml
index 633cc370..892db087 100644
--- a/src/imports/controls/universal/Popup.qml
+++ b/src/imports/controls/universal/Popup.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Popup {
id: control
diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml
index 65ba192d..b8df774e 100644
--- a/src/imports/controls/universal/ProgressBar.qml
+++ b/src/imports/controls/universal/ProgressBar.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
-import Qt.labs.controls.universal.impl 1.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Controls.Universal.impl 2.0
T.ProgressBar {
id: control
diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml
index fe26df16..b2f29661 100644
--- a/src/imports/controls/universal/RadioButton.qml
+++ b/src/imports/controls/universal/RadioButton.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
-import Qt.labs.controls.universal.impl 1.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Controls.Universal.impl 2.0
T.RadioButton {
id: control
diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml
index 58128df3..3b9214ae 100644
--- a/src/imports/controls/universal/RadioDelegate.qml
+++ b/src/imports/controls/universal/RadioDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.RadioDelegate {
id: control
diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/RadioIndicator.qml
index 3fd74cbf..65790e6a 100644
--- a/src/imports/controls/universal/RadioIndicator.qml
+++ b/src/imports/controls/universal/RadioIndicator.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.6
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
Rectangle {
implicitWidth: 20
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml
index 7c01fc96..061f95dd 100644
--- a/src/imports/controls/universal/RangeSlider.qml
+++ b/src/imports/controls/universal/RangeSlider.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.RangeSlider {
id: control
diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml
index b8b86183..19087384 100644
--- a/src/imports/controls/universal/ScrollBar.qml
+++ b/src/imports/controls/universal/ScrollBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ScrollBar {
id: control
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml
index 6d8224c1..9f9f3fcf 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/imports/controls/universal/ScrollIndicator.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ScrollIndicator {
id: control
diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml
index de02440a..9662acdf 100644
--- a/src/imports/controls/universal/Slider.qml
+++ b/src/imports/controls/universal/Slider.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Slider {
id: control
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index f3a6376a..4b9b4810 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.SpinBox {
id: control
diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml
index a05bcc50..60239429 100644
--- a/src/imports/controls/universal/StackView.qml
+++ b/src/imports/controls/universal/StackView.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.StackView {
id: control
diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml
index d73561ab..c908e517 100644
--- a/src/imports/controls/universal/SwipeDelegate.qml
+++ b/src/imports/controls/universal/SwipeDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.SwipeDelegate {
id: control
diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml
index 918fe64f..988b328f 100644
--- a/src/imports/controls/universal/Switch.qml
+++ b/src/imports/controls/universal/Switch.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.Switch {
id: control
diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml
index 85dd25f4..0d58824e 100644
--- a/src/imports/controls/universal/SwitchDelegate.qml
+++ b/src/imports/controls/universal/SwitchDelegate.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.SwitchDelegate {
id: control
diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml
index 31d89779..b3d44d9e 100644
--- a/src/imports/controls/universal/SwitchIndicator.qml
+++ b/src/imports/controls/universal/SwitchIndicator.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
Rectangle {
implicitWidth: 44
diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml
index 8c3552b0..fd53af15 100644
--- a/src/imports/controls/universal/TabBar.qml
+++ b/src/imports/controls/universal/TabBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.TabBar {
id: control
diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml
index 91803818..3a1845a5 100644
--- a/src/imports/controls/universal/TabButton.qml
+++ b/src/imports/controls/universal/TabButton.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.TabButton {
id: control
diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml
index 0e682217..e326512b 100644
--- a/src/imports/controls/universal/TextArea.qml
+++ b/src/imports/controls/universal/TextArea.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.TextArea {
id: control
diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml
index 4ada061a..69046e48 100644
--- a/src/imports/controls/universal/TextField.qml
+++ b/src/imports/controls/universal/TextField.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.TextField {
id: control
diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml
index f096d126..721d817e 100644
--- a/src/imports/controls/universal/ToolBar.qml
+++ b/src/imports/controls/universal/ToolBar.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ToolBar {
id: control
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index 084c0282..525623b5 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ToolButton {
id: control
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml
index 7988f5ad..579edf92 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/imports/controls/universal/ToolTip.qml
@@ -36,7 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick.Controls.Universal 2.0
T.ToolTip {
id: control
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml
index ee80196f..5998a6aa 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/imports/controls/universal/Tumbler.qml
@@ -36,8 +36,8 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
-import Qt.labs.controls.universal 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls.Universal 2.0
+import QtQuick.Controls 2.0
T.Tumbler {
id: control
diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir
index 7b7d28a4..dd8caf52 100644
--- a/src/imports/controls/universal/qmldir
+++ b/src/imports/controls/universal/qmldir
@@ -1,4 +1,4 @@
-module Qt.labs.controls.universal
+module QtQuick.Controls.Universal
plugin qtquickuniversalstyleplugin
classname QtQuickUniversalStylePlugin
-depends Qt.labs.controls 1.0
+depends QtQuick.Controls 2.0
diff --git a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
index 41cebeda..e80e7d12 100644
--- a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
@@ -48,7 +48,7 @@ static inline void initResources()
{
Q_INIT_RESOURCE(qtquickuniversalstyleplugin);
#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_Qt_labs_controls_universal);
+ Q_INIT_RESOURCE(qmake_QtQuick_Controls_Universal);
#endif
}
@@ -76,7 +76,7 @@ QtQuickUniversalStylePlugin::QtQuickUniversalStylePlugin(QObject *parent) : QQui
void QtQuickUniversalStylePlugin::registerTypes(const char *uri)
{
- qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 1, 0, "Universal", tr("Universal is an attached property"));
+ qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 2, 0, "Universal", tr("Universal is an attached property"));
}
void QtQuickUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -86,14 +86,14 @@ void QtQuickUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const cha
engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images")));
QByteArray import = QByteArray(uri) + ".impl";
- qmlRegisterType<QQuickUniversalFocusRectangle>(import, 1, 0, "FocusRectangle");
- qmlRegisterType<QQuickUniversalProgressRing>(import, 1, 0, "ProgressRing");
- qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 1, 0, "ProgressRingAnimator");
- qmlRegisterType<QQuickUniversalProgressStrip>(import, 1, 0, "ProgressStrip");
- qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 1, 0, "ProgressStripAnimator");
-
- qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 1, 0, "RadioIndicator");
- qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 1, 0, "SwitchIndicator");
+ qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle");
+ qmlRegisterType<QQuickUniversalProgressRing>(import, 2, 0, "ProgressRing");
+ qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 2, 0, "ProgressRingAnimator");
+ qmlRegisterType<QQuickUniversalProgressStrip>(import, 2, 0, "ProgressStrip");
+ qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 2, 0, "ProgressStripAnimator");
+
+ qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator");
+ qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator");
}
QString QtQuickUniversalStylePlugin::name() const
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 658026c8..3e569831 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -1,6 +1,6 @@
TARGET = qtquickuniversalstyleplugin
-TARGETPATH = Qt/labs/controls/universal
-IMPORT_VERSION = 1.0
+TARGETPATH = QtQuick/Controls.2/Universal
+IMPORT_VERSION = 2.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 4a12e3d1..ca9bcb40 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -157,7 +157,7 @@ QString QQuickStyle::path()
*/
void QQuickStyle::setStyle(const QString &style)
{
- if (QQmlMetaType::isModule(QStringLiteral("Qt.labs.controls"), 1, 0)) {
+ if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), 2, 0)) {
qWarning() << "ERROR: QQuickStyle::setStyle() must be called before loading QML that imports Qt Quick Controls 2.";
return;
}
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 5e7eaabe..85fd0c69 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
\image qtquickcontrols2-applicationwindow-wireframe.png
\qml
- import Qt.labs.controls 1.0
+ import QtQuick.Controls 2.0
ApplicationWindow {
visible: true
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index a2527fec..12ee27e5 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
toolbar header and an application-wide tabbar footer.
\qml
- import Qt.labs.controls 1.0
+ import QtQuick.Controls 2.0
ApplicationWindow {
visible: true
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index da9d5fe0..fe03a3b0 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
\qml
import QtQuick.Window 2.2
- import Qt.labs.controls 1.0
+ import QtQuick.Controls 2.0
Window {
id: window
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index a12b934c..dadbc401 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -403,7 +403,7 @@ QQuickToolTip *QQuickToolTipAttachedPrivate::instance(bool create) const
QQmlContext *context = qmlContext(parent);
if (context) {
QQmlComponent component(context->engine());
- component.setData("import Qt.labs.controls 1.0; ToolTip { }", QUrl());
+ component.setData("import QtQuick.Controls 2.0; ToolTip { }", QUrl());
QObject *object = component.create(context);
tip = qobject_cast<QQuickToolTip *>(object);