diff options
Diffstat (limited to 'src/imports/controls/doc')
137 files changed, 146 insertions, 146 deletions
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 |