diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/accessibility/data/busyindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/button.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/checkbox.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/control.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/dial.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/label.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/pageindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/progressbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/radiobutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/scrollbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/scrollindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/slider.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/switch.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/tabbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/tabbutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/textarea-2.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/textarea.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/textfield-2.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/textfield.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/toolbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/data/toolbutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml | 2 | ||||
-rw-r--r-- | tests/auto/applicationwindow/data/activefocusontab.qml | 2 | ||||
-rw-r--r-- | tests/auto/applicationwindow/data/basicapplicationwindow.qml | 2 | ||||
-rw-r--r-- | tests/auto/applicationwindow/data/defaultFocus.qml | 2 | ||||
-rw-r--r-- | tests/auto/applicationwindow/data/fill.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/TumblerDatePicker.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_busyindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_button.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_checkbox.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_control.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_dial.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_drawer.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_exclusivegroup.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_frame.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_groupbox.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_label.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_pageindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_progressbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_radiobutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_scrollbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_scrollindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_slider.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_stackview.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_swipeview.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_switch.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tabbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_textarea.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_textfield.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_theme.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_toolbar.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_toolbutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tumbler.qml | 4 | ||||
-rw-r--r-- | tests/auto/sanity/tst_sanity.cpp | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml (renamed from tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml (renamed from tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/button/qtlabscontrols-button-background.qml (renamed from tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml (renamed from tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml (renamed from tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/button/qtlabscontrols-button-label.qml (renamed from tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml (renamed from tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml (renamed from tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml (renamed from tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml (renamed from tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml (renamed from tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml (renamed from tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml (renamed from tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml (renamed from tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml (renamed from tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml (renamed from tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml (renamed from tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml (renamed from tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml (renamed from tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml (renamed from tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml (renamed from tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml (renamed from tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml (renamed from tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml (renamed from tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml (renamed from tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml (renamed from tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml (renamed from tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml (renamed from tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml (renamed from tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml (renamed from tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml (renamed from tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml (renamed from tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml (renamed from tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml (renamed from tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml (renamed from tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml (renamed from tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml (renamed from tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml (renamed from tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml (renamed from tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml (renamed from tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml (renamed from tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml (renamed from tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml (renamed from tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml) | 2 | ||||
-rw-r--r-- | tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml (renamed from tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml) | 2 | ||||
-rw-r--r-- | tests/benchmarks/creationtime/tst_creationtime.cpp | 4 | ||||
-rw-r--r-- | tests/benchmarks/objectcount/tst_objectcount.cpp | 44 | ||||
-rw-r--r-- | tests/manual/fonts/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-busyindicator.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-button.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-button.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-slider.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-slider.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-switch.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-switch.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-tabbar.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-tabbar.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/gifrecorder.cpp | 2 | ||||
-rw-r--r-- | tests/manual/gifs/tst_gifs.cpp | 12 |
128 files changed, 156 insertions, 156 deletions
diff --git a/tests/auto/accessibility/data/busyindicator.qml b/tests/auto/accessibility/data/busyindicator.qml index 4bde9634..4ac1b9ca 100644 --- a/tests/auto/accessibility/data/busyindicator.qml +++ b/tests/auto/accessibility/data/busyindicator.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/button.qml b/tests/auto/accessibility/data/button.qml index 75925185..d6acfdb0 100644 --- a/tests/auto/accessibility/data/button.qml +++ b/tests/auto/accessibility/data/button.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/checkbox.qml b/tests/auto/accessibility/data/checkbox.qml index 9700663d..4752dcae 100644 --- a/tests/auto/accessibility/data/checkbox.qml +++ b/tests/auto/accessibility/data/checkbox.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/control.qml b/tests/auto/accessibility/data/control.qml index ceaba509..42fe7435 100644 --- a/tests/auto/accessibility/data/control.qml +++ b/tests/auto/accessibility/data/control.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/dial.qml b/tests/auto/accessibility/data/dial.qml index 6b2333b1..af107c08 100644 --- a/tests/auto/accessibility/data/dial.qml +++ b/tests/auto/accessibility/data/dial.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/label.qml b/tests/auto/accessibility/data/label.qml index 409898d4..19a08984 100644 --- a/tests/auto/accessibility/data/label.qml +++ b/tests/auto/accessibility/data/label.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/pageindicator.qml b/tests/auto/accessibility/data/pageindicator.qml index b42d3f9e..8fce79f3 100644 --- a/tests/auto/accessibility/data/pageindicator.qml +++ b/tests/auto/accessibility/data/pageindicator.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/progressbar.qml b/tests/auto/accessibility/data/progressbar.qml index 283db003..3a6ccfc2 100644 --- a/tests/auto/accessibility/data/progressbar.qml +++ b/tests/auto/accessibility/data/progressbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/radiobutton.qml b/tests/auto/accessibility/data/radiobutton.qml index 1883fff8..54f240fa 100644 --- a/tests/auto/accessibility/data/radiobutton.qml +++ b/tests/auto/accessibility/data/radiobutton.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/scrollbar.qml b/tests/auto/accessibility/data/scrollbar.qml index 2e360422..ab6ee421 100644 --- a/tests/auto/accessibility/data/scrollbar.qml +++ b/tests/auto/accessibility/data/scrollbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/scrollindicator.qml b/tests/auto/accessibility/data/scrollindicator.qml index e933dece..ba2ee3f9 100644 --- a/tests/auto/accessibility/data/scrollindicator.qml +++ b/tests/auto/accessibility/data/scrollindicator.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/slider.qml b/tests/auto/accessibility/data/slider.qml index 060bb66c..3b906336 100644 --- a/tests/auto/accessibility/data/slider.qml +++ b/tests/auto/accessibility/data/slider.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/switch.qml b/tests/auto/accessibility/data/switch.qml index 9913e3f1..88d9af72 100644 --- a/tests/auto/accessibility/data/switch.qml +++ b/tests/auto/accessibility/data/switch.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/tabbar.qml b/tests/auto/accessibility/data/tabbar.qml index 127c4e81..0951a84c 100644 --- a/tests/auto/accessibility/data/tabbar.qml +++ b/tests/auto/accessibility/data/tabbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/tabbutton.qml b/tests/auto/accessibility/data/tabbutton.qml index cfb04ca2..cdae7a49 100644 --- a/tests/auto/accessibility/data/tabbutton.qml +++ b/tests/auto/accessibility/data/tabbutton.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textarea-2.qml b/tests/auto/accessibility/data/textarea-2.qml index 381c08bd..31330fa8 100644 --- a/tests/auto/accessibility/data/textarea-2.qml +++ b/tests/auto/accessibility/data/textarea-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textarea.qml b/tests/auto/accessibility/data/textarea.qml index 9ae51ca8..2108a5bf 100644 --- a/tests/auto/accessibility/data/textarea.qml +++ b/tests/auto/accessibility/data/textarea.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textfield-2.qml b/tests/auto/accessibility/data/textfield-2.qml index 5db46d82..29c7b62b 100644 --- a/tests/auto/accessibility/data/textfield-2.qml +++ b/tests/auto/accessibility/data/textfield-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textfield.qml b/tests/auto/accessibility/data/textfield.qml index c3ea9b08..d25b325b 100644 --- a/tests/auto/accessibility/data/textfield.qml +++ b/tests/auto/accessibility/data/textfield.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/toolbar.qml b/tests/auto/accessibility/data/toolbar.qml index c0503aef..bb19b839 100644 --- a/tests/auto/accessibility/data/toolbar.qml +++ b/tests/auto/accessibility/data/toolbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/toolbutton.qml b/tests/auto/accessibility/data/toolbutton.qml index 63aacddc..a4bbf7a3 100644 --- a/tests/auto/accessibility/data/toolbutton.qml +++ b/tests/auto/accessibility/data/toolbutton.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index dd2281dd..05cb464b 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -40,7 +40,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { id: main diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index 6cbd132f..1ff677fc 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index afac65f3..72266cf6 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/defaultFocus.qml b/tests/auto/applicationwindow/data/defaultFocus.qml index ed2a9303..ff4e4e4c 100644 --- a/tests/auto/applicationwindow/data/defaultFocus.qml +++ b/tests/auto/applicationwindow/data/defaultFocus.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { visible: true diff --git a/tests/auto/applicationwindow/data/fill.qml b/tests/auto/applicationwindow/data/fill.qml index 8e468f49..6d4c92c9 100644 --- a/tests/auto/applicationwindow/data/fill.qml +++ b/tests/auto/applicationwindow/data/fill.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { width: 400 diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml index 18d7fb97..a929a53f 100644 --- a/tests/auto/controls/data/TumblerDatePicker.qml +++ b/tests/auto/controls/data/TumblerDatePicker.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Row { id: datePicker diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index 142ec70a..d4cb9d31 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index eab82eab..67c68b1d 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index b4874642..caf6658b 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 8a9caa4d..2278f1ef 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index 5a4a66a5..7468c530 100644 --- a/tests/auto/controls/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_drawer.qml b/tests/auto/controls/data/tst_drawer.qml index af815bed..28db11c8 100644 --- a/tests/auto/controls/data/tst_drawer.qml +++ b/tests/auto/controls/data/tst_drawer.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_exclusivegroup.qml b/tests/auto/controls/data/tst_exclusivegroup.qml index 61076ec8..b4ff560c 100644 --- a/tests/auto/controls/data/tst_exclusivegroup.qml +++ b/tests/auto/controls/data/tst_exclusivegroup.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml index 6b65691b..feb6cf11 100644 --- a/tests/auto/controls/data/tst_frame.qml +++ b/tests/auto/controls/data/tst_frame.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index baa1d3f9..55568923 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index f9df8592..2af02cdf 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml index 9ac98e46..3a37aa25 100644 --- a/tests/auto/controls/data/tst_pageindicator.qml +++ b/tests/auto/controls/data/tst_pageindicator.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index b9135fd1..ed09f5e9 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 050cadb7..d76a8c38 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 50a203c3..842cd9ff 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index 2eba2afc..ac320117 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 3e15fbf6..04d328c8 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index dc56830a..7ef13535 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index ceb316d4..71731ae9 100644 --- a/tests/auto/controls/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index 94aaab13..153a28b9 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml index db5f45fa..2b272ae7 100644 --- a/tests/auto/controls/data/tst_tabbar.qml +++ b/tests/auto/controls/data/tst_tabbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 0ec58825..ba80a721 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 18abb740..bede2296 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_theme.qml b/tests/auto/controls/data/tst_theme.qml index 3638950c..4f94f2f5 100644 --- a/tests/auto/controls/data/tst_theme.qml +++ b/tests/auto/controls/data/tst_theme.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index 8b20cca8..ac116a86 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index c78a922a..5dfac358 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 3a8937bb..cd778b74 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { @@ -58,7 +58,7 @@ TestCase { readonly property real defaultListViewTumblerOffset: -defaultImplicitDelegateHeight function init() { - tumbler = Qt.createQmlObject("import QtQuick.Controls 2.0; Tumbler { }", testCase, ""); + tumbler = Qt.createQmlObject("import Qt.labs.controls 1.0; Tumbler { }", testCase, ""); verify(tumbler, "Tumbler: failed to create an instance"); compare(tumbler.contentItem.parent, tumbler); } diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index 6568f0dc..bf6a3d11 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -148,7 +148,7 @@ void tst_Sanity::initTestCase() QQmlEngine engine; foreach (const QString &path, engine.importPathList()) { files.unite(listQmlFiles(QDir(path + "/Qt/labs/calendar"))); - files.unite(listQmlFiles(QDir(path + "/QtQuick/Controls.2"))); + files.unite(listQmlFiles(QDir(path + "/Qt/labs/controls"))); } } diff --git a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml index 88b413cb..54d68234 100644 --- a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml +++ b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 BusyIndicator { background: Rectangle { diff --git a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml index 317a6a3f..dffd61b6 100644 --- a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml +++ b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 BusyIndicator { Rectangle { diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-background.qml index 44f163d2..287fe380 100644 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { width: 80 diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml index 401966b9..e2bd4fda 100644 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { width: 80 diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml index d12d837f..7b006204 100644 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { width: 80 diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-label.qml index d7f76f0f..a068bcb2 100644 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-label.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { width: 80 diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml index efd225de..fbb946f9 100644 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { width: 80 diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml index 3ebcc39e..272f2e2c 100644 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { width: 80 diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml index d096019f..ca13e815 100644 --- a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T //! [1] diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml index 95c0d1dc..cea3fe70 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "CheckBox" diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml index 0e0de49a..b0620f04 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "Checked" diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml index 92b64adc..6aa33095 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "Disabled" diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml index 35770d55..efacc11d 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "Focused" diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml index 8fda4b1f..f5dc9e9c 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "CheckBox" diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml index 6deb3944..9ccb7756 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "CheckBox" diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml index d453eabc..6d1c23dc 100644 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 CheckBox { text: "Normal" diff --git a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml b/tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml index b9a48498..1f13eef6 100644 --- a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml +++ b/tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Dial { Rectangle { diff --git a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml b/tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml index 9851478e..afb30639 100644 --- a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml +++ b/tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Dial { id: dial diff --git a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml b/tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml index 16d7c892..eec63652 100644 --- a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml +++ b/tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Frame { width: 100 diff --git a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml b/tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml index 64bfb5fc..da68ab3c 100644 --- a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml +++ b/tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Frame { width: 100 diff --git a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml index e986fda5..36359c9d 100644 --- a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml +++ b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 GroupBox { width: 100 diff --git a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml index 395cd882..89ae7392 100644 --- a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml +++ b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 GroupBox { width: 100 diff --git a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml index 00da0450..187e3985 100644 --- a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml +++ b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 GroupBox { width: 100 diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml index 7be2eec5..c27ab436 100644 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ProgressBar { value: 0.5 diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml index 118e2c53..100203bd 100644 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ProgressBar { value: 0.5 diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml index 42a58f84..04cac6f2 100644 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ProgressBar { value: 0.5 diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml index c2b6e89a..fd9de49d 100644 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ProgressBar { value: 0.5 diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml index 8ea70c8d..02409c25 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "RadioButton" diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml index 2e475807..7cf298c7 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "Checked" diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml index 357fbe57..68893856 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "Disabled" diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml index 981f908c..a454ba60 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "Focused" diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml index 8f781695..06259e2f 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "RadioButton" diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml index 085f34f0..d761fdd4 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "RadioButton" diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml index 8f61856f..6f659fb1 100644 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 RadioButton { text: "Normal" diff --git a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml index e466a36f..21020f3d 100644 --- a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml +++ b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ScrollBar { size: 0.5 diff --git a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml index 3efbab88..12ff8b10 100644 --- a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml +++ b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ScrollBar { size: 0.5 diff --git a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml index 112f9a55..991751af 100644 --- a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml +++ b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ScrollIndicator { size: 0.5 diff --git a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml index 0a90ae54..e615ea33 100644 --- a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml +++ b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ScrollIndicator { size: 0.5 diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml index 687dbea0..d6344f72 100644 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Slider { value: 0.5 diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml index 5b5532cc..57053ce6 100644 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Slider { value: 0.5 diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml index f060dbe5..d2f7fd09 100644 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Slider { value: 0.5 diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml index e24cd664..9e578207 100644 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Slider { value: 0.5 diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml index 50ba0637..8467aa59 100644 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Slider { value: 0.5 diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml index e8f00c7c..3a85f46e 100644 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Slider { value: 0.5 diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml index 7ed7ccc1..34342187 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Switch" diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml index 74ed3f50..6c82fae3 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Checked" diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml index 5c1e9234..3ebc5d72 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Disabled" diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml index 581cdbcf..fc3564f2 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Focused" diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml index b13ef6ac..f3d01aba 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Switch" diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml index 2ccae69d..54e41ef7 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Switch" diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml index c403a378..75400351 100644 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { text: "Normal" diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml index ee71a015..6fcc3391 100644 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TextField { width: 80 diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml index 76ba54ed..bec044f7 100644 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TextField { width: 80 diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml index f9db3c5a..7983e104 100644 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TextField { width: 80 diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml index a81f35e8..81b18874 100644 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TextField { width: 80 diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml index 89d814a6..ef20c5e2 100644 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TextField { width: 80 diff --git a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml index 856f113a..d9cc05c9 100644 --- a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml +++ b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ToolBar { width: 100 diff --git a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml index f0f64f82..2a064bd6 100644 --- a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml +++ b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ToolBar { width: 100 diff --git a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml index 4485bfb5..8a1f8474 100644 --- a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml +++ b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ToolButton { text: "ToolButton" diff --git a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml index 17084ced..6872b38c 100644 --- a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml +++ b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ToolButton { text: "ToolButton" diff --git a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml index 5a9832c4..02b8a2f9 100644 --- a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml +++ b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Tumbler { model: 5 diff --git a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml index 51a0a7bb..6ef5099c 100644 --- a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml +++ b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Tumbler { model: 5 diff --git a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml index d7f02c0c..593e7302 100644 --- a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml +++ b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Tumbler { id: tumbler diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 5d8d9b1c..32ba17ff 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -101,14 +101,14 @@ void tst_CreationTime::controls() { QFETCH(QByteArray, control); QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.0;" + control + "{}", QUrl()); + component.setData("import Qt.labs.controls 1.0;" + control + "{}", QUrl()); doBenchmark(&component); } void tst_CreationTime::controls_data() { QTest::addColumn<QByteArray>("control"); - addTestRows(engine.importPathList(), "QtQuick/Controls.2"); + addTestRows(engine.importPathList(), "Qt/labs/controls"); } void tst_CreationTime::calendar() diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index 49400c22..039b5d1f 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -74,7 +74,7 @@ void tst_ObjectCount::init() // warmup QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 1.3 as C1; import QtQuick.Controls 2.0 as C2; Row { C1.Button {} C2.Button {} }", QUrl()); + component.setData("import QtQuick 2.0; import QtQuick.Controls 1.3 as C1; import Qt.labs.controls 1.0 as C2; Row { C1.Button {} C2.Button {} }", QUrl()); delete component.create(); } @@ -143,43 +143,43 @@ void tst_ObjectCount::testCount_data() QTest::newRow("ApplicationWindow") << QByteArray("import QtQuick.Controls 1.3; ApplicationWindow { }") - << QByteArray("import QtQuick.Controls 2.0; ApplicationWindow { }"); + << QByteArray("import Qt.labs.controls 1.0; ApplicationWindow { }"); QTest::newRow("BusyIndicator") << QByteArray("import QtQuick.Controls 1.3; BusyIndicator { }") - << QByteArray("import QtQuick.Controls 2.0; BusyIndicator { }"); + << QByteArray("import Qt.labs.controls 1.0; BusyIndicator { }"); QTest::newRow("Button") << QByteArray("import QtQuick.Controls 1.3; Button { }") - << QByteArray("import QtQuick.Controls 2.0; Button { }"); + << QByteArray("import Qt.labs.controls 1.0; Button { }"); QTest::newRow("CheckBox") << QByteArray("import QtQuick.Controls 1.3; CheckBox { }") - << QByteArray("import QtQuick.Controls 2.0; CheckBox { }"); + << QByteArray("import Qt.labs.controls 1.0; CheckBox { }"); QTest::newRow("Frame") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; Frame { }"); + << QByteArray("import Qt.labs.controls 1.0; Frame { }"); QTest::newRow("GroupBox") << QByteArray("import QtQuick.Controls 1.3; GroupBox { }") - << QByteArray("import QtQuick.Controls 2.0; GroupBox { }"); + << QByteArray("import Qt.labs.controls 1.0; GroupBox { }"); QTest::newRow("Label") << QByteArray("import QtQuick.Controls 1.3; Label { }") - << QByteArray("import QtQuick.Controls 2.0; Label { }"); + << QByteArray("import Qt.labs.controls 1.0; Label { }"); QTest::newRow("PageIndicator") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; PageIndicator { }"); + << QByteArray("import Qt.labs.controls 1.0; PageIndicator { }"); QTest::newRow("ProgressBar") << QByteArray("import QtQuick.Controls 1.3; ProgressBar { }") - << QByteArray("import QtQuick.Controls 2.0; ProgressBar { }"); + << QByteArray("import Qt.labs.controls 1.0; ProgressBar { }"); QTest::newRow("RadioButton") << QByteArray("import QtQuick.Controls 1.3; RadioButton { }") - << QByteArray("import QtQuick.Controls 2.0; RadioButton { }"); + << QByteArray("import Qt.labs.controls 1.0; RadioButton { }"); QTest::newRow("ScrollView") << QByteArray("import QtQuick.Controls 1.3; ScrollView { }") @@ -187,47 +187,47 @@ void tst_ObjectCount::testCount_data() QTest::newRow("ScrollIndicator") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ScrollIndicator { }"); + << QByteArray("import Qt.labs.controls 1.0; ScrollIndicator { }"); QTest::newRow("ScrollBar") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ScrollBar { }"); + << QByteArray("import Qt.labs.controls 1.0; ScrollBar { }"); QTest::newRow("Slider") << QByteArray("import QtQuick.Controls 1.3; Slider { }") - << QByteArray("import QtQuick.Controls 2.0; Slider { }"); + << QByteArray("import Qt.labs.controls 1.0; Slider { }"); QTest::newRow("StackView") << QByteArray("import QtQuick.Controls 1.3; StackView { }") - << QByteArray("import QtQuick.Controls 2.0; StackView { }"); + << QByteArray("import Qt.labs.controls 1.0; StackView { }"); QTest::newRow("Switch") << QByteArray("import QtQuick.Controls 1.3; Switch { }") - << QByteArray("import QtQuick.Controls 2.0; Switch { }"); + << QByteArray("import Qt.labs.controls 1.0; Switch { }"); QTest::newRow("TabBar") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; TabBar { }"); + << QByteArray("import Qt.labs.controls 1.0; TabBar { }"); QTest::newRow("TabButton") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; TabButton { }"); + << QByteArray("import Qt.labs.controls 1.0; TabButton { }"); QTest::newRow("TextArea") << QByteArray("import QtQuick.Controls 1.3; TextArea { }") - << QByteArray("import QtQuick.Controls 2.0; TextArea { }"); + << QByteArray("import Qt.labs.controls 1.0; TextArea { }"); QTest::newRow("TextField") << QByteArray("import QtQuick.Controls 1.3; TextField { }") - << QByteArray("import QtQuick.Controls 2.0; TextField { }"); + << QByteArray("import Qt.labs.controls 1.0; TextField { }"); QTest::newRow("ToolBar") << QByteArray("import QtQuick.Controls 1.3; ToolBar { }") - << QByteArray("import QtQuick.Controls 2.0; ToolBar { }"); + << QByteArray("import Qt.labs.controls 1.0; ToolBar { }"); QTest::newRow("ToolButton") << QByteArray("import QtQuick.Controls 1.3; ToolButton { }") - << QByteArray("import QtQuick.Controls 2.0; ToolButton { }"); + << QByteArray("import Qt.labs.controls 1.0; ToolButton { }"); } QTEST_MAIN(tst_ObjectCount) diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 1654e93c..e429cbfd 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T import QtQuick.Layouts 1.2 diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml index ad659ade..8b6940cc 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml +++ b/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { width: busyIndicator.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/gifs/data/qtlabscontrols-button.qml index 46ef9bc5..c536d1e1 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button.qml +++ b/tests/manual/gifs/data/qtlabscontrols-button.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { text: pressed ? "Pressed" : "Normal" diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtlabscontrols-slider.qml index 0a26df86..82cd3ad9 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml +++ b/tests/manual/gifs/data/qtlabscontrols-slider.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/gifs/data/qtlabscontrols-switch.qml index f1c6daab..01818ba8 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml +++ b/tests/manual/gifs/data/qtlabscontrols-switch.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { } diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml index 9f5bd797..c7a8653f 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml +++ b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { width: 200 diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml index 985c64c4..8576f09b 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml +++ b/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T Item { diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp index 8d1b6a8c..302dbec3 100644 --- a/tests/manual/gifs/gifrecorder.cpp +++ b/tests/manual/gifs/gifrecorder.cpp @@ -232,7 +232,7 @@ void GifRecorder::waitForFinish() if (mHighQuality) { // Indicate the end of recording and the beginning of conversion. QQmlComponent busyComponent(mView->engine()); - busyComponent.setData("import QtQuick 2.6; import QtQuick.Controls 2.0; Rectangle { anchors.fill: parent; " \ + busyComponent.setData("import QtQuick 2.6; import Qt.labs.controls 1.0; Rectangle { anchors.fill: parent; " \ "BusyIndicator { width: 32; height: 32; anchors.centerIn: parent } }", QUrl()); QCOMPARE(busyComponent.status(), QQmlComponent::Ready); QQuickItem *busyRect = qobject_cast<QQuickItem*>(busyComponent.create()); diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp index a74fa894..df636cd2 100644 --- a/tests/manual/gifs/tst_gifs.cpp +++ b/tests/manual/gifs/tst_gifs.cpp @@ -81,7 +81,7 @@ void tst_Gifs::tumblerWrap() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(4); - gifRecorder.setQmlFileName("qtquickcontrols2-tumbler-wrap.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-tumbler-wrap.qml"); gifRecorder.setView(&view); view.show(); @@ -154,7 +154,7 @@ void tst_Gifs::slider() gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(4); gifRecorder.setHighQuality(true); - gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-slider.qml"); gifRecorder.setView(&view); view.show(); @@ -273,7 +273,7 @@ void tst_Gifs::busyIndicator() gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); gifRecorder.setHighQuality(true); - gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-busyindicator.qml"); gifRecorder.setView(&view); view.show(); @@ -302,7 +302,7 @@ void tst_Gifs::switchGif() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); - gifRecorder.setQmlFileName("qtquickcontrols2-switch.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-switch.qml"); gifRecorder.setHighQuality(true); gifRecorder.setView(&view); @@ -322,7 +322,7 @@ void tst_Gifs::button() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); - gifRecorder.setQmlFileName("qtquickcontrols2-button.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-button.qml"); gifRecorder.setHighQuality(true); gifRecorder.setView(&view); @@ -338,7 +338,7 @@ void tst_Gifs::button() void tst_Gifs::tabBar() { - const QString qmlFileName = QStringLiteral("qtquickcontrols2-tabbar.qml"); + const QString qmlFileName = QStringLiteral("qtlabscontrols-tabbar.qml"); GifRecorder gifRecorder; gifRecorder.setDataDirPath(dataDirPath); |