aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-26 14:03:42 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-26 14:03:42 +0200
commit2a054d48ef5a412d104aff0389bcaa69ba2c9878 (patch)
tree953847f836611a0b2225f2fe62808623538a9ca8 /tests
parent2812d380e5999733aaaf2ace2bdbd0702ce293dc (diff)
parentf51b569219f4fe9ee196c92958bb5dc9f3810678 (diff)
Merge branch 'dev' into nativestyle
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/CMakeLists.txt2
-rw-r--r--tests/auto/accessibility/CMakeLists.txt1
-rw-r--r--tests/auto/accessibility/data/defaults/abstractbutton.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/busyindicator.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/button.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/checkbox.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/checkdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/combobox.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/container.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/control.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/dial.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/dialog.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/drawer.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/frame.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/groupbox.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/itemdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/label.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/menu.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/menuitem.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/page.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/pageindicator.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/pane.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/popup.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/progressbar.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/radiobutton.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/radiodelegate.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/rangeslider.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/roundbutton.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/scrollbar.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/scrollindicator.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/slider.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/spinbox.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/stackview.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/swipedelegate.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/swipeview.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/switch.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/switchdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/tabbar.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/tabbutton.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/textarea.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/textfield.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/toolbar.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/toolbutton.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/tooltip.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/tumbler.qml4
-rw-r--r--tests/auto/accessibility/data/override/abstractbutton.qml4
-rw-r--r--tests/auto/accessibility/data/override/busyindicator.qml4
-rw-r--r--tests/auto/accessibility/data/override/button.qml4
-rw-r--r--tests/auto/accessibility/data/override/checkbox.qml4
-rw-r--r--tests/auto/accessibility/data/override/checkdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/override/combobox.qml4
-rw-r--r--tests/auto/accessibility/data/override/container.qml4
-rw-r--r--tests/auto/accessibility/data/override/control.qml4
-rw-r--r--tests/auto/accessibility/data/override/dial.qml4
-rw-r--r--tests/auto/accessibility/data/override/dialog.qml4
-rw-r--r--tests/auto/accessibility/data/override/drawer.qml4
-rw-r--r--tests/auto/accessibility/data/override/frame.qml4
-rw-r--r--tests/auto/accessibility/data/override/groupbox.qml4
-rw-r--r--tests/auto/accessibility/data/override/itemdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/override/label.qml4
-rw-r--r--tests/auto/accessibility/data/override/menu.qml4
-rw-r--r--tests/auto/accessibility/data/override/menuitem.qml4
-rw-r--r--tests/auto/accessibility/data/override/page.qml4
-rw-r--r--tests/auto/accessibility/data/override/pageindicator.qml4
-rw-r--r--tests/auto/accessibility/data/override/pane.qml4
-rw-r--r--tests/auto/accessibility/data/override/popup.qml4
-rw-r--r--tests/auto/accessibility/data/override/progressbar.qml4
-rw-r--r--tests/auto/accessibility/data/override/radiobutton.qml4
-rw-r--r--tests/auto/accessibility/data/override/radiodelegate.qml4
-rw-r--r--tests/auto/accessibility/data/override/rangeslider.qml4
-rw-r--r--tests/auto/accessibility/data/override/roundbutton.qml4
-rw-r--r--tests/auto/accessibility/data/override/scrollbar.qml4
-rw-r--r--tests/auto/accessibility/data/override/scrollindicator.qml4
-rw-r--r--tests/auto/accessibility/data/override/slider.qml4
-rw-r--r--tests/auto/accessibility/data/override/spinbox.qml4
-rw-r--r--tests/auto/accessibility/data/override/stackview.qml4
-rw-r--r--tests/auto/accessibility/data/override/swipedelegate.qml4
-rw-r--r--tests/auto/accessibility/data/override/swipeview.qml4
-rw-r--r--tests/auto/accessibility/data/override/switch.qml4
-rw-r--r--tests/auto/accessibility/data/override/switchdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/override/tabbar.qml4
-rw-r--r--tests/auto/accessibility/data/override/tabbutton.qml4
-rw-r--r--tests/auto/accessibility/data/override/textarea.qml4
-rw-r--r--tests/auto/accessibility/data/override/textfield.qml4
-rw-r--r--tests/auto/accessibility/data/override/toolbar.qml4
-rw-r--r--tests/auto/accessibility/data/override/toolbutton.qml4
-rw-r--r--tests/auto/accessibility/data/override/tooltip.qml4
-rw-r--r--tests/auto/accessibility/data/override/tumbler.qml4
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tests/auto/controls/data/SignalSequenceSpy.qml2
-rw-r--r--tests/auto/controls/data/TestItem.qml2
-rw-r--r--tests/auto/controls/data/TumblerDatePicker.qml4
-rw-r--r--tests/auto/controls/data/TumblerListView.qml4
-rw-r--r--tests/auto/controls/data/TumblerPathView.qml4
-rw-r--r--tests/auto/controls/data/splitview/fillItemInMiddle.qml4
-rw-r--r--tests/auto/controls/data/splitview/fillItemOnLeft.qml4
-rw-r--r--tests/auto/controls/data/splitview/fillItemOnTop.qml4
-rw-r--r--tests/auto/controls/data/tst_abstractbutton.qml6
-rw-r--r--tests/auto/controls/data/tst_action.qml8
-rw-r--r--tests/auto/controls/data/tst_actiongroup.qml6
-rw-r--r--tests/auto/controls/data/tst_busyindicator.qml6
-rw-r--r--tests/auto/controls/data/tst_button.qml10
-rw-r--r--tests/auto/controls/data/tst_buttongroup.qml6
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml6
-rw-r--r--tests/auto/controls/data/tst_checkdelegate.qml10
-rw-r--r--tests/auto/controls/data/tst_combobox.qml36
-rw-r--r--tests/auto/controls/data/tst_container.qml8
-rw-r--r--tests/auto/controls/data/tst_control.qml8
-rw-r--r--tests/auto/controls/data/tst_delaybutton.qml6
-rw-r--r--tests/auto/controls/data/tst_dial.qml6
-rw-r--r--tests/auto/controls/data/tst_dialog.qml44
-rw-r--r--tests/auto/controls/data/tst_dialogbuttonbox.qml6
-rw-r--r--tests/auto/controls/data/tst_frame.qml6
-rw-r--r--tests/auto/controls/data/tst_groupbox.qml6
-rw-r--r--tests/auto/controls/data/tst_itemdelegate.qml10
-rw-r--r--tests/auto/controls/data/tst_label.qml6
-rw-r--r--tests/auto/controls/data/tst_menuitem.qml10
-rw-r--r--tests/auto/controls/data/tst_page.qml6
-rw-r--r--tests/auto/controls/data/tst_pageindicator.qml6
-rw-r--r--tests/auto/controls/data/tst_pane.qml6
-rw-r--r--tests/auto/controls/data/tst_popup.qml11
-rw-r--r--tests/auto/controls/data/tst_progressbar.qml6
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml6
-rw-r--r--tests/auto/controls/data/tst_radiodelegate.qml10
-rw-r--r--tests/auto/controls/data/tst_rangeslider.qml6
-rw-r--r--tests/auto/controls/data/tst_roundbutton.qml10
-rw-r--r--tests/auto/controls/data/tst_scrollbar.qml6
-rw-r--r--tests/auto/controls/data/tst_scrollindicator.qml6
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml6
-rw-r--r--tests/auto/controls/data/tst_slider.qml6
-rw-r--r--tests/auto/controls/data/tst_spinbox.qml20
-rw-r--r--tests/auto/controls/data/tst_splitview.qml10
-rw-r--r--tests/auto/controls/data/tst_stackview.qml10
-rw-r--r--tests/auto/controls/data/tst_swipedelegate.qml77
-rw-r--r--tests/auto/controls/data/tst_swipeview.qml6
-rw-r--r--tests/auto/controls/data/tst_switch.qml6
-rw-r--r--tests/auto/controls/data/tst_switchdelegate.qml10
-rw-r--r--tests/auto/controls/data/tst_tabbar.qml6
-rw-r--r--tests/auto/controls/data/tst_tabbutton.qml10
-rw-r--r--tests/auto/controls/data/tst_textarea.qml6
-rw-r--r--tests/auto/controls/data/tst_textfield.qml8
-rw-r--r--tests/auto/controls/data/tst_toolbar.qml6
-rw-r--r--tests/auto/controls/data/tst_toolbutton.qml10
-rw-r--r--tests/auto/controls/data/tst_toolseparator.qml6
-rw-r--r--tests/auto/controls/data/tst_tooltip.qml6
-rw-r--r--tests/auto/controls/data/tst_tumbler.qml8
-rw-r--r--tests/auto/controls/default/dependencies.qml6
-rw-r--r--tests/auto/controls/fusion/dependencies.qml8
-rw-r--r--tests/auto/controls/imagine/dependencies.qml8
-rw-r--r--tests/auto/controls/material/dependencies.qml8
-rw-r--r--tests/auto/controls/universal/dependencies.qml8
-rw-r--r--tests/auto/cursor/CMakeLists.txt1
-rw-r--r--tests/auto/cursor/data/buttons.qml4
-rw-r--r--tests/auto/cursor/data/containers.qml4
-rw-r--r--tests/auto/cursor/data/editable.qml4
-rw-r--r--tests/auto/cursor/data/pageindicator.qml4
-rw-r--r--tests/auto/cursor/data/scrollbar.qml4
-rw-r--r--tests/auto/cursor/data/sliders.qml4
-rw-r--r--tests/auto/customization/CMakeLists.txt1
-rw-r--r--tests/auto/customization/customization.pro2
-rw-r--r--tests/auto/customization/data/styles/empty/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/qmldir59
-rw-r--r--tests/auto/customization/data/styles/identified/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ComboBox.qml6
-rw-r--r--tests/auto/customization/data/styles/identified/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/qmldir59
-rw-r--r--tests/auto/customization/data/styles/incomplete/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/qmldir59
-rw-r--r--tests/auto/customization/data/styles/override/AbstractButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ApplicationWindow.qml2
-rw-r--r--tests/auto/customization/data/styles/override/BusyIndicator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Button.qml2
-rw-r--r--tests/auto/customization/data/styles/override/CheckBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/CheckDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/override/Container.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Control.qml2
-rw-r--r--tests/auto/customization/data/styles/override/DelayButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Dial.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Dialog.qml2
-rw-r--r--tests/auto/customization/data/styles/override/DialogButtonBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Drawer.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Frame.qml2
-rw-r--r--tests/auto/customization/data/styles/override/GroupBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ItemDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Label.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Menu.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuBarItem.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuItem.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuSeparator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Page.qml2
-rw-r--r--tests/auto/customization/data/styles/override/PageIndicator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Pane.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Popup.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ProgressBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RadioButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RadioDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RangeSlider.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RoundButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ScrollBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ScrollIndicator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ScrollView.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Slider.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SpinBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/StackView.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SwipeDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SwipeView.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Switch.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SwitchDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TabBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TabButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TextArea.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TextField.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolSeparator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolTip.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Tumbler.qml2
-rw-r--r--tests/auto/customization/data/styles/override/qmldir59
-rw-r--r--tests/auto/customization/data/styles/simple/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/qmldir59
-rw-r--r--tests/auto/customization/tst_customization.cpp22
-rw-r--r--tests/auto/focus/CMakeLists.txt1
-rw-r--r--tests/auto/focus/data/activeFocusOnTab.qml4
-rw-r--r--tests/auto/focus/data/keyNavigation.qml4
-rw-r--r--tests/auto/focus/data/visualFocus.qml4
-rw-r--r--tests/auto/font/data/font-appwindow-custom.qml4
-rw-r--r--tests/auto/font/data/font-appwindow-default.qml4
-rw-r--r--tests/auto/font/data/font-control-custom.qml4
-rw-r--r--tests/auto/font/data/font-control-default.qml4
-rw-r--r--tests/auto/font/data/font-popup-custom.qml4
-rw-r--r--tests/auto/font/data/font-popup-default.qml4
-rw-r--r--tests/auto/font/data/inheritance-childcontrol.qml4
-rw-r--r--tests/auto/font/data/inheritance-childpopup.qml4
-rw-r--r--tests/auto/font/data/inheritance-control.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamicchildcontrol.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamicchildpopup.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamiccontrol.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamicpopup.qml4
-rw-r--r--tests/auto/font/data/inheritance-popup.qml4
-rw-r--r--tests/auto/font/data/listview.qml4
-rw-r--r--tests/auto/palette/data/bindings.qml8
-rw-r--r--tests/auto/palette/data/inheritance-childcontrol.qml4
-rw-r--r--tests/auto/palette/data/inheritance-childpopup.qml4
-rw-r--r--tests/auto/palette/data/inheritance-control.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamicchildcontrol.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamicchildpopup.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamiccontrol.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamicpopup.qml4
-rw-r--r--tests/auto/palette/data/inheritance-popup.qml4
-rw-r--r--tests/auto/palette/data/listview.qml4
-rw-r--r--tests/auto/palette/data/palette-appwindow-custom.qml4
-rw-r--r--tests/auto/palette/data/palette-appwindow-default.qml4
-rw-r--r--tests/auto/palette/data/palette-control-custom.qml4
-rw-r--r--tests/auto/palette/data/palette-control-default.qml4
-rw-r--r--tests/auto/palette/data/palette-popup-custom.qml4
-rw-r--r--tests/auto/palette/data/palette-popup-default.qml4
-rw-r--r--tests/auto/palette/data/set-palette.qml4
-rw-r--r--tests/auto/platform/data/tst_colordialog.qml6
-rw-r--r--tests/auto/platform/data/tst_filedialog.qml6
-rw-r--r--tests/auto/platform/data/tst_folderdialog.qml6
-rw-r--r--tests/auto/platform/data/tst_fontdialog.qml6
-rw-r--r--tests/auto/platform/data/tst_menu.qml6
-rw-r--r--tests/auto/platform/data/tst_menubar.qml6
-rw-r--r--tests/auto/platform/data/tst_menuitem.qml6
-rw-r--r--tests/auto/platform/data/tst_menuitemgroup.qml6
-rw-r--r--tests/auto/platform/data/tst_menuseparator.qml6
-rw-r--r--tests/auto/platform/data/tst_messagedialog.qml6
-rw-r--r--tests/auto/platform/data/tst_standardpaths.qml6
-rw-r--r--tests/auto/platform/data/tst_systemtrayicon.qml6
-rw-r--r--tests/auto/pressandhold/data/dependencies.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/activeFocusControl.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/activefocusontab.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/attachedProperties.qml6
-rw-r--r--tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml8
-rw-r--r--tests/auto/qquickapplicationwindow/data/defaultFocus.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/fill.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/font.qml6
-rw-r--r--tests/auto/qquickapplicationwindow/data/layout.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/locale.qml6
-rw-r--r--tests/auto/qquickapplicationwindow/data/opacity.qml61
-rw-r--r--tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp14
-rw-r--r--tests/auto/qquickcolor/data/tst_color.qml8
-rw-r--r--tests/auto/qquickcontrol/CMakeLists.txt1
-rw-r--r--tests/auto/qquickcontrol/data/flickable.qml4
-rw-r--r--tests/auto/qquickdrawer/CMakeLists.txt1
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-button.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-wheel.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickdrawer/data/dragOverModalShadow.qml4
-rw-r--r--tests/auto/qquickdrawer/data/flickable.qml4
-rw-r--r--tests/auto/qquickdrawer/data/grabber.qml4
-rw-r--r--tests/auto/qquickdrawer/data/header.qml4
-rw-r--r--tests/auto/qquickdrawer/data/multiTouch.qml4
-rw-r--r--tests/auto/qquickdrawer/data/multiple.qml4
-rw-r--r--tests/auto/qquickdrawer/data/reposition.qml4
-rw-r--r--tests/auto/qquickdrawer/data/slider.qml4
-rw-r--r--tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-button.qml6
-rw-r--r--tests/auto/qquickdrawer/data/window-hover.qml6
-rw-r--r--tests/auto/qquickdrawer/data/window-wheel.qml6
-rw-r--r--tests/auto/qquickdrawer/data/window.qml6
-rw-r--r--tests/auto/qquickheaderview/data/ListModel.qml8
-rw-r--r--tests/auto/qquickheaderview/data/Window.qml12
-rw-r--r--tests/auto/qquickiconimage/CMakeLists.txt3
-rw-r--r--tests/auto/qquickiconimage/data/alignment.qml6
-rw-r--r--tests/auto/qquickiconimage/data/color.qml6
-rw-r--r--tests/auto/qquickiconimage/data/fileSelectors.qml6
-rw-r--r--tests/auto/qquickiconimage/data/imageProvider.qml8
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml6
-rw-r--r--tests/auto/qquickiconimage/data/root.qml2
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml6
-rw-r--r--tests/auto/qquickiconimage/data/svgNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/translucentColors.qml6
-rw-r--r--tests/auto/qquickiconimage/qquickiconimage.pro2
-rw-r--r--tests/auto/qquickiconimage/tst_qquickiconimage.cpp2
-rw-r--r--tests/auto/qquickiconlabel/CMakeLists.txt3
-rw-r--r--tests/auto/qquickiconlabel/data/colorChanges.qml8
-rw-r--r--tests/auto/qquickiconlabel/data/iconlabel.qml8
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml8
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml6
-rw-r--r--tests/auto/qquickiconlabel/qquickiconlabel.pro2
-rw-r--r--tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp4
-rw-r--r--tests/auto/qquickimaginestyle/data/tst_imagine.qml14
-rw-r--r--tests/auto/qquickmaterialstyle/data/tst_material.qml14
-rw-r--r--tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml6
-rw-r--r--tests/auto/qquickmenu/CMakeLists.txt1
-rw-r--r--tests/auto/qquickmenu/data/actions.qml4
-rw-r--r--tests/auto/qquickmenu/data/addItem.qml4
-rw-r--r--tests/auto/qquickmenu/data/applicationWindowScrollable.qml4
-rw-r--r--tests/auto/qquickmenu/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml4
-rw-r--r--tests/auto/qquickmenu/data/disableWhenTriggered.qml4
-rw-r--r--tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml4
-rw-r--r--tests/auto/qquickmenu/data/menuItemWidths.qml4
-rw-r--r--tests/auto/qquickmenu/data/menuSeparator.qml4
-rw-r--r--tests/auto/qquickmenu/data/mnemonics.qml4
-rw-r--r--tests/auto/qquickmenu/data/order.qml4
-rw-r--r--tests/auto/qquickmenu/data/popup.qml4
-rw-r--r--tests/auto/qquickmenu/data/pressAndHold.qml4
-rw-r--r--tests/auto/qquickmenu/data/removeTakeItem.qml4
-rw-r--r--tests/auto/qquickmenu/data/repeater.qml4
-rw-r--r--tests/auto/qquickmenu/data/scrollableWithPadding.qml6
-rw-r--r--tests/auto/qquickmenu/data/subMenuDisabled.qml4
-rw-r--r--tests/auto/qquickmenu/data/subMenus.qml4
-rw-r--r--tests/auto/qquickmenu/data/windowScrollable.qml6
-rw-r--r--tests/auto/qquickmenubar/CMakeLists.txt1
-rw-r--r--tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml4
-rw-r--r--tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml4
-rw-r--r--tests/auto/qquickmenubar/data/empty.qml4
-rw-r--r--tests/auto/qquickmenubar/data/menubar.qml4
-rw-r--r--tests/auto/qquickninepatchimage/CMakeLists.txt1
-rw-r--r--tests/auto/qquickninepatchimage/data/ninepatchimage.qml8
-rw-r--r--tests/auto/qquickpopup/CMakeLists.txt1
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose1.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose2.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose3.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-wheel.qml6
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml6
-rw-r--r--tests/auto/qquickpopup/data/countChanged.qml6
-rw-r--r--tests/auto/qquickpopup/data/cursor.qml4
-rw-r--r--tests/auto/qquickpopup/data/dialog.qml6
-rw-r--r--tests/auto/qquickpopup/data/disabledPalette.qml4
-rw-r--r--tests/auto/qquickpopup/data/grabber.qml4
-rw-r--r--tests/auto/qquickpopup/data/invisibleToolTipOpen.qml6
-rw-r--r--tests/auto/qquickpopup/data/nested.qml4
-rw-r--r--tests/auto/qquickpopup/data/orientation.qml6
-rw-r--r--tests/auto/qquickpopup/data/tabFence.qml8
-rw-r--r--tests/auto/qquickpopup/data/toolTipCrashOnClose.qml8
-rw-r--r--tests/auto/qquickpopup/data/window-hover.qml6
-rw-r--r--tests/auto/qquickpopup/data/window-wheel.qml6
-rw-r--r--tests/auto/qquickpopup/data/window.qml6
-rw-r--r--tests/auto/qquickpopup/tst_qquickpopup.cpp2
-rw-r--r--tests/auto/qquickstyle/CMakeLists.txt61
-rw-r--r--tests/auto/qquickstyle/data/CmdLineArgStyle/Control.qml2
-rw-r--r--tests/auto/qquickstyle/data/CmdLineArgStyle/qmldir2
-rw-r--r--tests/auto/qquickstyle/data/Custom/Label.qml2
-rw-r--r--tests/auto/qquickstyle/data/Custom/qmldir2
-rw-r--r--tests/auto/qquickstyle/data/EnvVarFallbackStyle/Control.qml2
-rw-r--r--tests/auto/qquickstyle/data/EnvVarFallbackStyle/qmldir2
-rw-r--r--tests/auto/qquickstyle/data/EnvVarStyle/Control.qml2
-rw-r--r--tests/auto/qquickstyle/data/EnvVarStyle/qmldir2
-rw-r--r--tests/auto/qquickstyle/data/custom.conf2
-rw-r--r--tests/auto/qquickstyle/data/dependencies.qml4
-rw-r--r--tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml2
-rw-r--r--tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qquickstyle.pro28
-rw-r--r--tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml2
-rw-r--r--tests/auto/qquickstyle/tst_qquickstyle.cpp190
-rw-r--r--tests/auto/qquickstyleselector/ResourceStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/Control.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/Label.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/qquickstyleselector.pro19
-rw-r--r--tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp167
-rw-r--r--tests/auto/qquickuniversalstyle/data/tst_universal.qml12
-rw-r--r--tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml6
-rw-r--r--tests/auto/revisions/data/dependencies.qml8
-rw-r--r--tests/auto/revisions/tst_revisions.cpp10
-rw-r--r--tests/auto/sanity/BLACKLIST4
-rw-r--r--tests/auto/sanity/CMakeLists.txt1
-rw-r--r--tests/auto/sanity/data/dependencies.qml4
-rw-r--r--tests/auto/sanity/sanity.pro2
-rw-r--r--tests/auto/sanity/tst_sanity.cpp367
-rw-r--r--tests/auto/shared/qtest_quickcontrols.h3
-rw-r--r--tests/auto/shared/util.pri2
-rw-r--r--tests/auto/shared/visualtestutil.cpp15
-rw-r--r--tests/auto/shared/visualtestutil.h33
-rw-r--r--tests/auto/snippets/CMakeLists.txt1
-rw-r--r--tests/auto/snippets/data/dependencies.qml10
-rw-r--r--tests/auto/snippets/snippets.pro2
-rw-r--r--tests/auto/snippets/tst_snippets.cpp13
-rw-r--r--tests/auto/styleimports/CMakeLists.txt (renamed from tests/auto/qquickstyleselector/CMakeLists.txt)19
-rw-r--r--tests/auto/styleimports/ResourceStyle/Button.qml4
-rw-r--r--tests/auto/styleimports/ResourceStyle/qmldir2
-rw-r--r--tests/auto/styleimports/data/Action.qml4
-rw-r--r--tests/auto/styleimports/data/Button.qml4
-rw-r--r--tests/auto/styleimports/data/FileSystemStyle/Button.qml4
-rw-r--r--tests/auto/styleimports/data/FileSystemStyle/qmldir2
-rw-r--r--tests/auto/styleimports/data/Label.qml4
-rw-r--r--tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml4
-rw-r--r--tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml4
-rw-r--r--tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml4
-rw-r--r--tests/auto/styleimports/data/PlatformStyle/Button.qml4
-rw-r--r--tests/auto/styleimports/data/PlatformStyle/qmldir2
-rw-r--r--tests/auto/styleimports/data/platformSelectors.qml64
-rw-r--r--tests/auto/styleimports/data/qmldir4
-rw-r--r--tests/auto/styleimports/styleimports.pro29
-rw-r--r--tests/auto/styleimports/tst_styleimports.cpp205
-rw-r--r--tests/auto/translation/CMakeLists.txt1
-rw-r--r--tests/auto/translation/data/comboBox.qml4
-rw-r--r--tests/auto/translation/data/dialogButtonBox.qml4
-rw-r--r--tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml4
-rw-r--r--tests/benchmarks/creationtime/CMakeLists.txt1
-rw-r--r--tests/benchmarks/creationtime/creationtime.pro2
-rw-r--r--tests/benchmarks/creationtime/data/dependencies.qml12
-rw-r--r--tests/benchmarks/creationtime/tst_creationtime.cpp53
-rw-r--r--tests/benchmarks/objectcount/CMakeLists.txt1
-rw-r--r--tests/benchmarks/objectcount/data/dependencies.qml12
-rw-r--r--tests/benchmarks/objectcount/tst_objectcount.cpp10
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_button.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_checkbox.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_combobox.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_container.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_control.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_dial.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_dialog.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_drawer.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_frame.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_groupbox.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_label.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_menu.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_menuitem.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_page.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_pane.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_popup.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_progressbar.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_scrollview.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_slider.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_spinbox.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_stackview.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_swipeview.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_switch.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tabbar.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_textarea.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_textfield.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tooltip.qml6
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tumbler.qml6
-rw-r--r--tests/manual/buttons/ButtonLoader.qml4
-rw-r--r--tests/manual/buttons/buttons.qml8
-rw-r--r--tests/manual/dialogs/CustomDialog.qml2
-rw-r--r--tests/manual/dialogs/DialogLabel.qml2
-rw-r--r--tests/manual/dialogs/Marker.qml2
-rw-r--r--tests/manual/dialogs/dialogs.qml6
-rw-r--r--tests/manual/fonts/main.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-button-flat.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-button.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkbox.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-combobox.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-drawer.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-menu.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-progressbar.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-slider.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipeview.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-switch.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-tabbar.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml6
-rw-r--r--tests/manual/headerview/main.qml14
-rw-r--r--tests/manual/screenshots/screenshots.qml8
-rw-r--r--tests/manual/shared/FontAwesome.qml2
-rw-r--r--tests/manual/shared/FontAwesomeIcon.qml2
-rw-r--r--tests/manual/styles-cover-flow/CoverFlowDelegate.qml4
-rw-r--r--tests/manual/styles-cover-flow/CoverFlowPath.qml2
-rw-r--r--tests/manual/styles-cover-flow/styles-cover-flow.qml4
-rw-r--r--tests/manual/styles/styles.qml6
-rw-r--r--tests/manual/systemtrayicon/systemtrayicon.qml6
-rw-r--r--tests/manual/testbench/ColorEditor.qml6
-rw-r--r--tests/manual/testbench/ControlContainer.qml2
-rw-r--r--tests/manual/testbench/ExampleContainer.qml6
-rw-r--r--tests/manual/testbench/SettingsDialog.qml10
-rw-r--r--tests/manual/testbench/controls/BusyIndicator.qml4
-rw-r--r--tests/manual/testbench/controls/Button.qml4
-rw-r--r--tests/manual/testbench/controls/CheckBox.qml4
-rw-r--r--tests/manual/testbench/controls/CheckDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/ComboBox.qml4
-rw-r--r--tests/manual/testbench/controls/DelayButton.qml4
-rw-r--r--tests/manual/testbench/controls/Dial.qml4
-rw-r--r--tests/manual/testbench/controls/Dialog.qml6
-rw-r--r--tests/manual/testbench/controls/Frame.qml4
-rw-r--r--tests/manual/testbench/controls/GroupBox.qml4
-rw-r--r--tests/manual/testbench/controls/ItemDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/Label.qml4
-rw-r--r--tests/manual/testbench/controls/Menu.qml6
-rw-r--r--tests/manual/testbench/controls/MenuBar.qml4
-rw-r--r--tests/manual/testbench/controls/Page.qml4
-rw-r--r--tests/manual/testbench/controls/PageIndicator.qml6
-rw-r--r--tests/manual/testbench/controls/Pane.qml4
-rw-r--r--tests/manual/testbench/controls/ProgressBar.qml4
-rw-r--r--tests/manual/testbench/controls/RadioButton.qml4
-rw-r--r--tests/manual/testbench/controls/RadioDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/RangeSlider.qml4
-rw-r--r--tests/manual/testbench/controls/RoundButton.qml4
-rw-r--r--tests/manual/testbench/controls/ScrollBar.qml4
-rw-r--r--tests/manual/testbench/controls/ScrollIndicator.qml4
-rw-r--r--tests/manual/testbench/controls/Slider.qml4
-rw-r--r--tests/manual/testbench/controls/SpinBox.qml4
-rw-r--r--tests/manual/testbench/controls/SplitView.qml4
-rw-r--r--tests/manual/testbench/controls/SwipeDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/Switch.qml4
-rw-r--r--tests/manual/testbench/controls/SwitchDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/TabBar.qml4
-rw-r--r--tests/manual/testbench/controls/TextArea.qml4
-rw-r--r--tests/manual/testbench/controls/TextField.qml4
-rw-r--r--tests/manual/testbench/controls/ToolBar.qml6
-rw-r--r--tests/manual/testbench/controls/ToolTip.qml6
-rw-r--r--tests/manual/testbench/controls/Tumbler.qml6
-rw-r--r--tests/manual/testbench/main.cpp3
-rw-r--r--tests/manual/testbench/testbench.pro2
-rw-r--r--tests/manual/testbench/testbench.qml18
-rw-r--r--tests/manual/viewinqwidget/main.qml4
807 files changed, 3072 insertions, 2252 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 31d13ca7..68aba613 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -24,10 +24,10 @@ add_subdirectory(qquickmenubar)
add_subdirectory(qquickninepatchimage)
add_subdirectory(qquickpopup)
add_subdirectory(qquickstyle)
-add_subdirectory(qquickstyleselector)
add_subdirectory(qquickuniversalstyle)
add_subdirectory(qquickuniversalstyleconf)
add_subdirectory(revisions)
add_subdirectory(sanity)
add_subdirectory(snippets)
+add_subdirectory(styleimports)
add_subdirectory(translation)
diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt
index 9a8fa784..4ba2c566 100644
--- a/tests/auto/accessibility/CMakeLists.txt
+++ b/tests/auto/accessibility/CMakeLists.txt
@@ -28,6 +28,7 @@ qt_add_test(tst_accessibility
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/accessibility/data/defaults/abstractbutton.qml b/tests/auto/accessibility/data/defaults/abstractbutton.qml
index b0922176..29d6b3c0 100644
--- a/tests/auto/accessibility/data/defaults/abstractbutton.qml
+++ b/tests/auto/accessibility/data/defaults/abstractbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
AbstractButton {
text: "AbstractButton"
diff --git a/tests/auto/accessibility/data/defaults/busyindicator.qml b/tests/auto/accessibility/data/defaults/busyindicator.qml
index e1c33765..baaa9ba8 100644
--- a/tests/auto/accessibility/data/defaults/busyindicator.qml
+++ b/tests/auto/accessibility/data/defaults/busyindicator.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
BusyIndicator { }
diff --git a/tests/auto/accessibility/data/defaults/button.qml b/tests/auto/accessibility/data/defaults/button.qml
index 600c05da..0359b3ac 100644
--- a/tests/auto/accessibility/data/defaults/button.qml
+++ b/tests/auto/accessibility/data/defaults/button.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Button {
text: "Button"
diff --git a/tests/auto/accessibility/data/defaults/checkbox.qml b/tests/auto/accessibility/data/defaults/checkbox.qml
index f86a9a27..c912be57 100644
--- a/tests/auto/accessibility/data/defaults/checkbox.qml
+++ b/tests/auto/accessibility/data/defaults/checkbox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
CheckBox {
text: "CheckBox"
diff --git a/tests/auto/accessibility/data/defaults/checkdelegate.qml b/tests/auto/accessibility/data/defaults/checkdelegate.qml
index 2750052f..df62bc89 100644
--- a/tests/auto/accessibility/data/defaults/checkdelegate.qml
+++ b/tests/auto/accessibility/data/defaults/checkdelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
CheckDelegate {
text: "CheckDelegate"
diff --git a/tests/auto/accessibility/data/defaults/combobox.qml b/tests/auto/accessibility/data/defaults/combobox.qml
index ec4e87ef..bfeac723 100644
--- a/tests/auto/accessibility/data/defaults/combobox.qml
+++ b/tests/auto/accessibility/data/defaults/combobox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ComboBox {
model: ["ComboBox"]
diff --git a/tests/auto/accessibility/data/defaults/container.qml b/tests/auto/accessibility/data/defaults/container.qml
index b8d57eea..7d29fec4 100644
--- a/tests/auto/accessibility/data/defaults/container.qml
+++ b/tests/auto/accessibility/data/defaults/container.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Container { }
diff --git a/tests/auto/accessibility/data/defaults/control.qml b/tests/auto/accessibility/data/defaults/control.qml
index dac5f935..280cfd29 100644
--- a/tests/auto/accessibility/data/defaults/control.qml
+++ b/tests/auto/accessibility/data/defaults/control.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control { }
diff --git a/tests/auto/accessibility/data/defaults/dial.qml b/tests/auto/accessibility/data/defaults/dial.qml
index 9a471548..d7e700b5 100644
--- a/tests/auto/accessibility/data/defaults/dial.qml
+++ b/tests/auto/accessibility/data/defaults/dial.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Dial { }
diff --git a/tests/auto/accessibility/data/defaults/dialog.qml b/tests/auto/accessibility/data/defaults/dialog.qml
index 20317a31..d88fd36d 100644
--- a/tests/auto/accessibility/data/defaults/dialog.qml
+++ b/tests/auto/accessibility/data/defaults/dialog.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Dialog {
title: "Dialog"
diff --git a/tests/auto/accessibility/data/defaults/drawer.qml b/tests/auto/accessibility/data/defaults/drawer.qml
index 9b0db5fa..60a35171 100644
--- a/tests/auto/accessibility/data/defaults/drawer.qml
+++ b/tests/auto/accessibility/data/defaults/drawer.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Drawer { }
diff --git a/tests/auto/accessibility/data/defaults/frame.qml b/tests/auto/accessibility/data/defaults/frame.qml
index 02e45a78..b70ccb55 100644
--- a/tests/auto/accessibility/data/defaults/frame.qml
+++ b/tests/auto/accessibility/data/defaults/frame.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Frame { }
diff --git a/tests/auto/accessibility/data/defaults/groupbox.qml b/tests/auto/accessibility/data/defaults/groupbox.qml
index 0fa8cff5..24f3a294 100644
--- a/tests/auto/accessibility/data/defaults/groupbox.qml
+++ b/tests/auto/accessibility/data/defaults/groupbox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
GroupBox {
title: "GroupBox"
diff --git a/tests/auto/accessibility/data/defaults/itemdelegate.qml b/tests/auto/accessibility/data/defaults/itemdelegate.qml
index 52831648..5ec95fe0 100644
--- a/tests/auto/accessibility/data/defaults/itemdelegate.qml
+++ b/tests/auto/accessibility/data/defaults/itemdelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ItemDelegate {
text: "ItemDelegate"
diff --git a/tests/auto/accessibility/data/defaults/label.qml b/tests/auto/accessibility/data/defaults/label.qml
index 6d7466bc..5f6a98cd 100644
--- a/tests/auto/accessibility/data/defaults/label.qml
+++ b/tests/auto/accessibility/data/defaults/label.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Label {
text: "Label"
diff --git a/tests/auto/accessibility/data/defaults/menu.qml b/tests/auto/accessibility/data/defaults/menu.qml
index 126914d1..07fef728 100644
--- a/tests/auto/accessibility/data/defaults/menu.qml
+++ b/tests/auto/accessibility/data/defaults/menu.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Menu { }
diff --git a/tests/auto/accessibility/data/defaults/menuitem.qml b/tests/auto/accessibility/data/defaults/menuitem.qml
index 97fd478f..194fa988 100644
--- a/tests/auto/accessibility/data/defaults/menuitem.qml
+++ b/tests/auto/accessibility/data/defaults/menuitem.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MenuItem {
text: "MenuItem"
diff --git a/tests/auto/accessibility/data/defaults/page.qml b/tests/auto/accessibility/data/defaults/page.qml
index 84036878..cd1f78e1 100644
--- a/tests/auto/accessibility/data/defaults/page.qml
+++ b/tests/auto/accessibility/data/defaults/page.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Page {
title: "Page"
diff --git a/tests/auto/accessibility/data/defaults/pageindicator.qml b/tests/auto/accessibility/data/defaults/pageindicator.qml
index 30184167..d64d5657 100644
--- a/tests/auto/accessibility/data/defaults/pageindicator.qml
+++ b/tests/auto/accessibility/data/defaults/pageindicator.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
PageIndicator { }
diff --git a/tests/auto/accessibility/data/defaults/pane.qml b/tests/auto/accessibility/data/defaults/pane.qml
index bde4fad5..765c98a3 100644
--- a/tests/auto/accessibility/data/defaults/pane.qml
+++ b/tests/auto/accessibility/data/defaults/pane.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Pane { }
diff --git a/tests/auto/accessibility/data/defaults/popup.qml b/tests/auto/accessibility/data/defaults/popup.qml
index 907d0c55..c599bd4c 100644
--- a/tests/auto/accessibility/data/defaults/popup.qml
+++ b/tests/auto/accessibility/data/defaults/popup.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Popup { }
diff --git a/tests/auto/accessibility/data/defaults/progressbar.qml b/tests/auto/accessibility/data/defaults/progressbar.qml
index 74b2cb84..b3e287c3 100644
--- a/tests/auto/accessibility/data/defaults/progressbar.qml
+++ b/tests/auto/accessibility/data/defaults/progressbar.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ProgressBar {
from: 0
diff --git a/tests/auto/accessibility/data/defaults/radiobutton.qml b/tests/auto/accessibility/data/defaults/radiobutton.qml
index 1b046d3e..d796b37e 100644
--- a/tests/auto/accessibility/data/defaults/radiobutton.qml
+++ b/tests/auto/accessibility/data/defaults/radiobutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RadioButton {
text: "RadioButton"
diff --git a/tests/auto/accessibility/data/defaults/radiodelegate.qml b/tests/auto/accessibility/data/defaults/radiodelegate.qml
index f2bec8bc..d002b985 100644
--- a/tests/auto/accessibility/data/defaults/radiodelegate.qml
+++ b/tests/auto/accessibility/data/defaults/radiodelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RadioDelegate {
text: "RadioDelegate"
diff --git a/tests/auto/accessibility/data/defaults/rangeslider.qml b/tests/auto/accessibility/data/defaults/rangeslider.qml
index 95bff377..7bd364c4 100644
--- a/tests/auto/accessibility/data/defaults/rangeslider.qml
+++ b/tests/auto/accessibility/data/defaults/rangeslider.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RangeSlider {
from: 0
diff --git a/tests/auto/accessibility/data/defaults/roundbutton.qml b/tests/auto/accessibility/data/defaults/roundbutton.qml
index 20f0ed9a..6c78c0a4 100644
--- a/tests/auto/accessibility/data/defaults/roundbutton.qml
+++ b/tests/auto/accessibility/data/defaults/roundbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RoundButton {
text: "RoundButton"
diff --git a/tests/auto/accessibility/data/defaults/scrollbar.qml b/tests/auto/accessibility/data/defaults/scrollbar.qml
index 1e7cf155..c36b1534 100644
--- a/tests/auto/accessibility/data/defaults/scrollbar.qml
+++ b/tests/auto/accessibility/data/defaults/scrollbar.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ScrollBar { }
diff --git a/tests/auto/accessibility/data/defaults/scrollindicator.qml b/tests/auto/accessibility/data/defaults/scrollindicator.qml
index 24ef9271..5b2f44b6 100644
--- a/tests/auto/accessibility/data/defaults/scrollindicator.qml
+++ b/tests/auto/accessibility/data/defaults/scrollindicator.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ScrollIndicator { }
diff --git a/tests/auto/accessibility/data/defaults/slider.qml b/tests/auto/accessibility/data/defaults/slider.qml
index 0d1db79c..fd60a198 100644
--- a/tests/auto/accessibility/data/defaults/slider.qml
+++ b/tests/auto/accessibility/data/defaults/slider.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Slider {
from: 0
diff --git a/tests/auto/accessibility/data/defaults/spinbox.qml b/tests/auto/accessibility/data/defaults/spinbox.qml
index 3da1f868..159e1f46 100644
--- a/tests/auto/accessibility/data/defaults/spinbox.qml
+++ b/tests/auto/accessibility/data/defaults/spinbox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SpinBox {
from: 0
diff --git a/tests/auto/accessibility/data/defaults/stackview.qml b/tests/auto/accessibility/data/defaults/stackview.qml
index 48cb384e..bd540b91 100644
--- a/tests/auto/accessibility/data/defaults/stackview.qml
+++ b/tests/auto/accessibility/data/defaults/stackview.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
StackView { }
diff --git a/tests/auto/accessibility/data/defaults/swipedelegate.qml b/tests/auto/accessibility/data/defaults/swipedelegate.qml
index d6f503c4..d3724d4d 100644
--- a/tests/auto/accessibility/data/defaults/swipedelegate.qml
+++ b/tests/auto/accessibility/data/defaults/swipedelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SwipeDelegate {
text: "SwipeDelegate"
diff --git a/tests/auto/accessibility/data/defaults/swipeview.qml b/tests/auto/accessibility/data/defaults/swipeview.qml
index efb185e6..9eb82216 100644
--- a/tests/auto/accessibility/data/defaults/swipeview.qml
+++ b/tests/auto/accessibility/data/defaults/swipeview.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SwipeView { }
diff --git a/tests/auto/accessibility/data/defaults/switch.qml b/tests/auto/accessibility/data/defaults/switch.qml
index b9c8a572..00213086 100644
--- a/tests/auto/accessibility/data/defaults/switch.qml
+++ b/tests/auto/accessibility/data/defaults/switch.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Switch {
text: "Switch"
diff --git a/tests/auto/accessibility/data/defaults/switchdelegate.qml b/tests/auto/accessibility/data/defaults/switchdelegate.qml
index d0d9599c..9f71ed68 100644
--- a/tests/auto/accessibility/data/defaults/switchdelegate.qml
+++ b/tests/auto/accessibility/data/defaults/switchdelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SwitchDelegate {
text: "SwitchDelegate"
diff --git a/tests/auto/accessibility/data/defaults/tabbar.qml b/tests/auto/accessibility/data/defaults/tabbar.qml
index d65b1305..423bfea9 100644
--- a/tests/auto/accessibility/data/defaults/tabbar.qml
+++ b/tests/auto/accessibility/data/defaults/tabbar.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TabBar { }
diff --git a/tests/auto/accessibility/data/defaults/tabbutton.qml b/tests/auto/accessibility/data/defaults/tabbutton.qml
index 72277a9f..ab9ea8ae 100644
--- a/tests/auto/accessibility/data/defaults/tabbutton.qml
+++ b/tests/auto/accessibility/data/defaults/tabbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TabButton {
text: "TabButton"
diff --git a/tests/auto/accessibility/data/defaults/textarea.qml b/tests/auto/accessibility/data/defaults/textarea.qml
index c861cda4..9a1f31d0 100644
--- a/tests/auto/accessibility/data/defaults/textarea.qml
+++ b/tests/auto/accessibility/data/defaults/textarea.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TextArea {
text: "TextArea"
diff --git a/tests/auto/accessibility/data/defaults/textfield.qml b/tests/auto/accessibility/data/defaults/textfield.qml
index 222a1223..42a16bae 100644
--- a/tests/auto/accessibility/data/defaults/textfield.qml
+++ b/tests/auto/accessibility/data/defaults/textfield.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TextField {
text: "TextField"
diff --git a/tests/auto/accessibility/data/defaults/toolbar.qml b/tests/auto/accessibility/data/defaults/toolbar.qml
index f8cbe311..01b93d7d 100644
--- a/tests/auto/accessibility/data/defaults/toolbar.qml
+++ b/tests/auto/accessibility/data/defaults/toolbar.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ToolBar { }
diff --git a/tests/auto/accessibility/data/defaults/toolbutton.qml b/tests/auto/accessibility/data/defaults/toolbutton.qml
index 84d67cfa..40e1152e 100644
--- a/tests/auto/accessibility/data/defaults/toolbutton.qml
+++ b/tests/auto/accessibility/data/defaults/toolbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ToolButton {
text: "ToolButton"
diff --git a/tests/auto/accessibility/data/defaults/tooltip.qml b/tests/auto/accessibility/data/defaults/tooltip.qml
index a6f7718d..f1c3cebe 100644
--- a/tests/auto/accessibility/data/defaults/tooltip.qml
+++ b/tests/auto/accessibility/data/defaults/tooltip.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ToolTip {
text: "ToolTip"
diff --git a/tests/auto/accessibility/data/defaults/tumbler.qml b/tests/auto/accessibility/data/defaults/tumbler.qml
index fda5c2bd..e3db175b 100644
--- a/tests/auto/accessibility/data/defaults/tumbler.qml
+++ b/tests/auto/accessibility/data/defaults/tumbler.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Tumbler { }
diff --git a/tests/auto/accessibility/data/override/abstractbutton.qml b/tests/auto/accessibility/data/override/abstractbutton.qml
index 67344329..ac8efe26 100644
--- a/tests/auto/accessibility/data/override/abstractbutton.qml
+++ b/tests/auto/accessibility/data/override/abstractbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
AbstractButton {
text: "AbstractButton"
diff --git a/tests/auto/accessibility/data/override/busyindicator.qml b/tests/auto/accessibility/data/override/busyindicator.qml
index cc2afbc5..439788d1 100644
--- a/tests/auto/accessibility/data/override/busyindicator.qml
+++ b/tests/auto/accessibility/data/override/busyindicator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
BusyIndicator {
Accessible.name: "BusyIndicatorOverride"
diff --git a/tests/auto/accessibility/data/override/button.qml b/tests/auto/accessibility/data/override/button.qml
index 8e1bdb5f..578af86c 100644
--- a/tests/auto/accessibility/data/override/button.qml
+++ b/tests/auto/accessibility/data/override/button.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Button {
text: "Button"
diff --git a/tests/auto/accessibility/data/override/checkbox.qml b/tests/auto/accessibility/data/override/checkbox.qml
index ec532d65..5df73509 100644
--- a/tests/auto/accessibility/data/override/checkbox.qml
+++ b/tests/auto/accessibility/data/override/checkbox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
CheckBox {
text: "CheckBox"
diff --git a/tests/auto/accessibility/data/override/checkdelegate.qml b/tests/auto/accessibility/data/override/checkdelegate.qml
index 94bb0ee0..43f65d50 100644
--- a/tests/auto/accessibility/data/override/checkdelegate.qml
+++ b/tests/auto/accessibility/data/override/checkdelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
CheckDelegate {
text: "CheckDelegate"
diff --git a/tests/auto/accessibility/data/override/combobox.qml b/tests/auto/accessibility/data/override/combobox.qml
index dc087212..fa6ed3b4 100644
--- a/tests/auto/accessibility/data/override/combobox.qml
+++ b/tests/auto/accessibility/data/override/combobox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ComboBox {
model: ["ComboBox"]
diff --git a/tests/auto/accessibility/data/override/container.qml b/tests/auto/accessibility/data/override/container.qml
index 987b8336..4e73f341 100644
--- a/tests/auto/accessibility/data/override/container.qml
+++ b/tests/auto/accessibility/data/override/container.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Container {
Accessible.name: "ContainerOverride"
diff --git a/tests/auto/accessibility/data/override/control.qml b/tests/auto/accessibility/data/override/control.qml
index 72f92c3d..9c2be461 100644
--- a/tests/auto/accessibility/data/override/control.qml
+++ b/tests/auto/accessibility/data/override/control.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control {
Accessible.name: "ControlOverride"
diff --git a/tests/auto/accessibility/data/override/dial.qml b/tests/auto/accessibility/data/override/dial.qml
index 558b31ea..8dbf0e37 100644
--- a/tests/auto/accessibility/data/override/dial.qml
+++ b/tests/auto/accessibility/data/override/dial.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Dial {
Accessible.name: "DialOverride"
diff --git a/tests/auto/accessibility/data/override/dialog.qml b/tests/auto/accessibility/data/override/dialog.qml
index 30843ffd..d1f31971 100644
--- a/tests/auto/accessibility/data/override/dialog.qml
+++ b/tests/auto/accessibility/data/override/dialog.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Dialog {
title: "Dialog"
diff --git a/tests/auto/accessibility/data/override/drawer.qml b/tests/auto/accessibility/data/override/drawer.qml
index 9867d27d..02e973e2 100644
--- a/tests/auto/accessibility/data/override/drawer.qml
+++ b/tests/auto/accessibility/data/override/drawer.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Drawer {
Accessible.name: "DrawerOverride"
diff --git a/tests/auto/accessibility/data/override/frame.qml b/tests/auto/accessibility/data/override/frame.qml
index 0e99e8c3..55086b35 100644
--- a/tests/auto/accessibility/data/override/frame.qml
+++ b/tests/auto/accessibility/data/override/frame.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Frame {
Accessible.name: "FrameOverride"
diff --git a/tests/auto/accessibility/data/override/groupbox.qml b/tests/auto/accessibility/data/override/groupbox.qml
index ab58d30b..d09d0845 100644
--- a/tests/auto/accessibility/data/override/groupbox.qml
+++ b/tests/auto/accessibility/data/override/groupbox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
GroupBox {
title: "GroupBox"
diff --git a/tests/auto/accessibility/data/override/itemdelegate.qml b/tests/auto/accessibility/data/override/itemdelegate.qml
index 4f25efd3..2f32cb75 100644
--- a/tests/auto/accessibility/data/override/itemdelegate.qml
+++ b/tests/auto/accessibility/data/override/itemdelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ItemDelegate {
text: "ItemDelegate"
diff --git a/tests/auto/accessibility/data/override/label.qml b/tests/auto/accessibility/data/override/label.qml
index 235c0661..5c1310f8 100644
--- a/tests/auto/accessibility/data/override/label.qml
+++ b/tests/auto/accessibility/data/override/label.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Label {
text: "Label"
diff --git a/tests/auto/accessibility/data/override/menu.qml b/tests/auto/accessibility/data/override/menu.qml
index 15628ea5..57a1b3d6 100644
--- a/tests/auto/accessibility/data/override/menu.qml
+++ b/tests/auto/accessibility/data/override/menu.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Menu {
Accessible.name: "MenuOverride"
diff --git a/tests/auto/accessibility/data/override/menuitem.qml b/tests/auto/accessibility/data/override/menuitem.qml
index 89bdaf9a..e1c064f3 100644
--- a/tests/auto/accessibility/data/override/menuitem.qml
+++ b/tests/auto/accessibility/data/override/menuitem.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MenuItem {
text: "MenuItem"
diff --git a/tests/auto/accessibility/data/override/page.qml b/tests/auto/accessibility/data/override/page.qml
index 0d275d84..b3b87e8a 100644
--- a/tests/auto/accessibility/data/override/page.qml
+++ b/tests/auto/accessibility/data/override/page.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Page {
title: "Page"
diff --git a/tests/auto/accessibility/data/override/pageindicator.qml b/tests/auto/accessibility/data/override/pageindicator.qml
index 4af84eda..f366464d 100644
--- a/tests/auto/accessibility/data/override/pageindicator.qml
+++ b/tests/auto/accessibility/data/override/pageindicator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
PageIndicator {
Accessible.name: "PageIndicatorOverride"
diff --git a/tests/auto/accessibility/data/override/pane.qml b/tests/auto/accessibility/data/override/pane.qml
index b2f27db2..7b57e9a9 100644
--- a/tests/auto/accessibility/data/override/pane.qml
+++ b/tests/auto/accessibility/data/override/pane.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Pane {
Accessible.name: "PaneOverride"
diff --git a/tests/auto/accessibility/data/override/popup.qml b/tests/auto/accessibility/data/override/popup.qml
index e1126e2f..9d8d5855 100644
--- a/tests/auto/accessibility/data/override/popup.qml
+++ b/tests/auto/accessibility/data/override/popup.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Popup {
Accessible.name: "PopupOverride"
diff --git a/tests/auto/accessibility/data/override/progressbar.qml b/tests/auto/accessibility/data/override/progressbar.qml
index bba0998a..58bd2ae1 100644
--- a/tests/auto/accessibility/data/override/progressbar.qml
+++ b/tests/auto/accessibility/data/override/progressbar.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ProgressBar {
from: 0
diff --git a/tests/auto/accessibility/data/override/radiobutton.qml b/tests/auto/accessibility/data/override/radiobutton.qml
index 89ad797d..3c555256 100644
--- a/tests/auto/accessibility/data/override/radiobutton.qml
+++ b/tests/auto/accessibility/data/override/radiobutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RadioButton {
text: "RadioButton"
diff --git a/tests/auto/accessibility/data/override/radiodelegate.qml b/tests/auto/accessibility/data/override/radiodelegate.qml
index 1e6bee91..883f963c 100644
--- a/tests/auto/accessibility/data/override/radiodelegate.qml
+++ b/tests/auto/accessibility/data/override/radiodelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RadioDelegate {
text: "RadioDelegate"
diff --git a/tests/auto/accessibility/data/override/rangeslider.qml b/tests/auto/accessibility/data/override/rangeslider.qml
index 8758a19f..675c34aa 100644
--- a/tests/auto/accessibility/data/override/rangeslider.qml
+++ b/tests/auto/accessibility/data/override/rangeslider.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RangeSlider {
from: 0
diff --git a/tests/auto/accessibility/data/override/roundbutton.qml b/tests/auto/accessibility/data/override/roundbutton.qml
index c338afd1..a793ee28 100644
--- a/tests/auto/accessibility/data/override/roundbutton.qml
+++ b/tests/auto/accessibility/data/override/roundbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
RoundButton {
text: "RoundButton"
diff --git a/tests/auto/accessibility/data/override/scrollbar.qml b/tests/auto/accessibility/data/override/scrollbar.qml
index 4849994f..6b3e613c 100644
--- a/tests/auto/accessibility/data/override/scrollbar.qml
+++ b/tests/auto/accessibility/data/override/scrollbar.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ScrollBar {
Accessible.name: "ScrollBarOverride"
diff --git a/tests/auto/accessibility/data/override/scrollindicator.qml b/tests/auto/accessibility/data/override/scrollindicator.qml
index 2e85d8db..5cc1e5d4 100644
--- a/tests/auto/accessibility/data/override/scrollindicator.qml
+++ b/tests/auto/accessibility/data/override/scrollindicator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ScrollIndicator {
Accessible.name: "ScrollIndicatorOverride"
diff --git a/tests/auto/accessibility/data/override/slider.qml b/tests/auto/accessibility/data/override/slider.qml
index 1fde4977..9239f8db 100644
--- a/tests/auto/accessibility/data/override/slider.qml
+++ b/tests/auto/accessibility/data/override/slider.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Slider {
from: 0
diff --git a/tests/auto/accessibility/data/override/spinbox.qml b/tests/auto/accessibility/data/override/spinbox.qml
index 51c883b1..327f2a6d 100644
--- a/tests/auto/accessibility/data/override/spinbox.qml
+++ b/tests/auto/accessibility/data/override/spinbox.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SpinBox {
from: 0
diff --git a/tests/auto/accessibility/data/override/stackview.qml b/tests/auto/accessibility/data/override/stackview.qml
index dfc3e925..dd3b8342 100644
--- a/tests/auto/accessibility/data/override/stackview.qml
+++ b/tests/auto/accessibility/data/override/stackview.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
StackView {
Accessible.name: "StackViewOverride"
diff --git a/tests/auto/accessibility/data/override/swipedelegate.qml b/tests/auto/accessibility/data/override/swipedelegate.qml
index 9e3f00a9..bc97fc93 100644
--- a/tests/auto/accessibility/data/override/swipedelegate.qml
+++ b/tests/auto/accessibility/data/override/swipedelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SwipeDelegate {
text: "SwipeDelegate"
diff --git a/tests/auto/accessibility/data/override/swipeview.qml b/tests/auto/accessibility/data/override/swipeview.qml
index 9b3734b2..809b5362 100644
--- a/tests/auto/accessibility/data/override/swipeview.qml
+++ b/tests/auto/accessibility/data/override/swipeview.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SwipeView {
Accessible.name: "SwipeViewOverride"
diff --git a/tests/auto/accessibility/data/override/switch.qml b/tests/auto/accessibility/data/override/switch.qml
index 9162a374..18e3eb70 100644
--- a/tests/auto/accessibility/data/override/switch.qml
+++ b/tests/auto/accessibility/data/override/switch.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Switch {
text: "Switch"
diff --git a/tests/auto/accessibility/data/override/switchdelegate.qml b/tests/auto/accessibility/data/override/switchdelegate.qml
index f1a99c69..0c66f9e9 100644
--- a/tests/auto/accessibility/data/override/switchdelegate.qml
+++ b/tests/auto/accessibility/data/override/switchdelegate.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
SwitchDelegate {
text: "SwitchDelegate"
diff --git a/tests/auto/accessibility/data/override/tabbar.qml b/tests/auto/accessibility/data/override/tabbar.qml
index 9e00d017..a959f68c 100644
--- a/tests/auto/accessibility/data/override/tabbar.qml
+++ b/tests/auto/accessibility/data/override/tabbar.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TabBar {
Accessible.name: "TabBarOverride"
diff --git a/tests/auto/accessibility/data/override/tabbutton.qml b/tests/auto/accessibility/data/override/tabbutton.qml
index 2b9f83d1..1530a2d1 100644
--- a/tests/auto/accessibility/data/override/tabbutton.qml
+++ b/tests/auto/accessibility/data/override/tabbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TabButton {
text: "TabButton"
diff --git a/tests/auto/accessibility/data/override/textarea.qml b/tests/auto/accessibility/data/override/textarea.qml
index 00ebdb59..2b142225 100644
--- a/tests/auto/accessibility/data/override/textarea.qml
+++ b/tests/auto/accessibility/data/override/textarea.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TextArea {
text: "TextArea"
diff --git a/tests/auto/accessibility/data/override/textfield.qml b/tests/auto/accessibility/data/override/textfield.qml
index 6f5bb469..42098b66 100644
--- a/tests/auto/accessibility/data/override/textfield.qml
+++ b/tests/auto/accessibility/data/override/textfield.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
TextField {
text: "TextField"
diff --git a/tests/auto/accessibility/data/override/toolbar.qml b/tests/auto/accessibility/data/override/toolbar.qml
index 170c8ce5..97406f8c 100644
--- a/tests/auto/accessibility/data/override/toolbar.qml
+++ b/tests/auto/accessibility/data/override/toolbar.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ToolBar {
Accessible.name: "ToolBarOverride"
diff --git a/tests/auto/accessibility/data/override/toolbutton.qml b/tests/auto/accessibility/data/override/toolbutton.qml
index 12b634e7..5ecb427b 100644
--- a/tests/auto/accessibility/data/override/toolbutton.qml
+++ b/tests/auto/accessibility/data/override/toolbutton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ToolButton {
text: "ToolButton"
diff --git a/tests/auto/accessibility/data/override/tooltip.qml b/tests/auto/accessibility/data/override/tooltip.qml
index 92ff8396..1a4c3a99 100644
--- a/tests/auto/accessibility/data/override/tooltip.qml
+++ b/tests/auto/accessibility/data/override/tooltip.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ToolTip {
text: "ToolTip"
diff --git a/tests/auto/accessibility/data/override/tumbler.qml b/tests/auto/accessibility/data/override/tumbler.qml
index ac1221d7..947f66cd 100644
--- a/tests/auto/accessibility/data/override/tumbler.qml
+++ b/tests/auto/accessibility/data/override/tumbler.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Tumbler {
Accessible.name: "TumblerOverride"
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 03b6369d..28d00c2a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -24,10 +24,10 @@ SUBDIRS += \
qquickninepatchimage \
qquickpopup \
qquickstyle \
- qquickstyleselector \
qquickuniversalstyle \
qquickuniversalstyleconf \
revisions \
sanity \
snippets \
+ styleimports \
translation
diff --git a/tests/auto/controls/data/SignalSequenceSpy.qml b/tests/auto/controls/data/SignalSequenceSpy.qml
index 531a7f68..40718c09 100644
--- a/tests/auto/controls/data/SignalSequenceSpy.qml
+++ b/tests/auto/controls/data/SignalSequenceSpy.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
QtObject {
property QtObject target: null
diff --git a/tests/auto/controls/data/TestItem.qml b/tests/auto/controls/data/TestItem.qml
index 6bd42bac..df81269c 100644
--- a/tests/auto/controls/data/TestItem.qml
+++ b/tests/auto/controls/data/TestItem.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
Item {
id: item
diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml
index 01ff2c03..c11b504b 100644
--- a/tests/auto/controls/data/TumblerDatePicker.qml
+++ b/tests/auto/controls/data/TumblerDatePicker.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Row {
id: datePicker
diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/controls/data/TumblerListView.qml
index 33504f33..a581c432 100644
--- a/tests/auto/controls/data/TumblerListView.qml
+++ b/tests/auto/controls/data/TumblerListView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ListView {
implicitWidth: 60
diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/controls/data/TumblerPathView.qml
index ec0d73ef..0f9be0e9 100644
--- a/tests/auto/controls/data/TumblerPathView.qml
+++ b/tests/auto/controls/data/TumblerPathView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
PathView {
id: pathView
diff --git a/tests/auto/controls/data/splitview/fillItemInMiddle.qml b/tests/auto/controls/data/splitview/fillItemInMiddle.qml
index 174b6a2a..0acac9eb 100644
--- a/tests/auto/controls/data/splitview/fillItemInMiddle.qml
+++ b/tests/auto/controls/data/splitview/fillItemInMiddle.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Controls
SplitView {
anchors.fill: parent
diff --git a/tests/auto/controls/data/splitview/fillItemOnLeft.qml b/tests/auto/controls/data/splitview/fillItemOnLeft.qml
index dee68eac..6f9c6e0b 100644
--- a/tests/auto/controls/data/splitview/fillItemOnLeft.qml
+++ b/tests/auto/controls/data/splitview/fillItemOnLeft.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Controls
SplitView {
anchors.fill: parent
diff --git a/tests/auto/controls/data/splitview/fillItemOnTop.qml b/tests/auto/controls/data/splitview/fillItemOnTop.qml
index 2fc6f4d0..2955aa61 100644
--- a/tests/auto/controls/data/splitview/fillItemOnTop.qml
+++ b/tests/auto/controls/data/splitview/fillItemOnTop.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Controls
SplitView {
anchors.fill: parent
diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index da5642cc..bb1dfac2 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml
index 0e41b7f3..946382ee 100644
--- a/tests/auto/controls/data/tst_action.qml
+++ b/tests/auto/controls/data/tst_action.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Templates as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_actiongroup.qml b/tests/auto/controls/data/tst_actiongroup.qml
index 6c8ea5c4..e4ea5679 100644
--- a/tests/auto/controls/data/tst_actiongroup.qml
+++ b/tests/auto/controls/data/tst_actiongroup.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml
index 7801cdab..9353c338 100644
--- a/tests/auto/controls/data/tst_busyindicator.qml
+++ b/tests/auto/controls/data/tst_busyindicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 83a6ea61..f27e5bcb 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -467,11 +467,11 @@ TestCase {
var control = createTemporaryObject(button, testCase, {
text: "Button",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml
index 1abb9795..138c0e24 100644
--- a/tests/auto/controls/data/tst_buttongroup.qml
+++ b/tests/auto/controls/data/tst_buttongroup.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 1f00294f..81c3d6ca 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml
index 0c0565f1..e5137787 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/controls/data/tst_checkdelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -126,11 +126,11 @@ TestCase {
text: "CheckDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 7369f263..4755c92b 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtTest 1.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Window
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -215,9 +215,9 @@ TestCase {
var control = createTemporaryObject(emptyBox, testCase, {textRole: "text"})
verify(control)
- var obj1 = Qt.createQmlObject("import QtQml 2.0; QtObject { property string text: 'one' }", control)
- var obj2 = Qt.createQmlObject("import QtQml 2.0; QtObject { property string text: 'two' }", control)
- var obj3 = Qt.createQmlObject("import QtQml 2.0; QtObject { property string text: 'three' }", control)
+ var obj1 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'one' }", control)
+ var obj2 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'two' }", control)
+ var obj3 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'three' }", control)
control.model = [obj1, obj2, obj3]
@@ -911,6 +911,28 @@ TestCase {
compare(control.popup.visible, true)
verify(control.popup.contentItem.y < control.y)
+
+ // Account for when a transition of a scale from 0.9-1.0 that it is placed above right away and not below
+ // first just because there is room at the 0.9 scale
+ if (control.popup.enter !== null) {
+ // hide
+ mouseClick(control)
+ compare(control.pressed, false)
+ tryCompare(control.popup, "visible", false)
+ control.y = control.Window.height - (control.popup.contentItem.height * 0.99)
+ var popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.popup, signalName: "yChanged"})
+ verify(popupYSpy.valid)
+ mousePress(control)
+ compare(control.pressed, true)
+ compare(control.popup.visible, false)
+ mouseRelease(control)
+ compare(control.pressed, false)
+ compare(control.popup.visible, true)
+ tryCompare(control.popup.enter, "running", false)
+ verify(control.popup.contentItem.y < control.y)
+ verify(popupYSpy.count === 1)
+ }
+
// follow the control outside the horizontal window bounds
control.x = -control.width / 2
compare(control.x, -control.width / 2)
diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml
index c04a3402..be2b9a12 100644
--- a/tests/auto/controls/data/tst_container.qml
+++ b/tests/auto/controls/data/tst_container.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Templates as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml
index 3c416546..1bbbe42a 100644
--- a/tests/auto/controls/data/tst_control.qml
+++ b/tests/auto/controls/data/tst_control.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Templates as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml
index e965b5ef..731caf86 100644
--- a/tests/auto/controls/data/tst_delaybutton.qml
+++ b/tests/auto/controls/data/tst_delaybutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml
index 26f30c33..70645f8d 100644
--- a/tests/auto/controls/data/tst_dial.qml
+++ b/tests/auto/controls/data/tst_dial.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml
index 1bfffc1d..53d27fd3 100644
--- a/tests/auto/controls/data/tst_dialog.qml
+++ b/tests/auto/controls/data/tst_dialog.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Templates as T
TestCase {
id: testCase
@@ -411,4 +411,40 @@ TestCase {
button.clicked()
compare(buttonSpy.count, 1)
}
+
+ Component {
+ id: qtbug85884
+ ApplicationWindow {
+ property alias focusItemActiveFocus: item.activeFocus
+ property alias focusDialogVisible: dialog.visible
+ visible: true
+ Item {
+ id: item
+ focus: true
+ }
+ Dialog {
+ id: dialog
+ focus: true
+ visible: false
+ onActiveFocusChanged: {
+ if (!activeFocus)
+ visible = false
+ }
+ }
+ }
+ }
+
+ function test_focusLeavingDialog(data) {
+ var window = createTemporaryObject(qtbug85884, testCase)
+ verify(window)
+ tryCompare(window, "focusItemActiveFocus", true)
+
+ window.focusDialogVisible = true
+ tryCompare(window, "focusDialogVisible", true)
+ tryCompare(window, "focusItemActiveFocus", false)
+
+ window.focusDialogVisible = false
+ tryCompare(window, "focusDialogVisible", false)
+ tryCompare(window, "focusItemActiveFocus", true)
+ }
}
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index a651713a..16a5fe5e 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml
index a5236b71..95c69144 100644
--- a/tests/auto/controls/data/tst_frame.qml
+++ b/tests/auto/controls/data/tst_frame.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index a4f1b5f3..ed714897 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 1c236361..6a4b29b4 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/controls/data/tst_itemdelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -118,11 +118,11 @@ TestCase {
text: "ItemDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index 8384e932..d6efb137 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml
index ef074d1d..be84ae90 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/controls/data/tst_menuitem.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -119,11 +119,11 @@ TestCase {
var control = createTemporaryObject(menuItem, testCase, {
text: "MenuItem",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var padding = data.mirrored ? control.contentItem.rightPadding : control.contentItem.leftPadding
var iconImage = findChild(control.contentItem, "image")
diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml
index 252c6ebf..ae78a125 100644
--- a/tests/auto/controls/data/tst_page.qml
+++ b/tests/auto/controls/data/tst_page.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml
index 0f68b5d8..765c52a7 100644
--- a/tests/auto/controls/data/tst_pageindicator.qml
+++ b/tests/auto/controls/data/tst_pageindicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml
index 4006474b..d44d7424 100644
--- a/tests/auto/controls/data/tst_pane.qml
+++ b/tests/auto/controls/data/tst_pane.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 0c6ab78a..2c94e87b 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Templates as T
TestCase {
id: testCase
@@ -1275,6 +1275,9 @@ TestCase {
{ visible: true, width: 100, height: 100 })
verify(control)
verify(control.visible)
+ // If there is a transition then make sure it is finished
+ if (control.enter !== null)
+ tryCompare(control.enter, "running", false)
compare(control.parent, control.Overlay.overlay)
compare(control.x, 0)
compare(control.y, 0)
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index 74840551..1bb66bb7 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index c16f615c..42ef9a15 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml
index ff11fffb..9a4e2812 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/controls/data/tst_radiodelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -126,11 +126,11 @@ TestCase {
text: "RadioDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml
index 24f8a207..55fedd1c 100644
--- a/tests/auto/controls/data/tst_rangeslider.qml
+++ b/tests/auto/controls/data/tst_rangeslider.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml
index 5f4cc5fa..c683d457 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/controls/data/tst_roundbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -122,11 +122,11 @@ TestCase {
var control = createTemporaryObject(roundButton, testCase, {
text: "RoundButton",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index 9d21fa8b..29b04c53 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml
index c23bf3e5..5f6006d4 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/controls/data/tst_scrollindicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 87c39509..d8c210a4 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 280138c5..9f123476 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index a5c40cd3..5898ff52 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.14
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Window 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Window
TestCase {
id: testCase
@@ -549,6 +549,12 @@ TestCase {
compare(valueFromTextCalls, data.editable ? 3 : 0)
}
+ function test_callDefaultValueFromText() {
+ var control = createTemporaryObject(spinBox, testCase)
+ verify(control)
+ compare(control.valueFromText("123", control.locale), 123)
+ }
+
function test_autoRepeat() {
var control = createTemporaryObject(spinBox, testCase)
verify(control)
@@ -659,6 +665,12 @@ TestCase {
}
}
+ function test_callDefaultTextFromValue() {
+ var control = createTemporaryObject(spinBox, testCase)
+ verify(control)
+ compare(control.textFromValue(123, control.locale), "123")
+ }
+
Component {
id: overriddenSpinBox
SpinBox {
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index d78ef95a..ac6d1a4d 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -48,11 +48,11 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Controls 2.13
-import QtQuick.Window 2.13
-import QtTest 1.13
-import Qt.labs.settings 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
+import QtTest
+import Qt.labs.settings
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index 767ec818..a3df827a 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -406,7 +406,7 @@ TestCase {
// unsupported type
ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":69:9: QML StackView: push: QtObject is not supported. Must be Item or Component.")
- control.push(Qt.createQmlObject('import QtQml 2.0; QtObject { }', control))
+ control.push(Qt.createQmlObject('import QtQml; QtObject { }', control))
// push(item)
var item1 = component.createObject(control, {objectName:"1"})
@@ -506,7 +506,7 @@ TestCase {
// unsupported type
ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":69:9: QML StackView: replace: QtObject is not supported. Must be Item or Component.")
- compare(control.replace(Qt.createQmlObject('import QtQml 2.0; QtObject { }', control)), null)
+ compare(control.replace(Qt.createQmlObject('import QtQml; QtObject { }', control)), null)
// replace(item)
var item1 = component.createObject(control, {objectName:"1"})
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 71eb0b99..98273066 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
@@ -196,7 +196,8 @@ TestCase {
mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
mouseMove(control, control.width / 2 + distance, control.height / 2);
mouseRelease(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton);
- compare(control.swipe.position, to);
+ compare(control.swipe.position, to, "Expected swipe.position to be " + to
+ + " after swiping from " + from + ", but it's " + control.swipe.position);
if (control.swipe.position === -1.0) {
if (control.swipe.right)
@@ -1110,6 +1111,70 @@ TestCase {
swipe(control, 0.0, -1.0);
}
+ function test_callCloseWhenAlreadyClosed() {
+ let control = createTemporaryObject(swipeDelegateComponent, testCase)
+ verify(control)
+
+ let closedSpy = signalSpyComponent.createObject(control, { target: control.swipe, signalName: "closed" })
+ verify(closedSpy)
+ verify(closedSpy.valid)
+
+ // Calling close() when it's already closed should have no effect.
+ control.swipe.close()
+ compare(closedSpy.count, 0)
+
+ // The game goes for calling close() in response to a click.
+ control.clicked.connect(function() { control.swipe.close() })
+ mouseClick(control)
+ compare(closedSpy.count, 0)
+ }
+
+ // Can't just connect to pressed in QML, because there is a pressed property
+ // that conflicts with the signal.
+ Component {
+ id: swipeDelegateCloseOnPressedComponent
+
+ SwipeDelegate {
+ text: "SwipeDelegate"
+ width: 150
+ swipe.right: Rectangle {
+ objectName: "rightItem"
+ width: parent.width / 2
+ height: parent.height
+ color: "tomato"
+ }
+
+ onPressed: swipe.close()
+ }
+ }
+
+ /*
+ We don't want to support closing on pressed(); released() or clicked()
+ should be used instead. However, calling swipe.close() in response to
+ a press should still not cause closed() to be emitted.
+ */
+ function test_closeOnPressed() {
+ let control = createTemporaryObject(swipeDelegateCloseOnPressedComponent, testCase)
+ verify(control)
+
+ swipe(control, 0.0, -1.0)
+
+ let closedSpy = signalSpyComponent.createObject(control, { target: control.swipe, signalName: "closed" })
+ verify(closedSpy)
+ verify(closedSpy.valid)
+
+ mousePress(control, control.width * 0.1)
+ compare(closedSpy.count, 0)
+ compare(control.swipe.position, -1.0)
+
+ // Simulate a somewhat realistic delay between press and release
+ // to ensure that the bug is triggered.
+ wait(100)
+ mouseRelease(control, control.width * 0.1)
+ compare(closedSpy.count, 0)
+ compare(control.swipe.position, -1.0)
+ }
+
Component {
id: multiActionSwipeDelegateComponent
@@ -1607,11 +1672,11 @@ TestCase {
text: "SwipeDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml
index 41826117..68b91c35 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/controls/data/tst_swipeview.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index 8ec8ffb4..9050964f 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 1c96023f..4cf90bb6 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -560,11 +560,11 @@ TestCase {
text: "SwitchDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml
index ce42632f..3659a0ab 100644
--- a/tests/auto/controls/data/tst_tabbar.qml
+++ b/tests/auto/controls/data/tst_tabbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index 96384769..c399c014 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -134,11 +134,11 @@ TestCase {
var control = createTemporaryObject(tabButton, testCase, {
text: "TabButton",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index e9e1e2e2..653e7ad5 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 2ee1db41..f1ac17c9 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Layouts
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index 09c3a830..b35a927d 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 622554c7..ca044a89 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -199,11 +199,11 @@ TestCase {
var control = createTemporaryObject(toolButton, testCase, {
text: "ToolButton",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_toolseparator.qml b/tests/auto/controls/data/tst_toolseparator.qml
index d3581b96..41c161dd 100644
--- a/tests/auto/controls/data/tst_toolseparator.qml
+++ b/tests/auto/controls/data/tst_toolseparator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index 4b4bf4fa..6ca17263 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 5b3ef6e3..c103aefc 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
TestCase {
id: testCase
@@ -383,7 +383,7 @@ TestCase {
verify(tumbler);
var mouseArea = createTemporaryQmlObject(
- "import QtQuick 2.2; TextInput { activeFocusOnTab: true; width: 50; height: 50 }", testCase, "");
+ "import QtQuick; TextInput { activeFocusOnTab: true; width: 50; height: 50 }", testCase, "");
tumbler.forceActiveFocus();
verify(tumbler.activeFocus);
diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/default/dependencies.qml
index 7ffafb84..f7d87422 100644
--- a/tests/auto/controls/default/dependencies.qml
+++ b/tests/auto/controls/default/dependencies.qml
@@ -1,5 +1,5 @@
-import QtTest 1.0
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtTest
+import QtQuick
+import QtQuick.Controls
TestCase { }
diff --git a/tests/auto/controls/fusion/dependencies.qml b/tests/auto/controls/fusion/dependencies.qml
index 2da1b2bb..f2e40e60 100644
--- a/tests/auto/controls/fusion/dependencies.qml
+++ b/tests/auto/controls/fusion/dependencies.qml
@@ -1,6 +1,6 @@
-import QtTest 1.0
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Fusion 2.12
+import QtTest
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Fusion
TestCase { }
diff --git a/tests/auto/controls/imagine/dependencies.qml b/tests/auto/controls/imagine/dependencies.qml
index e681aa4f..9a31141b 100644
--- a/tests/auto/controls/imagine/dependencies.qml
+++ b/tests/auto/controls/imagine/dependencies.qml
@@ -1,6 +1,6 @@
-import QtTest 1.0
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Imagine 2.12
+import QtTest
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Imagine
TestCase { }
diff --git a/tests/auto/controls/material/dependencies.qml b/tests/auto/controls/material/dependencies.qml
index f926944e..8bcf0301 100644
--- a/tests/auto/controls/material/dependencies.qml
+++ b/tests/auto/controls/material/dependencies.qml
@@ -1,6 +1,6 @@
-import QtTest 1.0
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtTest
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
TestCase { }
diff --git a/tests/auto/controls/universal/dependencies.qml b/tests/auto/controls/universal/dependencies.qml
index a4a0d0a0..8ba71c83 100644
--- a/tests/auto/controls/universal/dependencies.qml
+++ b/tests/auto/controls/universal/dependencies.qml
@@ -1,6 +1,6 @@
-import QtTest 1.0
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Universal 2.12
+import QtTest
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Universal
TestCase { }
diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt
index 8034a11a..07d8a5f3 100644
--- a/tests/auto/cursor/CMakeLists.txt
+++ b/tests/auto/cursor/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_cursor
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/cursor/data/buttons.qml b/tests/auto/cursor/data/buttons.qml
index 2107a8f3..eb7e27cf 100644
--- a/tests/auto/cursor/data/buttons.qml
+++ b/tests/auto/cursor/data/buttons.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MouseArea {
width: column.width
diff --git a/tests/auto/cursor/data/containers.qml b/tests/auto/cursor/data/containers.qml
index c9dc09d9..0e722971 100644
--- a/tests/auto/cursor/data/containers.qml
+++ b/tests/auto/cursor/data/containers.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MouseArea {
width: column.width
diff --git a/tests/auto/cursor/data/editable.qml b/tests/auto/cursor/data/editable.qml
index 305d7d46..04bf4b7c 100644
--- a/tests/auto/cursor/data/editable.qml
+++ b/tests/auto/cursor/data/editable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MouseArea {
width: column.width
diff --git a/tests/auto/cursor/data/pageindicator.qml b/tests/auto/cursor/data/pageindicator.qml
index 228f010d..f71fbf75 100644
--- a/tests/auto/cursor/data/pageindicator.qml
+++ b/tests/auto/cursor/data/pageindicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MouseArea {
width: 200
diff --git a/tests/auto/cursor/data/scrollbar.qml b/tests/auto/cursor/data/scrollbar.qml
index 50b785c6..997abd4b 100644
--- a/tests/auto/cursor/data/scrollbar.qml
+++ b/tests/auto/cursor/data/scrollbar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/cursor/data/sliders.qml b/tests/auto/cursor/data/sliders.qml
index e3ac2cb1..687450ec 100644
--- a/tests/auto/cursor/data/sliders.qml
+++ b/tests/auto/cursor/data/sliders.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MouseArea {
width: column.width
diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt
index 40e916a8..0ec56d9d 100644
--- a/tests/auto/customization/CMakeLists.txt
+++ b/tests/auto/customization/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_customization
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/customization/customization.pro b/tests/auto/customization/customization.pro
index 472367a3..e40e4d05 100644
--- a/tests/auto/customization/customization.pro
+++ b/tests/auto/customization/customization.pro
@@ -4,7 +4,7 @@ SOURCES += tst_customization.cpp
macos:CONFIG -= app_bundle
-QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private quickcontrols2
+QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private quickcontrols2 quickcontrols2-private
include (../shared/util.pri)
diff --git a/tests/auto/customization/data/styles/empty/AbstractButton.qml b/tests/auto/customization/data/styles/empty/AbstractButton.qml
index 56aaaa04..b30d4a56 100644
--- a/tests/auto/customization/data/styles/empty/AbstractButton.qml
+++ b/tests/auto/customization/data/styles/empty/AbstractButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.AbstractButton {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml b/tests/auto/customization/data/styles/empty/ApplicationWindow.qml
index 820b67ae..6a1f1b09 100644
--- a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml
+++ b/tests/auto/customization/data/styles/empty/ApplicationWindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ApplicationWindow {
id: control
diff --git a/tests/auto/customization/data/styles/empty/BusyIndicator.qml b/tests/auto/customization/data/styles/empty/BusyIndicator.qml
index 2d212ed2..388de3af 100644
--- a/tests/auto/customization/data/styles/empty/BusyIndicator.qml
+++ b/tests/auto/customization/data/styles/empty/BusyIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.BusyIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Button.qml b/tests/auto/customization/data/styles/empty/Button.qml
index 54daa586..20426d2e 100644
--- a/tests/auto/customization/data/styles/empty/Button.qml
+++ b/tests/auto/customization/data/styles/empty/Button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Button {
id: control
diff --git a/tests/auto/customization/data/styles/empty/CheckBox.qml b/tests/auto/customization/data/styles/empty/CheckBox.qml
index 64799ca5..3d8b5a8e 100644
--- a/tests/auto/customization/data/styles/empty/CheckBox.qml
+++ b/tests/auto/customization/data/styles/empty/CheckBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckBox {
id: control
diff --git a/tests/auto/customization/data/styles/empty/CheckDelegate.qml b/tests/auto/customization/data/styles/empty/CheckDelegate.qml
index b7ea827d..a0547ec4 100644
--- a/tests/auto/customization/data/styles/empty/CheckDelegate.qml
+++ b/tests/auto/customization/data/styles/empty/CheckDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ComboBox.qml b/tests/auto/customization/data/styles/empty/ComboBox.qml
index 2c5cb266..84cf6e35 100644
--- a/tests/auto/customization/data/styles/empty/ComboBox.qml
+++ b/tests/auto/customization/data/styles/empty/ComboBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ComboBox {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Container.qml b/tests/auto/customization/data/styles/empty/Container.qml
index 1d376cce..7519d7bd 100644
--- a/tests/auto/customization/data/styles/empty/Container.qml
+++ b/tests/auto/customization/data/styles/empty/Container.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Container {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Control.qml b/tests/auto/customization/data/styles/empty/Control.qml
index c7db674a..55a456c7 100644
--- a/tests/auto/customization/data/styles/empty/Control.qml
+++ b/tests/auto/customization/data/styles/empty/Control.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Control {
id: control
diff --git a/tests/auto/customization/data/styles/empty/DelayButton.qml b/tests/auto/customization/data/styles/empty/DelayButton.qml
index e1cd7dde..ce34f25f 100644
--- a/tests/auto/customization/data/styles/empty/DelayButton.qml
+++ b/tests/auto/customization/data/styles/empty/DelayButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DelayButton {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Dial.qml b/tests/auto/customization/data/styles/empty/Dial.qml
index 94af0a3e..de83e564 100644
--- a/tests/auto/customization/data/styles/empty/Dial.qml
+++ b/tests/auto/customization/data/styles/empty/Dial.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dial {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Dialog.qml b/tests/auto/customization/data/styles/empty/Dialog.qml
index 72f95f0a..8b056a88 100644
--- a/tests/auto/customization/data/styles/empty/Dialog.qml
+++ b/tests/auto/customization/data/styles/empty/Dialog.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dialog {
id: control
diff --git a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml b/tests/auto/customization/data/styles/empty/DialogButtonBox.qml
index 1f47e83f..5ce5f504 100644
--- a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml
+++ b/tests/auto/customization/data/styles/empty/DialogButtonBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DialogButtonBox {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Drawer.qml b/tests/auto/customization/data/styles/empty/Drawer.qml
index a550d5b7..b4da57c0 100644
--- a/tests/auto/customization/data/styles/empty/Drawer.qml
+++ b/tests/auto/customization/data/styles/empty/Drawer.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Drawer {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Frame.qml b/tests/auto/customization/data/styles/empty/Frame.qml
index 9047035c..00f4d79c 100644
--- a/tests/auto/customization/data/styles/empty/Frame.qml
+++ b/tests/auto/customization/data/styles/empty/Frame.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Frame {
id: control
diff --git a/tests/auto/customization/data/styles/empty/GroupBox.qml b/tests/auto/customization/data/styles/empty/GroupBox.qml
index 8628cb0d..900770cd 100644
--- a/tests/auto/customization/data/styles/empty/GroupBox.qml
+++ b/tests/auto/customization/data/styles/empty/GroupBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.GroupBox {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ItemDelegate.qml b/tests/auto/customization/data/styles/empty/ItemDelegate.qml
index 721e4b37..19de468d 100644
--- a/tests/auto/customization/data/styles/empty/ItemDelegate.qml
+++ b/tests/auto/customization/data/styles/empty/ItemDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ItemDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Label.qml b/tests/auto/customization/data/styles/empty/Label.qml
index a0be5acf..bfc4a839 100644
--- a/tests/auto/customization/data/styles/empty/Label.qml
+++ b/tests/auto/customization/data/styles/empty/Label.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Label {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Menu.qml b/tests/auto/customization/data/styles/empty/Menu.qml
index ec7cd9fd..27b8a014 100644
--- a/tests/auto/customization/data/styles/empty/Menu.qml
+++ b/tests/auto/customization/data/styles/empty/Menu.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Menu {
id: control
diff --git a/tests/auto/customization/data/styles/empty/MenuBar.qml b/tests/auto/customization/data/styles/empty/MenuBar.qml
index 6ee7350d..24f7c6ed 100644
--- a/tests/auto/customization/data/styles/empty/MenuBar.qml
+++ b/tests/auto/customization/data/styles/empty/MenuBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBar {
id: control
diff --git a/tests/auto/customization/data/styles/empty/MenuBarItem.qml b/tests/auto/customization/data/styles/empty/MenuBarItem.qml
index 710c1208..d66e899a 100644
--- a/tests/auto/customization/data/styles/empty/MenuBarItem.qml
+++ b/tests/auto/customization/data/styles/empty/MenuBarItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBarItem {
id: control
diff --git a/tests/auto/customization/data/styles/empty/MenuItem.qml b/tests/auto/customization/data/styles/empty/MenuItem.qml
index 206c2e89..11f38a1b 100644
--- a/tests/auto/customization/data/styles/empty/MenuItem.qml
+++ b/tests/auto/customization/data/styles/empty/MenuItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuItem {
id: control
diff --git a/tests/auto/customization/data/styles/empty/MenuSeparator.qml b/tests/auto/customization/data/styles/empty/MenuSeparator.qml
index 73b3ec41..effd32c0 100644
--- a/tests/auto/customization/data/styles/empty/MenuSeparator.qml
+++ b/tests/auto/customization/data/styles/empty/MenuSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Page.qml b/tests/auto/customization/data/styles/empty/Page.qml
index ce77d17f..353fb9cc 100644
--- a/tests/auto/customization/data/styles/empty/Page.qml
+++ b/tests/auto/customization/data/styles/empty/Page.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Page {
id: control
diff --git a/tests/auto/customization/data/styles/empty/PageIndicator.qml b/tests/auto/customization/data/styles/empty/PageIndicator.qml
index c71e6908..98976ae2 100644
--- a/tests/auto/customization/data/styles/empty/PageIndicator.qml
+++ b/tests/auto/customization/data/styles/empty/PageIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.PageIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Pane.qml b/tests/auto/customization/data/styles/empty/Pane.qml
index a710e9a2..2429e2c6 100644
--- a/tests/auto/customization/data/styles/empty/Pane.qml
+++ b/tests/auto/customization/data/styles/empty/Pane.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Pane {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Popup.qml b/tests/auto/customization/data/styles/empty/Popup.qml
index f2c19ed3..fdcb49ac 100644
--- a/tests/auto/customization/data/styles/empty/Popup.qml
+++ b/tests/auto/customization/data/styles/empty/Popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Popup {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ProgressBar.qml b/tests/auto/customization/data/styles/empty/ProgressBar.qml
index 0ffdb015..a2afa03b 100644
--- a/tests/auto/customization/data/styles/empty/ProgressBar.qml
+++ b/tests/auto/customization/data/styles/empty/ProgressBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ProgressBar {
id: control
diff --git a/tests/auto/customization/data/styles/empty/RadioButton.qml b/tests/auto/customization/data/styles/empty/RadioButton.qml
index 1221e667..87766292 100644
--- a/tests/auto/customization/data/styles/empty/RadioButton.qml
+++ b/tests/auto/customization/data/styles/empty/RadioButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioButton {
id: control
diff --git a/tests/auto/customization/data/styles/empty/RadioDelegate.qml b/tests/auto/customization/data/styles/empty/RadioDelegate.qml
index b7889e34..bbb711c7 100644
--- a/tests/auto/customization/data/styles/empty/RadioDelegate.qml
+++ b/tests/auto/customization/data/styles/empty/RadioDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/empty/RangeSlider.qml b/tests/auto/customization/data/styles/empty/RangeSlider.qml
index d737e4bf..0043b407 100644
--- a/tests/auto/customization/data/styles/empty/RangeSlider.qml
+++ b/tests/auto/customization/data/styles/empty/RangeSlider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RangeSlider {
id: control
diff --git a/tests/auto/customization/data/styles/empty/RoundButton.qml b/tests/auto/customization/data/styles/empty/RoundButton.qml
index 01063900..5b06801d 100644
--- a/tests/auto/customization/data/styles/empty/RoundButton.qml
+++ b/tests/auto/customization/data/styles/empty/RoundButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RoundButton {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ScrollBar.qml b/tests/auto/customization/data/styles/empty/ScrollBar.qml
index bc727d7b..80a6782e 100644
--- a/tests/auto/customization/data/styles/empty/ScrollBar.qml
+++ b/tests/auto/customization/data/styles/empty/ScrollBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollBar {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml b/tests/auto/customization/data/styles/empty/ScrollIndicator.qml
index 3e11e721..56c73cb8 100644
--- a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml
+++ b/tests/auto/customization/data/styles/empty/ScrollIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ScrollView.qml b/tests/auto/customization/data/styles/empty/ScrollView.qml
index 74a9fec2..198936c2 100644
--- a/tests/auto/customization/data/styles/empty/ScrollView.qml
+++ b/tests/auto/customization/data/styles/empty/ScrollView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollView {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Slider.qml b/tests/auto/customization/data/styles/empty/Slider.qml
index d8fe7aee..6cfa3e91 100644
--- a/tests/auto/customization/data/styles/empty/Slider.qml
+++ b/tests/auto/customization/data/styles/empty/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Slider {
id: control
diff --git a/tests/auto/customization/data/styles/empty/SpinBox.qml b/tests/auto/customization/data/styles/empty/SpinBox.qml
index 4e84e55a..9e334ecf 100644
--- a/tests/auto/customization/data/styles/empty/SpinBox.qml
+++ b/tests/auto/customization/data/styles/empty/SpinBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SpinBox {
id: control
diff --git a/tests/auto/customization/data/styles/empty/StackView.qml b/tests/auto/customization/data/styles/empty/StackView.qml
index 7722f8a7..0a55abf8 100644
--- a/tests/auto/customization/data/styles/empty/StackView.qml
+++ b/tests/auto/customization/data/styles/empty/StackView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.StackView {
id: control
diff --git a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml b/tests/auto/customization/data/styles/empty/SwipeDelegate.qml
index f27802f4..d05f1e9c 100644
--- a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml
+++ b/tests/auto/customization/data/styles/empty/SwipeDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/empty/SwipeView.qml b/tests/auto/customization/data/styles/empty/SwipeView.qml
index 61de72b3..51b411aa 100644
--- a/tests/auto/customization/data/styles/empty/SwipeView.qml
+++ b/tests/auto/customization/data/styles/empty/SwipeView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeView {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Switch.qml b/tests/auto/customization/data/styles/empty/Switch.qml
index 3908d3f3..da00b0e8 100644
--- a/tests/auto/customization/data/styles/empty/Switch.qml
+++ b/tests/auto/customization/data/styles/empty/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Switch {
id: control
diff --git a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml b/tests/auto/customization/data/styles/empty/SwitchDelegate.qml
index e581baa0..fe0a9f52 100644
--- a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml
+++ b/tests/auto/customization/data/styles/empty/SwitchDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwitchDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/empty/TabBar.qml b/tests/auto/customization/data/styles/empty/TabBar.qml
index caedefe9..0f38b660 100644
--- a/tests/auto/customization/data/styles/empty/TabBar.qml
+++ b/tests/auto/customization/data/styles/empty/TabBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabBar {
id: control
diff --git a/tests/auto/customization/data/styles/empty/TabButton.qml b/tests/auto/customization/data/styles/empty/TabButton.qml
index e6777411..6ee89636 100644
--- a/tests/auto/customization/data/styles/empty/TabButton.qml
+++ b/tests/auto/customization/data/styles/empty/TabButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabButton {
id: control
diff --git a/tests/auto/customization/data/styles/empty/TextArea.qml b/tests/auto/customization/data/styles/empty/TextArea.qml
index 7d49af20..e2ee7866 100644
--- a/tests/auto/customization/data/styles/empty/TextArea.qml
+++ b/tests/auto/customization/data/styles/empty/TextArea.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextArea {
id: control
diff --git a/tests/auto/customization/data/styles/empty/TextField.qml b/tests/auto/customization/data/styles/empty/TextField.qml
index 0a593cbe..3fcf63d5 100644
--- a/tests/auto/customization/data/styles/empty/TextField.qml
+++ b/tests/auto/customization/data/styles/empty/TextField.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextField {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ToolBar.qml b/tests/auto/customization/data/styles/empty/ToolBar.qml
index 5f923267..6696336d 100644
--- a/tests/auto/customization/data/styles/empty/ToolBar.qml
+++ b/tests/auto/customization/data/styles/empty/ToolBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolBar {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ToolButton.qml b/tests/auto/customization/data/styles/empty/ToolButton.qml
index 9f209c55..8d4ef1b5 100644
--- a/tests/auto/customization/data/styles/empty/ToolButton.qml
+++ b/tests/auto/customization/data/styles/empty/ToolButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolButton {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ToolSeparator.qml b/tests/auto/customization/data/styles/empty/ToolSeparator.qml
index bc81e3e7..63985f7f 100644
--- a/tests/auto/customization/data/styles/empty/ToolSeparator.qml
+++ b/tests/auto/customization/data/styles/empty/ToolSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/empty/ToolTip.qml b/tests/auto/customization/data/styles/empty/ToolTip.qml
index 0bc8e3c6..a1aff941 100644
--- a/tests/auto/customization/data/styles/empty/ToolTip.qml
+++ b/tests/auto/customization/data/styles/empty/ToolTip.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolTip {
id: control
diff --git a/tests/auto/customization/data/styles/empty/Tumbler.qml b/tests/auto/customization/data/styles/empty/Tumbler.qml
index 984362f4..c8b3bfeb 100644
--- a/tests/auto/customization/data/styles/empty/Tumbler.qml
+++ b/tests/auto/customization/data/styles/empty/Tumbler.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Tumbler {
id: control
diff --git a/tests/auto/customization/data/styles/empty/qmldir b/tests/auto/customization/data/styles/empty/qmldir
new file mode 100644
index 00000000..a5fcc4c7
--- /dev/null
+++ b/tests/auto/customization/data/styles/empty/qmldir
@@ -0,0 +1,59 @@
+module empty
+
+AbstractButton 6.0 AbstractButton.qml
+Action 6.0 Action.qml
+ActionGroup 6.0 ActionGroup.qml
+ApplicationWindow 6.0 ApplicationWindow.qml
+BusyIndicator 6.0 BusyIndicator.qml
+Button 6.0 Button.qml
+ButtonGroup 6.0 ButtonGroup.qml
+CheckBox 6.0 CheckBox.qml
+CheckDelegate 6.0 CheckDelegate.qml
+ComboBox 6.0 ComboBox.qml
+Container 6.0 Container.qml
+Control 6.0 Control.qml
+DelayButton 6.0 DelayButton.qml
+Dial 6.0 Dial.qml
+Dialog 6.0 Dialog.qml
+DialogButtonBox 6.0 DialogButtonBox.qml
+Drawer 6.0 Drawer.qml
+Frame 6.0 Frame.qml
+GroupBox 6.0 GroupBox.qml
+HorizontalHeaderView 6.0 HorizontalHeaderView.qml
+ItemDelegate 6.0 ItemDelegate.qml
+Label 6.0 Label.qml
+Menu 6.0 Menu.qml
+MenuBar 6.0 MenuBar.qml
+MenuBarItem 6.0 MenuBarItem.qml
+MenuItem 6.0 MenuItem.qml
+MenuSeparator 6.0 MenuSeparator.qml
+Page 6.0 Page.qml
+PageIndicator 6.0 PageIndicator.qml
+Pane 6.0 Pane.qml
+Popup 6.0 Popup.qml
+ProgressBar 6.0 ProgressBar.qml
+RadioButton 6.0 RadioButton.qml
+RadioDelegate 6.0 RadioDelegate.qml
+RangeSlider 6.0 RangeSlider.qml
+RoundButton 6.0 RoundButton.qml
+ScrollBar 6.0 ScrollBar.qml
+ScrollIndicator 6.0 ScrollIndicator.qml
+ScrollView 6.0 ScrollView.qml
+Slider 6.0 Slider.qml
+SpinBox 6.0 SpinBox.qml
+SplitView 6.0 SplitView.qml
+StackView 6.0 StackView.qml
+SwipeDelegate 6.0 SwipeDelegate.qml
+SwipeView 6.0 SwipeView.qml
+Switch 6.0 Switch.qml
+SwitchDelegate 6.0 SwitchDelegate.qml
+TabBar 6.0 TabBar.qml
+TabButton 6.0 TabButton.qml
+TextArea 6.0 TextArea.qml
+TextField 6.0 TextField.qml
+ToolBar 6.0 ToolBar.qml
+ToolButton 6.0 ToolButton.qml
+ToolSeparator 6.0 ToolSeparator.qml
+ToolTip 6.0 ToolTip.qml
+Tumbler 6.0 Tumbler.qml
+VerticalHeaderView 6.0 VerticalHeaderView.qml
diff --git a/tests/auto/customization/data/styles/identified/AbstractButton.qml b/tests/auto/customization/data/styles/identified/AbstractButton.qml
index cd2b5bdc..1c5bd318 100644
--- a/tests/auto/customization/data/styles/identified/AbstractButton.qml
+++ b/tests/auto/customization/data/styles/identified/AbstractButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.AbstractButton {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml b/tests/auto/customization/data/styles/identified/ApplicationWindow.qml
index b77eebfc..dc3f0db1 100644
--- a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml
+++ b/tests/auto/customization/data/styles/identified/ApplicationWindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ApplicationWindow {
id: control
diff --git a/tests/auto/customization/data/styles/identified/BusyIndicator.qml b/tests/auto/customization/data/styles/identified/BusyIndicator.qml
index dc4c14b7..2deab679 100644
--- a/tests/auto/customization/data/styles/identified/BusyIndicator.qml
+++ b/tests/auto/customization/data/styles/identified/BusyIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.BusyIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Button.qml b/tests/auto/customization/data/styles/identified/Button.qml
index dca3b9d0..dc805080 100644
--- a/tests/auto/customization/data/styles/identified/Button.qml
+++ b/tests/auto/customization/data/styles/identified/Button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Button {
id: control
diff --git a/tests/auto/customization/data/styles/identified/CheckBox.qml b/tests/auto/customization/data/styles/identified/CheckBox.qml
index 8f1f9b25..13f98af9 100644
--- a/tests/auto/customization/data/styles/identified/CheckBox.qml
+++ b/tests/auto/customization/data/styles/identified/CheckBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckBox {
id: control
diff --git a/tests/auto/customization/data/styles/identified/CheckDelegate.qml b/tests/auto/customization/data/styles/identified/CheckDelegate.qml
index cfba67d3..b0d8a8d2 100644
--- a/tests/auto/customization/data/styles/identified/CheckDelegate.qml
+++ b/tests/auto/customization/data/styles/identified/CheckDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ComboBox.qml b/tests/auto/customization/data/styles/identified/ComboBox.qml
index 873d1c2a..ff117ce8 100644
--- a/tests/auto/customization/data/styles/identified/ComboBox.qml
+++ b/tests/auto/customization/data/styles/identified/ComboBox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Templates as T
T.ComboBox {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Container.qml b/tests/auto/customization/data/styles/identified/Container.qml
index 8170e937..a282528d 100644
--- a/tests/auto/customization/data/styles/identified/Container.qml
+++ b/tests/auto/customization/data/styles/identified/Container.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Container {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Control.qml b/tests/auto/customization/data/styles/identified/Control.qml
index 0eb28c21..90229e47 100644
--- a/tests/auto/customization/data/styles/identified/Control.qml
+++ b/tests/auto/customization/data/styles/identified/Control.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Control {
id: control
diff --git a/tests/auto/customization/data/styles/identified/DelayButton.qml b/tests/auto/customization/data/styles/identified/DelayButton.qml
index fc7f67c9..90f980ea 100644
--- a/tests/auto/customization/data/styles/identified/DelayButton.qml
+++ b/tests/auto/customization/data/styles/identified/DelayButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DelayButton {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Dial.qml b/tests/auto/customization/data/styles/identified/Dial.qml
index 423c64e2..9260972c 100644
--- a/tests/auto/customization/data/styles/identified/Dial.qml
+++ b/tests/auto/customization/data/styles/identified/Dial.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dial {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Dialog.qml b/tests/auto/customization/data/styles/identified/Dialog.qml
index 58d0120e..6392be7d 100644
--- a/tests/auto/customization/data/styles/identified/Dialog.qml
+++ b/tests/auto/customization/data/styles/identified/Dialog.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dialog {
id: control
diff --git a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml b/tests/auto/customization/data/styles/identified/DialogButtonBox.qml
index 0bf56268..11c596a1 100644
--- a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml
+++ b/tests/auto/customization/data/styles/identified/DialogButtonBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DialogButtonBox {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Drawer.qml b/tests/auto/customization/data/styles/identified/Drawer.qml
index 82d09bd4..6b340f2a 100644
--- a/tests/auto/customization/data/styles/identified/Drawer.qml
+++ b/tests/auto/customization/data/styles/identified/Drawer.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Drawer {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Frame.qml b/tests/auto/customization/data/styles/identified/Frame.qml
index e84e18b1..830ac584 100644
--- a/tests/auto/customization/data/styles/identified/Frame.qml
+++ b/tests/auto/customization/data/styles/identified/Frame.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Frame {
id: control
diff --git a/tests/auto/customization/data/styles/identified/GroupBox.qml b/tests/auto/customization/data/styles/identified/GroupBox.qml
index ed56f89b..fffd44e8 100644
--- a/tests/auto/customization/data/styles/identified/GroupBox.qml
+++ b/tests/auto/customization/data/styles/identified/GroupBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.GroupBox {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ItemDelegate.qml b/tests/auto/customization/data/styles/identified/ItemDelegate.qml
index 92801c53..b04d2f59 100644
--- a/tests/auto/customization/data/styles/identified/ItemDelegate.qml
+++ b/tests/auto/customization/data/styles/identified/ItemDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ItemDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Label.qml b/tests/auto/customization/data/styles/identified/Label.qml
index d19da135..95d1f191 100644
--- a/tests/auto/customization/data/styles/identified/Label.qml
+++ b/tests/auto/customization/data/styles/identified/Label.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Label {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Menu.qml b/tests/auto/customization/data/styles/identified/Menu.qml
index 5a9ac617..66239254 100644
--- a/tests/auto/customization/data/styles/identified/Menu.qml
+++ b/tests/auto/customization/data/styles/identified/Menu.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Menu {
id: control
diff --git a/tests/auto/customization/data/styles/identified/MenuBar.qml b/tests/auto/customization/data/styles/identified/MenuBar.qml
index d846e3c9..f815b73f 100644
--- a/tests/auto/customization/data/styles/identified/MenuBar.qml
+++ b/tests/auto/customization/data/styles/identified/MenuBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBar {
id: control
diff --git a/tests/auto/customization/data/styles/identified/MenuBarItem.qml b/tests/auto/customization/data/styles/identified/MenuBarItem.qml
index 94fdef89..abf3be5d 100644
--- a/tests/auto/customization/data/styles/identified/MenuBarItem.qml
+++ b/tests/auto/customization/data/styles/identified/MenuBarItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBarItem {
id: control
diff --git a/tests/auto/customization/data/styles/identified/MenuItem.qml b/tests/auto/customization/data/styles/identified/MenuItem.qml
index 34f12cca..3a174ecf 100644
--- a/tests/auto/customization/data/styles/identified/MenuItem.qml
+++ b/tests/auto/customization/data/styles/identified/MenuItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuItem {
id: control
diff --git a/tests/auto/customization/data/styles/identified/MenuSeparator.qml b/tests/auto/customization/data/styles/identified/MenuSeparator.qml
index 14154e2f..7ecb176b 100644
--- a/tests/auto/customization/data/styles/identified/MenuSeparator.qml
+++ b/tests/auto/customization/data/styles/identified/MenuSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Page.qml b/tests/auto/customization/data/styles/identified/Page.qml
index 945f2ac7..b2416247 100644
--- a/tests/auto/customization/data/styles/identified/Page.qml
+++ b/tests/auto/customization/data/styles/identified/Page.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Page {
id: control
diff --git a/tests/auto/customization/data/styles/identified/PageIndicator.qml b/tests/auto/customization/data/styles/identified/PageIndicator.qml
index ef0ab44f..2370a334 100644
--- a/tests/auto/customization/data/styles/identified/PageIndicator.qml
+++ b/tests/auto/customization/data/styles/identified/PageIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.PageIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Pane.qml b/tests/auto/customization/data/styles/identified/Pane.qml
index 849c7907..0dbf4b1c 100644
--- a/tests/auto/customization/data/styles/identified/Pane.qml
+++ b/tests/auto/customization/data/styles/identified/Pane.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Pane {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Popup.qml b/tests/auto/customization/data/styles/identified/Popup.qml
index 65de416c..b6381170 100644
--- a/tests/auto/customization/data/styles/identified/Popup.qml
+++ b/tests/auto/customization/data/styles/identified/Popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Popup {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ProgressBar.qml b/tests/auto/customization/data/styles/identified/ProgressBar.qml
index 24888624..dc7d7658 100644
--- a/tests/auto/customization/data/styles/identified/ProgressBar.qml
+++ b/tests/auto/customization/data/styles/identified/ProgressBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ProgressBar {
id: control
diff --git a/tests/auto/customization/data/styles/identified/RadioButton.qml b/tests/auto/customization/data/styles/identified/RadioButton.qml
index 3a0c4e44..2b4a0b62 100644
--- a/tests/auto/customization/data/styles/identified/RadioButton.qml
+++ b/tests/auto/customization/data/styles/identified/RadioButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioButton {
id: control
diff --git a/tests/auto/customization/data/styles/identified/RadioDelegate.qml b/tests/auto/customization/data/styles/identified/RadioDelegate.qml
index 3eda2408..75cda63d 100644
--- a/tests/auto/customization/data/styles/identified/RadioDelegate.qml
+++ b/tests/auto/customization/data/styles/identified/RadioDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/identified/RangeSlider.qml b/tests/auto/customization/data/styles/identified/RangeSlider.qml
index 18118dbe..fab56fcd 100644
--- a/tests/auto/customization/data/styles/identified/RangeSlider.qml
+++ b/tests/auto/customization/data/styles/identified/RangeSlider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RangeSlider {
id: control
diff --git a/tests/auto/customization/data/styles/identified/RoundButton.qml b/tests/auto/customization/data/styles/identified/RoundButton.qml
index fc6bc95a..ec075db3 100644
--- a/tests/auto/customization/data/styles/identified/RoundButton.qml
+++ b/tests/auto/customization/data/styles/identified/RoundButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RoundButton {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ScrollBar.qml b/tests/auto/customization/data/styles/identified/ScrollBar.qml
index f9a4445d..418f2908 100644
--- a/tests/auto/customization/data/styles/identified/ScrollBar.qml
+++ b/tests/auto/customization/data/styles/identified/ScrollBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollBar {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml b/tests/auto/customization/data/styles/identified/ScrollIndicator.qml
index 0f15aa2d..b427b757 100644
--- a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml
+++ b/tests/auto/customization/data/styles/identified/ScrollIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ScrollView.qml b/tests/auto/customization/data/styles/identified/ScrollView.qml
index 0855a5af..7f4e2c40 100644
--- a/tests/auto/customization/data/styles/identified/ScrollView.qml
+++ b/tests/auto/customization/data/styles/identified/ScrollView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollView {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Slider.qml b/tests/auto/customization/data/styles/identified/Slider.qml
index 23afb67e..88c5b22f 100644
--- a/tests/auto/customization/data/styles/identified/Slider.qml
+++ b/tests/auto/customization/data/styles/identified/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Slider {
id: control
diff --git a/tests/auto/customization/data/styles/identified/SpinBox.qml b/tests/auto/customization/data/styles/identified/SpinBox.qml
index 7871c975..0c058269 100644
--- a/tests/auto/customization/data/styles/identified/SpinBox.qml
+++ b/tests/auto/customization/data/styles/identified/SpinBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SpinBox {
id: control
diff --git a/tests/auto/customization/data/styles/identified/StackView.qml b/tests/auto/customization/data/styles/identified/StackView.qml
index 20459d99..1bc5bf50 100644
--- a/tests/auto/customization/data/styles/identified/StackView.qml
+++ b/tests/auto/customization/data/styles/identified/StackView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.StackView {
id: control
diff --git a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml b/tests/auto/customization/data/styles/identified/SwipeDelegate.qml
index e60780f5..dadb54a5 100644
--- a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml
+++ b/tests/auto/customization/data/styles/identified/SwipeDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/identified/SwipeView.qml b/tests/auto/customization/data/styles/identified/SwipeView.qml
index 0e5a19f6..aa256d99 100644
--- a/tests/auto/customization/data/styles/identified/SwipeView.qml
+++ b/tests/auto/customization/data/styles/identified/SwipeView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeView {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Switch.qml b/tests/auto/customization/data/styles/identified/Switch.qml
index f7e22f1f..be10b520 100644
--- a/tests/auto/customization/data/styles/identified/Switch.qml
+++ b/tests/auto/customization/data/styles/identified/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Switch {
id: control
diff --git a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml b/tests/auto/customization/data/styles/identified/SwitchDelegate.qml
index bda30715..7205c973 100644
--- a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml
+++ b/tests/auto/customization/data/styles/identified/SwitchDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwitchDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/identified/TabBar.qml b/tests/auto/customization/data/styles/identified/TabBar.qml
index 3589f505..5d360cb1 100644
--- a/tests/auto/customization/data/styles/identified/TabBar.qml
+++ b/tests/auto/customization/data/styles/identified/TabBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabBar {
id: control
diff --git a/tests/auto/customization/data/styles/identified/TabButton.qml b/tests/auto/customization/data/styles/identified/TabButton.qml
index cc24fdfe..bc065b22 100644
--- a/tests/auto/customization/data/styles/identified/TabButton.qml
+++ b/tests/auto/customization/data/styles/identified/TabButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabButton {
id: control
diff --git a/tests/auto/customization/data/styles/identified/TextArea.qml b/tests/auto/customization/data/styles/identified/TextArea.qml
index c7ef2545..56671240 100644
--- a/tests/auto/customization/data/styles/identified/TextArea.qml
+++ b/tests/auto/customization/data/styles/identified/TextArea.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextArea {
id: control
diff --git a/tests/auto/customization/data/styles/identified/TextField.qml b/tests/auto/customization/data/styles/identified/TextField.qml
index 670fa9f7..1fef7ab5 100644
--- a/tests/auto/customization/data/styles/identified/TextField.qml
+++ b/tests/auto/customization/data/styles/identified/TextField.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextField {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ToolBar.qml b/tests/auto/customization/data/styles/identified/ToolBar.qml
index 950f0c53..2061949c 100644
--- a/tests/auto/customization/data/styles/identified/ToolBar.qml
+++ b/tests/auto/customization/data/styles/identified/ToolBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolBar {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ToolButton.qml b/tests/auto/customization/data/styles/identified/ToolButton.qml
index 792de9e5..253391a8 100644
--- a/tests/auto/customization/data/styles/identified/ToolButton.qml
+++ b/tests/auto/customization/data/styles/identified/ToolButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolButton {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ToolSeparator.qml b/tests/auto/customization/data/styles/identified/ToolSeparator.qml
index a44fb331..b8cf9daa 100644
--- a/tests/auto/customization/data/styles/identified/ToolSeparator.qml
+++ b/tests/auto/customization/data/styles/identified/ToolSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/identified/ToolTip.qml b/tests/auto/customization/data/styles/identified/ToolTip.qml
index 5ddf8920..1ef95c99 100644
--- a/tests/auto/customization/data/styles/identified/ToolTip.qml
+++ b/tests/auto/customization/data/styles/identified/ToolTip.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolTip {
id: control
diff --git a/tests/auto/customization/data/styles/identified/Tumbler.qml b/tests/auto/customization/data/styles/identified/Tumbler.qml
index ae123f08..3bfdafc4 100644
--- a/tests/auto/customization/data/styles/identified/Tumbler.qml
+++ b/tests/auto/customization/data/styles/identified/Tumbler.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Tumbler {
id: control
diff --git a/tests/auto/customization/data/styles/identified/qmldir b/tests/auto/customization/data/styles/identified/qmldir
new file mode 100644
index 00000000..1ee2a92e
--- /dev/null
+++ b/tests/auto/customization/data/styles/identified/qmldir
@@ -0,0 +1,59 @@
+module identified
+
+AbstractButton 6.0 AbstractButton.qml
+Action 6.0 Action.qml
+ActionGroup 6.0 ActionGroup.qml
+ApplicationWindow 6.0 ApplicationWindow.qml
+BusyIndicator 6.0 BusyIndicator.qml
+Button 6.0 Button.qml
+ButtonGroup 6.0 ButtonGroup.qml
+CheckBox 6.0 CheckBox.qml
+CheckDelegate 6.0 CheckDelegate.qml
+ComboBox 6.0 ComboBox.qml
+Container 6.0 Container.qml
+Control 6.0 Control.qml
+DelayButton 6.0 DelayButton.qml
+Dial 6.0 Dial.qml
+Dialog 6.0 Dialog.qml
+DialogButtonBox 6.0 DialogButtonBox.qml
+Drawer 6.0 Drawer.qml
+Frame 6.0 Frame.qml
+GroupBox 6.0 GroupBox.qml
+HorizontalHeaderView 6.0 HorizontalHeaderView.qml
+ItemDelegate 6.0 ItemDelegate.qml
+Label 6.0 Label.qml
+Menu 6.0 Menu.qml
+MenuBar 6.0 MenuBar.qml
+MenuBarItem 6.0 MenuBarItem.qml
+MenuItem 6.0 MenuItem.qml
+MenuSeparator 6.0 MenuSeparator.qml
+Page 6.0 Page.qml
+PageIndicator 6.0 PageIndicator.qml
+Pane 6.0 Pane.qml
+Popup 6.0 Popup.qml
+ProgressBar 6.0 ProgressBar.qml
+RadioButton 6.0 RadioButton.qml
+RadioDelegate 6.0 RadioDelegate.qml
+RangeSlider 6.0 RangeSlider.qml
+RoundButton 6.0 RoundButton.qml
+ScrollBar 6.0 ScrollBar.qml
+ScrollIndicator 6.0 ScrollIndicator.qml
+ScrollView 6.0 ScrollView.qml
+Slider 6.0 Slider.qml
+SpinBox 6.0 SpinBox.qml
+SplitView 6.0 SplitView.qml
+StackView 6.0 StackView.qml
+SwipeDelegate 6.0 SwipeDelegate.qml
+SwipeView 6.0 SwipeView.qml
+Switch 6.0 Switch.qml
+SwitchDelegate 6.0 SwitchDelegate.qml
+TabBar 6.0 TabBar.qml
+TabButton 6.0 TabButton.qml
+TextArea 6.0 TextArea.qml
+TextField 6.0 TextField.qml
+ToolBar 6.0 ToolBar.qml
+ToolButton 6.0 ToolButton.qml
+ToolSeparator 6.0 ToolSeparator.qml
+ToolTip 6.0 ToolTip.qml
+Tumbler 6.0 Tumbler.qml
+VerticalHeaderView 6.0 VerticalHeaderView.qml
diff --git a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml b/tests/auto/customization/data/styles/incomplete/AbstractButton.qml
index ee78f032..7e371050 100644
--- a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml
+++ b/tests/auto/customization/data/styles/incomplete/AbstractButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.AbstractButton {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml b/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml
index 45abc542..8fbdd1a4 100644
--- a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml
+++ b/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ApplicationWindow {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml b/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml
index e9a78add..b046163e 100644
--- a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml
+++ b/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.BusyIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Button.qml b/tests/auto/customization/data/styles/incomplete/Button.qml
index 52f1e2f2..7daa248c 100644
--- a/tests/auto/customization/data/styles/incomplete/Button.qml
+++ b/tests/auto/customization/data/styles/incomplete/Button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Button {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/CheckBox.qml b/tests/auto/customization/data/styles/incomplete/CheckBox.qml
index c599ca93..50bfa058 100644
--- a/tests/auto/customization/data/styles/incomplete/CheckBox.qml
+++ b/tests/auto/customization/data/styles/incomplete/CheckBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckBox {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml b/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml
index 673dbbd9..13c0e472 100644
--- a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml
+++ b/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ComboBox.qml b/tests/auto/customization/data/styles/incomplete/ComboBox.qml
index ef595e4f..b0ff6257 100644
--- a/tests/auto/customization/data/styles/incomplete/ComboBox.qml
+++ b/tests/auto/customization/data/styles/incomplete/ComboBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ComboBox {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Container.qml b/tests/auto/customization/data/styles/incomplete/Container.qml
index 9b18ae49..0ad81bea 100644
--- a/tests/auto/customization/data/styles/incomplete/Container.qml
+++ b/tests/auto/customization/data/styles/incomplete/Container.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Container {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Control.qml b/tests/auto/customization/data/styles/incomplete/Control.qml
index ccec0bf0..6f07f5da 100644
--- a/tests/auto/customization/data/styles/incomplete/Control.qml
+++ b/tests/auto/customization/data/styles/incomplete/Control.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Control {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/DelayButton.qml b/tests/auto/customization/data/styles/incomplete/DelayButton.qml
index bb21db26..b6ab635b 100644
--- a/tests/auto/customization/data/styles/incomplete/DelayButton.qml
+++ b/tests/auto/customization/data/styles/incomplete/DelayButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DelayButton {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Dial.qml b/tests/auto/customization/data/styles/incomplete/Dial.qml
index e9de0974..66600c63 100644
--- a/tests/auto/customization/data/styles/incomplete/Dial.qml
+++ b/tests/auto/customization/data/styles/incomplete/Dial.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dial {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Dialog.qml b/tests/auto/customization/data/styles/incomplete/Dialog.qml
index 9f8ad1fa..d8ab999e 100644
--- a/tests/auto/customization/data/styles/incomplete/Dialog.qml
+++ b/tests/auto/customization/data/styles/incomplete/Dialog.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dialog {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml b/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml
index 7dfaadf5..d7f954be 100644
--- a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml
+++ b/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DialogButtonBox {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Drawer.qml b/tests/auto/customization/data/styles/incomplete/Drawer.qml
index 684221e5..5dadbd77 100644
--- a/tests/auto/customization/data/styles/incomplete/Drawer.qml
+++ b/tests/auto/customization/data/styles/incomplete/Drawer.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Drawer {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Frame.qml b/tests/auto/customization/data/styles/incomplete/Frame.qml
index 9f409cfd..e447b5c2 100644
--- a/tests/auto/customization/data/styles/incomplete/Frame.qml
+++ b/tests/auto/customization/data/styles/incomplete/Frame.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Frame {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/GroupBox.qml b/tests/auto/customization/data/styles/incomplete/GroupBox.qml
index 4c5b258e..3597f158 100644
--- a/tests/auto/customization/data/styles/incomplete/GroupBox.qml
+++ b/tests/auto/customization/data/styles/incomplete/GroupBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.GroupBox {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml b/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml
index 39063eb3..79334dcb 100644
--- a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml
+++ b/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ItemDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Label.qml b/tests/auto/customization/data/styles/incomplete/Label.qml
index 3a953004..e60ea00c 100644
--- a/tests/auto/customization/data/styles/incomplete/Label.qml
+++ b/tests/auto/customization/data/styles/incomplete/Label.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Label {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Menu.qml b/tests/auto/customization/data/styles/incomplete/Menu.qml
index ca03cfe4..220d0038 100644
--- a/tests/auto/customization/data/styles/incomplete/Menu.qml
+++ b/tests/auto/customization/data/styles/incomplete/Menu.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Menu {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/MenuBar.qml b/tests/auto/customization/data/styles/incomplete/MenuBar.qml
index bc98d4c8..b782eb4d 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuBar.qml
+++ b/tests/auto/customization/data/styles/incomplete/MenuBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBar {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml b/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml
index 6b1dbc2e..a979ecb7 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml
+++ b/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBarItem {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/MenuItem.qml b/tests/auto/customization/data/styles/incomplete/MenuItem.qml
index 40539eaf..b14f9089 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuItem.qml
+++ b/tests/auto/customization/data/styles/incomplete/MenuItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuItem {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml b/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml
index eb799f31..ba6d27ec 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml
+++ b/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Page.qml b/tests/auto/customization/data/styles/incomplete/Page.qml
index 22964846..dbd29521 100644
--- a/tests/auto/customization/data/styles/incomplete/Page.qml
+++ b/tests/auto/customization/data/styles/incomplete/Page.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Page {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml b/tests/auto/customization/data/styles/incomplete/PageIndicator.qml
index 87cd3637..b1836340 100644
--- a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml
+++ b/tests/auto/customization/data/styles/incomplete/PageIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.PageIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Pane.qml b/tests/auto/customization/data/styles/incomplete/Pane.qml
index f4c96887..ecd7cbdf 100644
--- a/tests/auto/customization/data/styles/incomplete/Pane.qml
+++ b/tests/auto/customization/data/styles/incomplete/Pane.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Pane {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Popup.qml b/tests/auto/customization/data/styles/incomplete/Popup.qml
index fbba7f50..a3d7d8d5 100644
--- a/tests/auto/customization/data/styles/incomplete/Popup.qml
+++ b/tests/auto/customization/data/styles/incomplete/Popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Popup {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml b/tests/auto/customization/data/styles/incomplete/ProgressBar.qml
index 0186fa4e..293fe254 100644
--- a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml
+++ b/tests/auto/customization/data/styles/incomplete/ProgressBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ProgressBar {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/RadioButton.qml b/tests/auto/customization/data/styles/incomplete/RadioButton.qml
index fcd31ca6..f17729f7 100644
--- a/tests/auto/customization/data/styles/incomplete/RadioButton.qml
+++ b/tests/auto/customization/data/styles/incomplete/RadioButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioButton {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml b/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml
index b64c0cab..8dd08aea 100644
--- a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml
+++ b/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml b/tests/auto/customization/data/styles/incomplete/RangeSlider.qml
index c0faec20..3a6ba580 100644
--- a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml
+++ b/tests/auto/customization/data/styles/incomplete/RangeSlider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RangeSlider {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/RoundButton.qml b/tests/auto/customization/data/styles/incomplete/RoundButton.qml
index ddb24e3d..d51ef732 100644
--- a/tests/auto/customization/data/styles/incomplete/RoundButton.qml
+++ b/tests/auto/customization/data/styles/incomplete/RoundButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RoundButton {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml b/tests/auto/customization/data/styles/incomplete/ScrollBar.qml
index a79c4daa..906a9847 100644
--- a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml
+++ b/tests/auto/customization/data/styles/incomplete/ScrollBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollBar {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml b/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml
index 2401fbe5..b34d4097 100644
--- a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml
+++ b/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ScrollView.qml b/tests/auto/customization/data/styles/incomplete/ScrollView.qml
index 736ea7b1..a120e05f 100644
--- a/tests/auto/customization/data/styles/incomplete/ScrollView.qml
+++ b/tests/auto/customization/data/styles/incomplete/ScrollView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollView {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Slider.qml b/tests/auto/customization/data/styles/incomplete/Slider.qml
index b4ede96f..02b06d92 100644
--- a/tests/auto/customization/data/styles/incomplete/Slider.qml
+++ b/tests/auto/customization/data/styles/incomplete/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Slider {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/SpinBox.qml b/tests/auto/customization/data/styles/incomplete/SpinBox.qml
index 6303ab06..9ec62e01 100644
--- a/tests/auto/customization/data/styles/incomplete/SpinBox.qml
+++ b/tests/auto/customization/data/styles/incomplete/SpinBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SpinBox {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/StackView.qml b/tests/auto/customization/data/styles/incomplete/StackView.qml
index b163a594..4108e166 100644
--- a/tests/auto/customization/data/styles/incomplete/StackView.qml
+++ b/tests/auto/customization/data/styles/incomplete/StackView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.StackView {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml b/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml
index a64b0fae..0da62d0f 100644
--- a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml
+++ b/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/SwipeView.qml b/tests/auto/customization/data/styles/incomplete/SwipeView.qml
index 07891063..434f9003 100644
--- a/tests/auto/customization/data/styles/incomplete/SwipeView.qml
+++ b/tests/auto/customization/data/styles/incomplete/SwipeView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeView {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Switch.qml b/tests/auto/customization/data/styles/incomplete/Switch.qml
index 53e41149..9f24763f 100644
--- a/tests/auto/customization/data/styles/incomplete/Switch.qml
+++ b/tests/auto/customization/data/styles/incomplete/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Switch {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml b/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml
index c9be903f..a33809c7 100644
--- a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml
+++ b/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwitchDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/TabBar.qml b/tests/auto/customization/data/styles/incomplete/TabBar.qml
index 1a55af4d..68e4f627 100644
--- a/tests/auto/customization/data/styles/incomplete/TabBar.qml
+++ b/tests/auto/customization/data/styles/incomplete/TabBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabBar {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/TabButton.qml b/tests/auto/customization/data/styles/incomplete/TabButton.qml
index e2e88a99..9ab619a9 100644
--- a/tests/auto/customization/data/styles/incomplete/TabButton.qml
+++ b/tests/auto/customization/data/styles/incomplete/TabButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabButton {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/TextArea.qml b/tests/auto/customization/data/styles/incomplete/TextArea.qml
index cf56e5a0..42f3d2fd 100644
--- a/tests/auto/customization/data/styles/incomplete/TextArea.qml
+++ b/tests/auto/customization/data/styles/incomplete/TextArea.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextArea {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/TextField.qml b/tests/auto/customization/data/styles/incomplete/TextField.qml
index 66f8372b..001d86b1 100644
--- a/tests/auto/customization/data/styles/incomplete/TextField.qml
+++ b/tests/auto/customization/data/styles/incomplete/TextField.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextField {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ToolBar.qml b/tests/auto/customization/data/styles/incomplete/ToolBar.qml
index a665bd25..de0bdb39 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolBar.qml
+++ b/tests/auto/customization/data/styles/incomplete/ToolBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolBar {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ToolButton.qml b/tests/auto/customization/data/styles/incomplete/ToolButton.qml
index 3fa51246..12b55b15 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolButton.qml
+++ b/tests/auto/customization/data/styles/incomplete/ToolButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolButton {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml b/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml
index 17b26d7c..aa413dd0 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml
+++ b/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/ToolTip.qml b/tests/auto/customization/data/styles/incomplete/ToolTip.qml
index 7aee3648..d2104f9e 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolTip.qml
+++ b/tests/auto/customization/data/styles/incomplete/ToolTip.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolTip {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/Tumbler.qml b/tests/auto/customization/data/styles/incomplete/Tumbler.qml
index cda24bc2..996af0d2 100644
--- a/tests/auto/customization/data/styles/incomplete/Tumbler.qml
+++ b/tests/auto/customization/data/styles/incomplete/Tumbler.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Tumbler {
id: control
diff --git a/tests/auto/customization/data/styles/incomplete/qmldir b/tests/auto/customization/data/styles/incomplete/qmldir
new file mode 100644
index 00000000..e8813bd5
--- /dev/null
+++ b/tests/auto/customization/data/styles/incomplete/qmldir
@@ -0,0 +1,59 @@
+module incomplete
+
+AbstractButton 6.0 AbstractButton.qml
+Action 6.0 Action.qml
+ActionGroup 6.0 ActionGroup.qml
+ApplicationWindow 6.0 ApplicationWindow.qml
+BusyIndicator 6.0 BusyIndicator.qml
+Button 6.0 Button.qml
+ButtonGroup 6.0 ButtonGroup.qml
+CheckBox 6.0 CheckBox.qml
+CheckDelegate 6.0 CheckDelegate.qml
+ComboBox 6.0 ComboBox.qml
+Container 6.0 Container.qml
+Control 6.0 Control.qml
+DelayButton 6.0 DelayButton.qml
+Dial 6.0 Dial.qml
+Dialog 6.0 Dialog.qml
+DialogButtonBox 6.0 DialogButtonBox.qml
+Drawer 6.0 Drawer.qml
+Frame 6.0 Frame.qml
+GroupBox 6.0 GroupBox.qml
+HorizontalHeaderView 6.0 HorizontalHeaderView.qml
+ItemDelegate 6.0 ItemDelegate.qml
+Label 6.0 Label.qml
+Menu 6.0 Menu.qml
+MenuBar 6.0 MenuBar.qml
+MenuBarItem 6.0 MenuBarItem.qml
+MenuItem 6.0 MenuItem.qml
+MenuSeparator 6.0 MenuSeparator.qml
+Page 6.0 Page.qml
+PageIndicator 6.0 PageIndicator.qml
+Pane 6.0 Pane.qml
+Popup 6.0 Popup.qml
+ProgressBar 6.0 ProgressBar.qml
+RadioButton 6.0 RadioButton.qml
+RadioDelegate 6.0 RadioDelegate.qml
+RangeSlider 6.0 RangeSlider.qml
+RoundButton 6.0 RoundButton.qml
+ScrollBar 6.0 ScrollBar.qml
+ScrollIndicator 6.0 ScrollIndicator.qml
+ScrollView 6.0 ScrollView.qml
+Slider 6.0 Slider.qml
+SpinBox 6.0 SpinBox.qml
+SplitView 6.0 SplitView.qml
+StackView 6.0 StackView.qml
+SwipeDelegate 6.0 SwipeDelegate.qml
+SwipeView 6.0 SwipeView.qml
+Switch 6.0 Switch.qml
+SwitchDelegate 6.0 SwitchDelegate.qml
+TabBar 6.0 TabBar.qml
+TabButton 6.0 TabButton.qml
+TextArea 6.0 TextArea.qml
+TextField 6.0 TextField.qml
+ToolBar 6.0 ToolBar.qml
+ToolButton 6.0 ToolButton.qml
+ToolSeparator 6.0 ToolSeparator.qml
+ToolTip 6.0 ToolTip.qml
+Tumbler 6.0 Tumbler.qml
+VerticalHeaderView 6.0 VerticalHeaderView.qml
diff --git a/tests/auto/customization/data/styles/override/AbstractButton.qml b/tests/auto/customization/data/styles/override/AbstractButton.qml
index 398b51b7..e8bf0b90 100644
--- a/tests/auto/customization/data/styles/override/AbstractButton.qml
+++ b/tests/auto/customization/data/styles/override/AbstractButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.AbstractButton {
diff --git a/tests/auto/customization/data/styles/override/ApplicationWindow.qml b/tests/auto/customization/data/styles/override/ApplicationWindow.qml
index 7a760574..43b94010 100644
--- a/tests/auto/customization/data/styles/override/ApplicationWindow.qml
+++ b/tests/auto/customization/data/styles/override/ApplicationWindow.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ApplicationWindow {
diff --git a/tests/auto/customization/data/styles/override/BusyIndicator.qml b/tests/auto/customization/data/styles/override/BusyIndicator.qml
index 2b70548f..12418ff7 100644
--- a/tests/auto/customization/data/styles/override/BusyIndicator.qml
+++ b/tests/auto/customization/data/styles/override/BusyIndicator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.BusyIndicator {
diff --git a/tests/auto/customization/data/styles/override/Button.qml b/tests/auto/customization/data/styles/override/Button.qml
index 35f260c3..692c2fda 100644
--- a/tests/auto/customization/data/styles/override/Button.qml
+++ b/tests/auto/customization/data/styles/override/Button.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Button {
diff --git a/tests/auto/customization/data/styles/override/CheckBox.qml b/tests/auto/customization/data/styles/override/CheckBox.qml
index 857b86ea..9830931b 100644
--- a/tests/auto/customization/data/styles/override/CheckBox.qml
+++ b/tests/auto/customization/data/styles/override/CheckBox.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.CheckBox {
diff --git a/tests/auto/customization/data/styles/override/CheckDelegate.qml b/tests/auto/customization/data/styles/override/CheckDelegate.qml
index 17e0ed48..77cdf23d 100644
--- a/tests/auto/customization/data/styles/override/CheckDelegate.qml
+++ b/tests/auto/customization/data/styles/override/CheckDelegate.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.CheckDelegate {
diff --git a/tests/auto/customization/data/styles/override/ComboBox.qml b/tests/auto/customization/data/styles/override/ComboBox.qml
index a41e4674..c3276dcc 100644
--- a/tests/auto/customization/data/styles/override/ComboBox.qml
+++ b/tests/auto/customization/data/styles/override/ComboBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
import "../simple" as Simple
Simple.ComboBox {
diff --git a/tests/auto/customization/data/styles/override/Container.qml b/tests/auto/customization/data/styles/override/Container.qml
index d4d6c189..b732aefa 100644
--- a/tests/auto/customization/data/styles/override/Container.qml
+++ b/tests/auto/customization/data/styles/override/Container.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Container {
diff --git a/tests/auto/customization/data/styles/override/Control.qml b/tests/auto/customization/data/styles/override/Control.qml
index fc6acb8f..b4fefcf5 100644
--- a/tests/auto/customization/data/styles/override/Control.qml
+++ b/tests/auto/customization/data/styles/override/Control.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Control {
diff --git a/tests/auto/customization/data/styles/override/DelayButton.qml b/tests/auto/customization/data/styles/override/DelayButton.qml
index 69fcf49d..5ee03d57 100644
--- a/tests/auto/customization/data/styles/override/DelayButton.qml
+++ b/tests/auto/customization/data/styles/override/DelayButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.DelayButton {
diff --git a/tests/auto/customization/data/styles/override/Dial.qml b/tests/auto/customization/data/styles/override/Dial.qml
index 484f8c3f..d452a58f 100644
--- a/tests/auto/customization/data/styles/override/Dial.qml
+++ b/tests/auto/customization/data/styles/override/Dial.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Dial {
diff --git a/tests/auto/customization/data/styles/override/Dialog.qml b/tests/auto/customization/data/styles/override/Dialog.qml
index 81798a39..29e3d26d 100644
--- a/tests/auto/customization/data/styles/override/Dialog.qml
+++ b/tests/auto/customization/data/styles/override/Dialog.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Dialog {
diff --git a/tests/auto/customization/data/styles/override/DialogButtonBox.qml b/tests/auto/customization/data/styles/override/DialogButtonBox.qml
index 5ab315d4..c79b9f81 100644
--- a/tests/auto/customization/data/styles/override/DialogButtonBox.qml
+++ b/tests/auto/customization/data/styles/override/DialogButtonBox.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.DialogButtonBox {
diff --git a/tests/auto/customization/data/styles/override/Drawer.qml b/tests/auto/customization/data/styles/override/Drawer.qml
index 943522e7..65aa625c 100644
--- a/tests/auto/customization/data/styles/override/Drawer.qml
+++ b/tests/auto/customization/data/styles/override/Drawer.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Drawer {
diff --git a/tests/auto/customization/data/styles/override/Frame.qml b/tests/auto/customization/data/styles/override/Frame.qml
index b3b589b5..b31b70aa 100644
--- a/tests/auto/customization/data/styles/override/Frame.qml
+++ b/tests/auto/customization/data/styles/override/Frame.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Frame {
diff --git a/tests/auto/customization/data/styles/override/GroupBox.qml b/tests/auto/customization/data/styles/override/GroupBox.qml
index 570bc63e..0d0bfbd9 100644
--- a/tests/auto/customization/data/styles/override/GroupBox.qml
+++ b/tests/auto/customization/data/styles/override/GroupBox.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.GroupBox {
diff --git a/tests/auto/customization/data/styles/override/ItemDelegate.qml b/tests/auto/customization/data/styles/override/ItemDelegate.qml
index 6b2fd928..4a087c75 100644
--- a/tests/auto/customization/data/styles/override/ItemDelegate.qml
+++ b/tests/auto/customization/data/styles/override/ItemDelegate.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ItemDelegate {
diff --git a/tests/auto/customization/data/styles/override/Label.qml b/tests/auto/customization/data/styles/override/Label.qml
index 249a9e99..883cff74 100644
--- a/tests/auto/customization/data/styles/override/Label.qml
+++ b/tests/auto/customization/data/styles/override/Label.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Label {
diff --git a/tests/auto/customization/data/styles/override/Menu.qml b/tests/auto/customization/data/styles/override/Menu.qml
index 4e10c480..f551fae8 100644
--- a/tests/auto/customization/data/styles/override/Menu.qml
+++ b/tests/auto/customization/data/styles/override/Menu.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Menu {
diff --git a/tests/auto/customization/data/styles/override/MenuBar.qml b/tests/auto/customization/data/styles/override/MenuBar.qml
index baeef209..b7f54cfb 100644
--- a/tests/auto/customization/data/styles/override/MenuBar.qml
+++ b/tests/auto/customization/data/styles/override/MenuBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.MenuBar {
diff --git a/tests/auto/customization/data/styles/override/MenuBarItem.qml b/tests/auto/customization/data/styles/override/MenuBarItem.qml
index a76ca190..513b59ce 100644
--- a/tests/auto/customization/data/styles/override/MenuBarItem.qml
+++ b/tests/auto/customization/data/styles/override/MenuBarItem.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.MenuBarItem {
diff --git a/tests/auto/customization/data/styles/override/MenuItem.qml b/tests/auto/customization/data/styles/override/MenuItem.qml
index ee10e1ba..7f7f569a 100644
--- a/tests/auto/customization/data/styles/override/MenuItem.qml
+++ b/tests/auto/customization/data/styles/override/MenuItem.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.MenuItem {
diff --git a/tests/auto/customization/data/styles/override/MenuSeparator.qml b/tests/auto/customization/data/styles/override/MenuSeparator.qml
index c60cedea..57a2db15 100644
--- a/tests/auto/customization/data/styles/override/MenuSeparator.qml
+++ b/tests/auto/customization/data/styles/override/MenuSeparator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.MenuSeparator {
diff --git a/tests/auto/customization/data/styles/override/Page.qml b/tests/auto/customization/data/styles/override/Page.qml
index 9f85d9e9..c51d1e73 100644
--- a/tests/auto/customization/data/styles/override/Page.qml
+++ b/tests/auto/customization/data/styles/override/Page.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Page {
diff --git a/tests/auto/customization/data/styles/override/PageIndicator.qml b/tests/auto/customization/data/styles/override/PageIndicator.qml
index 1d1e20ed..3d58299e 100644
--- a/tests/auto/customization/data/styles/override/PageIndicator.qml
+++ b/tests/auto/customization/data/styles/override/PageIndicator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.PageIndicator {
diff --git a/tests/auto/customization/data/styles/override/Pane.qml b/tests/auto/customization/data/styles/override/Pane.qml
index fb56cc07..70a29441 100644
--- a/tests/auto/customization/data/styles/override/Pane.qml
+++ b/tests/auto/customization/data/styles/override/Pane.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Pane {
diff --git a/tests/auto/customization/data/styles/override/Popup.qml b/tests/auto/customization/data/styles/override/Popup.qml
index 54e8a4f7..a63879bd 100644
--- a/tests/auto/customization/data/styles/override/Popup.qml
+++ b/tests/auto/customization/data/styles/override/Popup.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Popup {
diff --git a/tests/auto/customization/data/styles/override/ProgressBar.qml b/tests/auto/customization/data/styles/override/ProgressBar.qml
index ce0623f2..2a9e636a 100644
--- a/tests/auto/customization/data/styles/override/ProgressBar.qml
+++ b/tests/auto/customization/data/styles/override/ProgressBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ProgressBar {
diff --git a/tests/auto/customization/data/styles/override/RadioButton.qml b/tests/auto/customization/data/styles/override/RadioButton.qml
index c435b3d9..5bd5c721 100644
--- a/tests/auto/customization/data/styles/override/RadioButton.qml
+++ b/tests/auto/customization/data/styles/override/RadioButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.RadioButton {
diff --git a/tests/auto/customization/data/styles/override/RadioDelegate.qml b/tests/auto/customization/data/styles/override/RadioDelegate.qml
index 2659800e..7fbe3833 100644
--- a/tests/auto/customization/data/styles/override/RadioDelegate.qml
+++ b/tests/auto/customization/data/styles/override/RadioDelegate.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.RadioDelegate {
diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/customization/data/styles/override/RangeSlider.qml
index 7c8cdbbc..0f4cda99 100644
--- a/tests/auto/customization/data/styles/override/RangeSlider.qml
+++ b/tests/auto/customization/data/styles/override/RangeSlider.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.RangeSlider {
diff --git a/tests/auto/customization/data/styles/override/RoundButton.qml b/tests/auto/customization/data/styles/override/RoundButton.qml
index 233d0c30..1a0b0e05 100644
--- a/tests/auto/customization/data/styles/override/RoundButton.qml
+++ b/tests/auto/customization/data/styles/override/RoundButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.RoundButton {
diff --git a/tests/auto/customization/data/styles/override/ScrollBar.qml b/tests/auto/customization/data/styles/override/ScrollBar.qml
index 69fc08f6..fc551710 100644
--- a/tests/auto/customization/data/styles/override/ScrollBar.qml
+++ b/tests/auto/customization/data/styles/override/ScrollBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ScrollBar {
diff --git a/tests/auto/customization/data/styles/override/ScrollIndicator.qml b/tests/auto/customization/data/styles/override/ScrollIndicator.qml
index 15a44e7a..06497abb 100644
--- a/tests/auto/customization/data/styles/override/ScrollIndicator.qml
+++ b/tests/auto/customization/data/styles/override/ScrollIndicator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ScrollIndicator {
diff --git a/tests/auto/customization/data/styles/override/ScrollView.qml b/tests/auto/customization/data/styles/override/ScrollView.qml
index a8041961..bc02c265 100644
--- a/tests/auto/customization/data/styles/override/ScrollView.qml
+++ b/tests/auto/customization/data/styles/override/ScrollView.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ScrollView {
diff --git a/tests/auto/customization/data/styles/override/Slider.qml b/tests/auto/customization/data/styles/override/Slider.qml
index 252752fd..052c523b 100644
--- a/tests/auto/customization/data/styles/override/Slider.qml
+++ b/tests/auto/customization/data/styles/override/Slider.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Slider {
diff --git a/tests/auto/customization/data/styles/override/SpinBox.qml b/tests/auto/customization/data/styles/override/SpinBox.qml
index 041ba6a0..d074ec63 100644
--- a/tests/auto/customization/data/styles/override/SpinBox.qml
+++ b/tests/auto/customization/data/styles/override/SpinBox.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.SpinBox {
diff --git a/tests/auto/customization/data/styles/override/StackView.qml b/tests/auto/customization/data/styles/override/StackView.qml
index aa35fd62..bc33d64b 100644
--- a/tests/auto/customization/data/styles/override/StackView.qml
+++ b/tests/auto/customization/data/styles/override/StackView.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.StackView {
diff --git a/tests/auto/customization/data/styles/override/SwipeDelegate.qml b/tests/auto/customization/data/styles/override/SwipeDelegate.qml
index 634f1e69..bb387370 100644
--- a/tests/auto/customization/data/styles/override/SwipeDelegate.qml
+++ b/tests/auto/customization/data/styles/override/SwipeDelegate.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.SwipeDelegate {
diff --git a/tests/auto/customization/data/styles/override/SwipeView.qml b/tests/auto/customization/data/styles/override/SwipeView.qml
index ffea0df8..63646a0b 100644
--- a/tests/auto/customization/data/styles/override/SwipeView.qml
+++ b/tests/auto/customization/data/styles/override/SwipeView.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.SwipeView {
diff --git a/tests/auto/customization/data/styles/override/Switch.qml b/tests/auto/customization/data/styles/override/Switch.qml
index 0006b00d..57a3f804 100644
--- a/tests/auto/customization/data/styles/override/Switch.qml
+++ b/tests/auto/customization/data/styles/override/Switch.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Switch {
diff --git a/tests/auto/customization/data/styles/override/SwitchDelegate.qml b/tests/auto/customization/data/styles/override/SwitchDelegate.qml
index 6a9e318c..6b9986d8 100644
--- a/tests/auto/customization/data/styles/override/SwitchDelegate.qml
+++ b/tests/auto/customization/data/styles/override/SwitchDelegate.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.SwitchDelegate {
diff --git a/tests/auto/customization/data/styles/override/TabBar.qml b/tests/auto/customization/data/styles/override/TabBar.qml
index 11c009e6..b3e03bdd 100644
--- a/tests/auto/customization/data/styles/override/TabBar.qml
+++ b/tests/auto/customization/data/styles/override/TabBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.TabBar {
diff --git a/tests/auto/customization/data/styles/override/TabButton.qml b/tests/auto/customization/data/styles/override/TabButton.qml
index 967e6ab5..f2852f68 100644
--- a/tests/auto/customization/data/styles/override/TabButton.qml
+++ b/tests/auto/customization/data/styles/override/TabButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.TabButton {
diff --git a/tests/auto/customization/data/styles/override/TextArea.qml b/tests/auto/customization/data/styles/override/TextArea.qml
index 5a1b1fe9..ad4a3c7b 100644
--- a/tests/auto/customization/data/styles/override/TextArea.qml
+++ b/tests/auto/customization/data/styles/override/TextArea.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.TextArea {
diff --git a/tests/auto/customization/data/styles/override/TextField.qml b/tests/auto/customization/data/styles/override/TextField.qml
index 2c37d9ae..39bb695e 100644
--- a/tests/auto/customization/data/styles/override/TextField.qml
+++ b/tests/auto/customization/data/styles/override/TextField.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.TextField {
diff --git a/tests/auto/customization/data/styles/override/ToolBar.qml b/tests/auto/customization/data/styles/override/ToolBar.qml
index 51346893..8af7238e 100644
--- a/tests/auto/customization/data/styles/override/ToolBar.qml
+++ b/tests/auto/customization/data/styles/override/ToolBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ToolBar {
diff --git a/tests/auto/customization/data/styles/override/ToolButton.qml b/tests/auto/customization/data/styles/override/ToolButton.qml
index 67bbcf64..a9e285fb 100644
--- a/tests/auto/customization/data/styles/override/ToolButton.qml
+++ b/tests/auto/customization/data/styles/override/ToolButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ToolButton {
diff --git a/tests/auto/customization/data/styles/override/ToolSeparator.qml b/tests/auto/customization/data/styles/override/ToolSeparator.qml
index 70704e6b..5c6b408d 100644
--- a/tests/auto/customization/data/styles/override/ToolSeparator.qml
+++ b/tests/auto/customization/data/styles/override/ToolSeparator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ToolSeparator {
diff --git a/tests/auto/customization/data/styles/override/ToolTip.qml b/tests/auto/customization/data/styles/override/ToolTip.qml
index 4be4dc43..642d6184 100644
--- a/tests/auto/customization/data/styles/override/ToolTip.qml
+++ b/tests/auto/customization/data/styles/override/ToolTip.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.ToolTip {
diff --git a/tests/auto/customization/data/styles/override/Tumbler.qml b/tests/auto/customization/data/styles/override/Tumbler.qml
index f3d56273..72d68f8a 100644
--- a/tests/auto/customization/data/styles/override/Tumbler.qml
+++ b/tests/auto/customization/data/styles/override/Tumbler.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
+import QtQuick
import "../simple" as Simple
Simple.Tumbler {
diff --git a/tests/auto/customization/data/styles/override/qmldir b/tests/auto/customization/data/styles/override/qmldir
new file mode 100644
index 00000000..f15ba96a
--- /dev/null
+++ b/tests/auto/customization/data/styles/override/qmldir
@@ -0,0 +1,59 @@
+module override
+
+AbstractButton 6.0 AbstractButton.qml
+Action 6.0 Action.qml
+ActionGroup 6.0 ActionGroup.qml
+ApplicationWindow 6.0 ApplicationWindow.qml
+BusyIndicator 6.0 BusyIndicator.qml
+Button 6.0 Button.qml
+ButtonGroup 6.0 ButtonGroup.qml
+CheckBox 6.0 CheckBox.qml
+CheckDelegate 6.0 CheckDelegate.qml
+ComboBox 6.0 ComboBox.qml
+Container 6.0 Container.qml
+Control 6.0 Control.qml
+DelayButton 6.0 DelayButton.qml
+Dial 6.0 Dial.qml
+Dialog 6.0 Dialog.qml
+DialogButtonBox 6.0 DialogButtonBox.qml
+Drawer 6.0 Drawer.qml
+Frame 6.0 Frame.qml
+GroupBox 6.0 GroupBox.qml
+HorizontalHeaderView 6.0 HorizontalHeaderView.qml
+ItemDelegate 6.0 ItemDelegate.qml
+Label 6.0 Label.qml
+Menu 6.0 Menu.qml
+MenuBar 6.0 MenuBar.qml
+MenuBarItem 6.0 MenuBarItem.qml
+MenuItem 6.0 MenuItem.qml
+MenuSeparator 6.0 MenuSeparator.qml
+Page 6.0 Page.qml
+PageIndicator 6.0 PageIndicator.qml
+Pane 6.0 Pane.qml
+Popup 6.0 Popup.qml
+ProgressBar 6.0 ProgressBar.qml
+RadioButton 6.0 RadioButton.qml
+RadioDelegate 6.0 RadioDelegate.qml
+RangeSlider 6.0 RangeSlider.qml
+RoundButton 6.0 RoundButton.qml
+ScrollBar 6.0 ScrollBar.qml
+ScrollIndicator 6.0 ScrollIndicator.qml
+ScrollView 6.0 ScrollView.qml
+Slider 6.0 Slider.qml
+SpinBox 6.0 SpinBox.qml
+SplitView 6.0 SplitView.qml
+StackView 6.0 StackView.qml
+SwipeDelegate 6.0 SwipeDelegate.qml
+SwipeView 6.0 SwipeView.qml
+Switch 6.0 Switch.qml
+SwitchDelegate 6.0 SwitchDelegate.qml
+TabBar 6.0 TabBar.qml
+TabButton 6.0 TabButton.qml
+TextArea 6.0 TextArea.qml
+TextField 6.0 TextField.qml
+ToolBar 6.0 ToolBar.qml
+ToolButton 6.0 ToolButton.qml
+ToolSeparator 6.0 ToolSeparator.qml
+ToolTip 6.0 ToolTip.qml
+Tumbler 6.0 Tumbler.qml
+VerticalHeaderView 6.0 VerticalHeaderView.qml
diff --git a/tests/auto/customization/data/styles/simple/AbstractButton.qml b/tests/auto/customization/data/styles/simple/AbstractButton.qml
index 2daaea48..f8eaef0c 100644
--- a/tests/auto/customization/data/styles/simple/AbstractButton.qml
+++ b/tests/auto/customization/data/styles/simple/AbstractButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.AbstractButton {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml b/tests/auto/customization/data/styles/simple/ApplicationWindow.qml
index 6cf6440d..ec39193b 100644
--- a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml
+++ b/tests/auto/customization/data/styles/simple/ApplicationWindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ApplicationWindow {
id: control
diff --git a/tests/auto/customization/data/styles/simple/BusyIndicator.qml b/tests/auto/customization/data/styles/simple/BusyIndicator.qml
index f859a09b..1dcebb9b 100644
--- a/tests/auto/customization/data/styles/simple/BusyIndicator.qml
+++ b/tests/auto/customization/data/styles/simple/BusyIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.BusyIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Button.qml b/tests/auto/customization/data/styles/simple/Button.qml
index 66240ba2..993c585b 100644
--- a/tests/auto/customization/data/styles/simple/Button.qml
+++ b/tests/auto/customization/data/styles/simple/Button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Button {
id: control
diff --git a/tests/auto/customization/data/styles/simple/CheckBox.qml b/tests/auto/customization/data/styles/simple/CheckBox.qml
index 931228b0..f4a95f0f 100644
--- a/tests/auto/customization/data/styles/simple/CheckBox.qml
+++ b/tests/auto/customization/data/styles/simple/CheckBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckBox {
id: control
diff --git a/tests/auto/customization/data/styles/simple/CheckDelegate.qml b/tests/auto/customization/data/styles/simple/CheckDelegate.qml
index cc1cdd7a..563db329 100644
--- a/tests/auto/customization/data/styles/simple/CheckDelegate.qml
+++ b/tests/auto/customization/data/styles/simple/CheckDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.CheckDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ComboBox.qml b/tests/auto/customization/data/styles/simple/ComboBox.qml
index 658f5d77..ed861389 100644
--- a/tests/auto/customization/data/styles/simple/ComboBox.qml
+++ b/tests/auto/customization/data/styles/simple/ComboBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ComboBox {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Container.qml b/tests/auto/customization/data/styles/simple/Container.qml
index cfa32324..4a150096 100644
--- a/tests/auto/customization/data/styles/simple/Container.qml
+++ b/tests/auto/customization/data/styles/simple/Container.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Container {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Control.qml b/tests/auto/customization/data/styles/simple/Control.qml
index d8ba3c81..e083f8ac 100644
--- a/tests/auto/customization/data/styles/simple/Control.qml
+++ b/tests/auto/customization/data/styles/simple/Control.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Control {
id: control
diff --git a/tests/auto/customization/data/styles/simple/DelayButton.qml b/tests/auto/customization/data/styles/simple/DelayButton.qml
index d48abf9c..8f33c401 100644
--- a/tests/auto/customization/data/styles/simple/DelayButton.qml
+++ b/tests/auto/customization/data/styles/simple/DelayButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DelayButton {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Dial.qml b/tests/auto/customization/data/styles/simple/Dial.qml
index 26f1f86a..c1a9b50b 100644
--- a/tests/auto/customization/data/styles/simple/Dial.qml
+++ b/tests/auto/customization/data/styles/simple/Dial.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dial {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Dialog.qml b/tests/auto/customization/data/styles/simple/Dialog.qml
index 020ff66b..787acca9 100644
--- a/tests/auto/customization/data/styles/simple/Dialog.qml
+++ b/tests/auto/customization/data/styles/simple/Dialog.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Dialog {
id: control
diff --git a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml b/tests/auto/customization/data/styles/simple/DialogButtonBox.qml
index 6514647e..d7da32e0 100644
--- a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml
+++ b/tests/auto/customization/data/styles/simple/DialogButtonBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.DialogButtonBox {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Drawer.qml b/tests/auto/customization/data/styles/simple/Drawer.qml
index ac75cbdf..8239b1af 100644
--- a/tests/auto/customization/data/styles/simple/Drawer.qml
+++ b/tests/auto/customization/data/styles/simple/Drawer.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Drawer {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Frame.qml b/tests/auto/customization/data/styles/simple/Frame.qml
index 11a8e0fc..cbeb3c5d 100644
--- a/tests/auto/customization/data/styles/simple/Frame.qml
+++ b/tests/auto/customization/data/styles/simple/Frame.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Frame {
id: control
diff --git a/tests/auto/customization/data/styles/simple/GroupBox.qml b/tests/auto/customization/data/styles/simple/GroupBox.qml
index 309950ea..14dc3341 100644
--- a/tests/auto/customization/data/styles/simple/GroupBox.qml
+++ b/tests/auto/customization/data/styles/simple/GroupBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.GroupBox {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ItemDelegate.qml b/tests/auto/customization/data/styles/simple/ItemDelegate.qml
index 9eb3c9c8..a22ec3aa 100644
--- a/tests/auto/customization/data/styles/simple/ItemDelegate.qml
+++ b/tests/auto/customization/data/styles/simple/ItemDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ItemDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Label.qml b/tests/auto/customization/data/styles/simple/Label.qml
index d7afddbb..80b34723 100644
--- a/tests/auto/customization/data/styles/simple/Label.qml
+++ b/tests/auto/customization/data/styles/simple/Label.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Label {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Menu.qml b/tests/auto/customization/data/styles/simple/Menu.qml
index 3c2d487c..7538bd5b 100644
--- a/tests/auto/customization/data/styles/simple/Menu.qml
+++ b/tests/auto/customization/data/styles/simple/Menu.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Menu {
id: control
diff --git a/tests/auto/customization/data/styles/simple/MenuBar.qml b/tests/auto/customization/data/styles/simple/MenuBar.qml
index 1e64a3ac..a38c876e 100644
--- a/tests/auto/customization/data/styles/simple/MenuBar.qml
+++ b/tests/auto/customization/data/styles/simple/MenuBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBar {
id: control
diff --git a/tests/auto/customization/data/styles/simple/MenuBarItem.qml b/tests/auto/customization/data/styles/simple/MenuBarItem.qml
index 1454ceaa..de9dc929 100644
--- a/tests/auto/customization/data/styles/simple/MenuBarItem.qml
+++ b/tests/auto/customization/data/styles/simple/MenuBarItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuBarItem {
id: control
diff --git a/tests/auto/customization/data/styles/simple/MenuItem.qml b/tests/auto/customization/data/styles/simple/MenuItem.qml
index 59ac3471..28d5998b 100644
--- a/tests/auto/customization/data/styles/simple/MenuItem.qml
+++ b/tests/auto/customization/data/styles/simple/MenuItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuItem {
id: control
diff --git a/tests/auto/customization/data/styles/simple/MenuSeparator.qml b/tests/auto/customization/data/styles/simple/MenuSeparator.qml
index 413b412f..3df17b58 100644
--- a/tests/auto/customization/data/styles/simple/MenuSeparator.qml
+++ b/tests/auto/customization/data/styles/simple/MenuSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.MenuSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Page.qml b/tests/auto/customization/data/styles/simple/Page.qml
index 950bbdc0..51ec6063 100644
--- a/tests/auto/customization/data/styles/simple/Page.qml
+++ b/tests/auto/customization/data/styles/simple/Page.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Page {
id: control
diff --git a/tests/auto/customization/data/styles/simple/PageIndicator.qml b/tests/auto/customization/data/styles/simple/PageIndicator.qml
index 7ec5c57a..d508687f 100644
--- a/tests/auto/customization/data/styles/simple/PageIndicator.qml
+++ b/tests/auto/customization/data/styles/simple/PageIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.PageIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Pane.qml b/tests/auto/customization/data/styles/simple/Pane.qml
index 86fb079f..3b9e12b8 100644
--- a/tests/auto/customization/data/styles/simple/Pane.qml
+++ b/tests/auto/customization/data/styles/simple/Pane.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Pane {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Popup.qml b/tests/auto/customization/data/styles/simple/Popup.qml
index 41b90be0..8b62fcad 100644
--- a/tests/auto/customization/data/styles/simple/Popup.qml
+++ b/tests/auto/customization/data/styles/simple/Popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Popup {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ProgressBar.qml b/tests/auto/customization/data/styles/simple/ProgressBar.qml
index 81c0f146..3f04e6b2 100644
--- a/tests/auto/customization/data/styles/simple/ProgressBar.qml
+++ b/tests/auto/customization/data/styles/simple/ProgressBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ProgressBar {
id: control
diff --git a/tests/auto/customization/data/styles/simple/RadioButton.qml b/tests/auto/customization/data/styles/simple/RadioButton.qml
index c9910756..7ca5973b 100644
--- a/tests/auto/customization/data/styles/simple/RadioButton.qml
+++ b/tests/auto/customization/data/styles/simple/RadioButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioButton {
id: control
diff --git a/tests/auto/customization/data/styles/simple/RadioDelegate.qml b/tests/auto/customization/data/styles/simple/RadioDelegate.qml
index c59fa336..bc96ad47 100644
--- a/tests/auto/customization/data/styles/simple/RadioDelegate.qml
+++ b/tests/auto/customization/data/styles/simple/RadioDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RadioDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/simple/RangeSlider.qml b/tests/auto/customization/data/styles/simple/RangeSlider.qml
index d16c4bcf..202688c4 100644
--- a/tests/auto/customization/data/styles/simple/RangeSlider.qml
+++ b/tests/auto/customization/data/styles/simple/RangeSlider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RangeSlider {
id: control
diff --git a/tests/auto/customization/data/styles/simple/RoundButton.qml b/tests/auto/customization/data/styles/simple/RoundButton.qml
index c5609e34..3547239f 100644
--- a/tests/auto/customization/data/styles/simple/RoundButton.qml
+++ b/tests/auto/customization/data/styles/simple/RoundButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.RoundButton {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ScrollBar.qml b/tests/auto/customization/data/styles/simple/ScrollBar.qml
index 01f3f78e..25bc3e09 100644
--- a/tests/auto/customization/data/styles/simple/ScrollBar.qml
+++ b/tests/auto/customization/data/styles/simple/ScrollBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollBar {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml b/tests/auto/customization/data/styles/simple/ScrollIndicator.qml
index 4b802ed7..a901671b 100644
--- a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml
+++ b/tests/auto/customization/data/styles/simple/ScrollIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollIndicator {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ScrollView.qml b/tests/auto/customization/data/styles/simple/ScrollView.qml
index fe782285..56334d84 100644
--- a/tests/auto/customization/data/styles/simple/ScrollView.qml
+++ b/tests/auto/customization/data/styles/simple/ScrollView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ScrollView {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Slider.qml b/tests/auto/customization/data/styles/simple/Slider.qml
index 109709b2..d5417404 100644
--- a/tests/auto/customization/data/styles/simple/Slider.qml
+++ b/tests/auto/customization/data/styles/simple/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Slider {
id: control
diff --git a/tests/auto/customization/data/styles/simple/SpinBox.qml b/tests/auto/customization/data/styles/simple/SpinBox.qml
index 9db98875..0facffad 100644
--- a/tests/auto/customization/data/styles/simple/SpinBox.qml
+++ b/tests/auto/customization/data/styles/simple/SpinBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SpinBox {
id: control
diff --git a/tests/auto/customization/data/styles/simple/StackView.qml b/tests/auto/customization/data/styles/simple/StackView.qml
index f1439275..e16b9938 100644
--- a/tests/auto/customization/data/styles/simple/StackView.qml
+++ b/tests/auto/customization/data/styles/simple/StackView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.StackView {
id: control
diff --git a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml b/tests/auto/customization/data/styles/simple/SwipeDelegate.qml
index 27701a92..fec9f120 100644
--- a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml
+++ b/tests/auto/customization/data/styles/simple/SwipeDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/simple/SwipeView.qml b/tests/auto/customization/data/styles/simple/SwipeView.qml
index abdde942..cf154b6b 100644
--- a/tests/auto/customization/data/styles/simple/SwipeView.qml
+++ b/tests/auto/customization/data/styles/simple/SwipeView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwipeView {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Switch.qml b/tests/auto/customization/data/styles/simple/Switch.qml
index 8d008ffb..9e961308 100644
--- a/tests/auto/customization/data/styles/simple/Switch.qml
+++ b/tests/auto/customization/data/styles/simple/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Switch {
id: control
diff --git a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml b/tests/auto/customization/data/styles/simple/SwitchDelegate.qml
index cdc91314..f7eb1d5c 100644
--- a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml
+++ b/tests/auto/customization/data/styles/simple/SwitchDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.SwitchDelegate {
id: control
diff --git a/tests/auto/customization/data/styles/simple/TabBar.qml b/tests/auto/customization/data/styles/simple/TabBar.qml
index 5055346e..6b0f2b63 100644
--- a/tests/auto/customization/data/styles/simple/TabBar.qml
+++ b/tests/auto/customization/data/styles/simple/TabBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabBar {
id: control
diff --git a/tests/auto/customization/data/styles/simple/TabButton.qml b/tests/auto/customization/data/styles/simple/TabButton.qml
index d6b67647..4c8a30ba 100644
--- a/tests/auto/customization/data/styles/simple/TabButton.qml
+++ b/tests/auto/customization/data/styles/simple/TabButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TabButton {
id: control
diff --git a/tests/auto/customization/data/styles/simple/TextArea.qml b/tests/auto/customization/data/styles/simple/TextArea.qml
index 10c326a6..7e906433 100644
--- a/tests/auto/customization/data/styles/simple/TextArea.qml
+++ b/tests/auto/customization/data/styles/simple/TextArea.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextArea {
id: control
diff --git a/tests/auto/customization/data/styles/simple/TextField.qml b/tests/auto/customization/data/styles/simple/TextField.qml
index 09c12a60..71a68534 100644
--- a/tests/auto/customization/data/styles/simple/TextField.qml
+++ b/tests/auto/customization/data/styles/simple/TextField.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.TextField {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ToolBar.qml b/tests/auto/customization/data/styles/simple/ToolBar.qml
index 9b23b67c..30bba195 100644
--- a/tests/auto/customization/data/styles/simple/ToolBar.qml
+++ b/tests/auto/customization/data/styles/simple/ToolBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolBar {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ToolButton.qml b/tests/auto/customization/data/styles/simple/ToolButton.qml
index 13ccb576..229b7536 100644
--- a/tests/auto/customization/data/styles/simple/ToolButton.qml
+++ b/tests/auto/customization/data/styles/simple/ToolButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolButton {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ToolSeparator.qml b/tests/auto/customization/data/styles/simple/ToolSeparator.qml
index ef172f74..8ee00bc3 100644
--- a/tests/auto/customization/data/styles/simple/ToolSeparator.qml
+++ b/tests/auto/customization/data/styles/simple/ToolSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolSeparator {
id: control
diff --git a/tests/auto/customization/data/styles/simple/ToolTip.qml b/tests/auto/customization/data/styles/simple/ToolTip.qml
index 27a61c17..0299adf1 100644
--- a/tests/auto/customization/data/styles/simple/ToolTip.qml
+++ b/tests/auto/customization/data/styles/simple/ToolTip.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.ToolTip {
id: control
diff --git a/tests/auto/customization/data/styles/simple/Tumbler.qml b/tests/auto/customization/data/styles/simple/Tumbler.qml
index 58c85541..34f423c7 100644
--- a/tests/auto/customization/data/styles/simple/Tumbler.qml
+++ b/tests/auto/customization/data/styles/simple/Tumbler.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T
T.Tumbler {
id: control
diff --git a/tests/auto/customization/data/styles/simple/qmldir b/tests/auto/customization/data/styles/simple/qmldir
new file mode 100644
index 00000000..e5159885
--- /dev/null
+++ b/tests/auto/customization/data/styles/simple/qmldir
@@ -0,0 +1,59 @@
+module simple
+
+AbstractButton 6.0 AbstractButton.qml
+Action 6.0 Action.qml
+ActionGroup 6.0 ActionGroup.qml
+ApplicationWindow 6.0 ApplicationWindow.qml
+BusyIndicator 6.0 BusyIndicator.qml
+Button 6.0 Button.qml
+ButtonGroup 6.0 ButtonGroup.qml
+CheckBox 6.0 CheckBox.qml
+CheckDelegate 6.0 CheckDelegate.qml
+ComboBox 6.0 ComboBox.qml
+Container 6.0 Container.qml
+Control 6.0 Control.qml
+DelayButton 6.0 DelayButton.qml
+Dial 6.0 Dial.qml
+Dialog 6.0 Dialog.qml
+DialogButtonBox 6.0 DialogButtonBox.qml
+Drawer 6.0 Drawer.qml
+Frame 6.0 Frame.qml
+GroupBox 6.0 GroupBox.qml
+HorizontalHeaderView 6.0 HorizontalHeaderView.qml
+ItemDelegate 6.0 ItemDelegate.qml
+Label 6.0 Label.qml
+Menu 6.0 Menu.qml
+MenuBar 6.0 MenuBar.qml
+MenuBarItem 6.0 MenuBarItem.qml
+MenuItem 6.0 MenuItem.qml
+MenuSeparator 6.0 MenuSeparator.qml
+Page 6.0 Page.qml
+PageIndicator 6.0 PageIndicator.qml
+Pane 6.0 Pane.qml
+Popup 6.0 Popup.qml
+ProgressBar 6.0 ProgressBar.qml
+RadioButton 6.0 RadioButton.qml
+RadioDelegate 6.0 RadioDelegate.qml
+RangeSlider 6.0 RangeSlider.qml
+RoundButton 6.0 RoundButton.qml
+ScrollBar 6.0 ScrollBar.qml
+ScrollIndicator 6.0 ScrollIndicator.qml
+ScrollView 6.0 ScrollView.qml
+Slider 6.0 Slider.qml
+SpinBox 6.0 SpinBox.qml
+SplitView 6.0 SplitView.qml
+StackView 6.0 StackView.qml
+SwipeDelegate 6.0 SwipeDelegate.qml
+SwipeView 6.0 SwipeView.qml
+Switch 6.0 Switch.qml
+SwitchDelegate 6.0 SwitchDelegate.qml
+TabBar 6.0 TabBar.qml
+TabButton 6.0 TabButton.qml
+TextArea 6.0 TextArea.qml
+TextField 6.0 TextField.qml
+ToolBar 6.0 ToolBar.qml
+ToolButton 6.0 ToolButton.qml
+ToolSeparator 6.0 ToolSeparator.qml
+ToolTip 6.0 ToolTip.qml
+Tumbler 6.0 Tumbler.qml
+VerticalHeaderView 6.0 VerticalHeaderView.qml
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp
index 498a9e60..add48cc7 100644
--- a/tests/auto/customization/tst_customization.cpp
+++ b/tests/auto/customization/tst_customization.cpp
@@ -42,6 +42,7 @@
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickwindow.h>
#include <QtQuickControls2/qquickstyle.h>
+#include <QtQuickControls2/private/qquickstyle_p.h>
#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
#include "../shared/visualtestutil.h"
@@ -227,6 +228,7 @@ void tst_customization::cleanupTestCase()
void tst_customization::init()
{
engine = new QQmlEngine(this);
+ engine->addImportPath(testFile("styles"));
qtHookData[QHooks::AddQObject] = reinterpret_cast<quintptr>(&qt_addQObject);
qtHookData[QHooks::RemoveQObject] = reinterpret_cast<quintptr>(&qt_removeQObject);
@@ -256,7 +258,7 @@ void tst_customization::reset()
QObject* tst_customization::createControl(const QString &name, const QString &qml, QString *error)
{
QQmlComponent component(engine);
- component.setData("import QtQuick 2.10; import QtQuick.Window 2.2; import QtQuick.Controls 2.3; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl());
+ component.setData("import QtQuick; import QtQuick.Window; import QtQuick.Controls; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl());
QObject *obj = component.create();
if (!obj)
*error = component.errorString();
@@ -296,7 +298,7 @@ void tst_customization::creation()
QFETCH(QString, type);
QFETCH(QStringList, delegates);
- QQuickStyle::setStyle(testFile("styles/" + style));
+ QQuickStyle::setStyle(style);
QString error;
QScopedPointer<QObject> control(createControl(type, "", &error));
@@ -363,7 +365,7 @@ void tst_customization::override_data()
#ifndef Q_OS_MACOS // QTBUG-65671
// test that the built-in styles don't have undesired IDs in their delegates
- const QStringList styles = QStringList() << "Default" << "Fusion" << "Material" << "Universal"; // ### TODO: QQuickStyle::availableStyles();
+ const QStringList styles = QQuickStylePrivate::builtInStyles();
for (const QString &style : styles) {
for (const ControlInfo &control : ControlInfos)
QTest::newRow(qPrintable(style + ":" + control.type)) << style << control.type << control.delegates << "" << false;
@@ -380,11 +382,7 @@ void tst_customization::override()
QFETCH(QString, nonDeferred);
QFETCH(bool, identify);
- const QString testStyle = testFile("styles/" + style);
- if (QDir(testStyle).exists())
- QQuickStyle::setStyle(testStyle);
- else
- QQuickStyle::setStyle(style);
+ QQuickStyle::setStyle(style);
QString qml;
qml += QString("objectName: '%1-%2-override'; ").arg(type.toLower()).arg(style);
@@ -478,12 +476,12 @@ void tst_customization::override()
void tst_customization::comboPopup()
{
- QQuickStyle::setStyle(testFile("styles/simple"));
+ QQuickStyle::setStyle("simple");
{
// test that ComboBox::popup is created when accessed
QQmlComponent component(engine);
- component.setData("import QtQuick.Controls 2.2; ComboBox { }", QUrl());
+ component.setData("import QtQuick.Controls; ComboBox { }", QUrl());
QScopedPointer<QQuickItem> comboBox(qobject_cast<QQuickItem *>(component.create()));
QVERIFY(comboBox);
@@ -505,7 +503,7 @@ void tst_customization::comboPopup()
QVERIFY(QTest::qWaitForWindowActive(&window));
QQmlComponent component(engine);
- component.setData("import QtQuick.Controls 2.2; ComboBox { }", QUrl());
+ component.setData("import QtQuick.Controls; ComboBox { }", QUrl());
QScopedPointer<QQuickItem> comboBox(qobject_cast<QQuickItem *>(component.create()));
QVERIFY(comboBox);
@@ -521,7 +519,7 @@ void tst_customization::comboPopup()
{
// test that ComboBox::popup is completed upon component completion (if appropriate)
QQmlComponent component(engine);
- component.setData("import QtQuick 2.9; import QtQuick.Controls 2.2; ComboBox { id: control; contentItem: Item { visible: !control.popup.visible } popup: Popup { property bool wasCompleted: false; Component.onCompleted: wasCompleted = true } }", QUrl());
+ component.setData("import QtQuick; import QtQuick.Controls; ComboBox { id: control; contentItem: Item { visible: !control.popup.visible } popup: Popup { property bool wasCompleted: false; Component.onCompleted: wasCompleted = true } }", QUrl());
QScopedPointer<QQuickItem> comboBox(qobject_cast<QQuickItem *>(component.create()));
QVERIFY(comboBox);
diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt
index 1cc44de4..3e8234e9 100644
--- a/tests/auto/focus/CMakeLists.txt
+++ b/tests/auto/focus/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_focus
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/focus/data/activeFocusOnTab.qml b/tests/auto/focus/data/activeFocusOnTab.qml
index 21bea5e8..6b57f39b 100644
--- a/tests/auto/focus/data/activeFocusOnTab.qml
+++ b/tests/auto/focus/data/activeFocusOnTab.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Item {
id: main
diff --git a/tests/auto/focus/data/keyNavigation.qml b/tests/auto/focus/data/keyNavigation.qml
index 6e949d1d..7ac8e014 100644
--- a/tests/auto/focus/data/keyNavigation.qml
+++ b/tests/auto/focus/data/keyNavigation.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Item {
id: main
diff --git a/tests/auto/focus/data/visualFocus.qml b/tests/auto/focus/data/visualFocus.qml
index 3f3e8fb6..2f516be7 100644
--- a/tests/auto/focus/data/visualFocus.qml
+++ b/tests/auto/focus/data/visualFocus.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Column {
width: 400
diff --git a/tests/auto/font/data/font-appwindow-custom.qml b/tests/auto/font/data/font-appwindow-custom.qml
index 20101bfa..9f82079e 100644
--- a/tests/auto/font/data/font-appwindow-custom.qml
+++ b/tests/auto/font/data/font-appwindow-custom.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
font.capitalization: Font.AllUppercase
diff --git a/tests/auto/font/data/font-appwindow-default.qml b/tests/auto/font/data/font-appwindow-default.qml
index bc75cbb2..9f2c34fe 100644
--- a/tests/auto/font/data/font-appwindow-default.qml
+++ b/tests/auto/font/data/font-appwindow-default.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
}
diff --git a/tests/auto/font/data/font-control-custom.qml b/tests/auto/font/data/font-control-custom.qml
index 3f198746..8fcfc686 100644
--- a/tests/auto/font/data/font-control-custom.qml
+++ b/tests/auto/font/data/font-control-custom.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control {
font.capitalization: Font.AllUppercase
diff --git a/tests/auto/font/data/font-control-default.qml b/tests/auto/font/data/font-control-default.qml
index e7e78036..48afa021 100644
--- a/tests/auto/font/data/font-control-default.qml
+++ b/tests/auto/font/data/font-control-default.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control {
}
diff --git a/tests/auto/font/data/font-popup-custom.qml b/tests/auto/font/data/font-popup-custom.qml
index 3d9eb4a2..e3983bf5 100644
--- a/tests/auto/font/data/font-popup-custom.qml
+++ b/tests/auto/font/data/font-popup-custom.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Popup {
font.capitalization: Font.AllUppercase
diff --git a/tests/auto/font/data/font-popup-default.qml b/tests/auto/font/data/font-popup-default.qml
index a9bde413..77676bac 100644
--- a/tests/auto/font/data/font-popup-default.qml
+++ b/tests/auto/font/data/font-popup-default.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Popup {
}
diff --git a/tests/auto/font/data/inheritance-childcontrol.qml b/tests/auto/font/data/inheritance-childcontrol.qml
index 4ddab64c..896354df 100644
--- a/tests/auto/font/data/inheritance-childcontrol.qml
+++ b/tests/auto/font/data/inheritance-childcontrol.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-childpopup.qml b/tests/auto/font/data/inheritance-childpopup.qml
index 6868949b..7896a558 100644
--- a/tests/auto/font/data/inheritance-childpopup.qml
+++ b/tests/auto/font/data/inheritance-childpopup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-control.qml b/tests/auto/font/data/inheritance-control.qml
index 68f7371c..eb534180 100644
--- a/tests/auto/font/data/inheritance-control.qml
+++ b/tests/auto/font/data/inheritance-control.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml
index 1f7c56d1..0a4e5bc6 100644
--- a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/font/data/inheritance-dynamicchildpopup.qml
index a32d34ec..0e799d47 100644
--- a/tests/auto/font/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/font/data/inheritance-dynamicchildpopup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-dynamiccontrol.qml b/tests/auto/font/data/inheritance-dynamiccontrol.qml
index d200e397..058d5b8b 100644
--- a/tests/auto/font/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/font/data/inheritance-dynamiccontrol.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-dynamicpopup.qml b/tests/auto/font/data/inheritance-dynamicpopup.qml
index a084cc1b..429669c7 100644
--- a/tests/auto/font/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/font/data/inheritance-dynamicpopup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/inheritance-popup.qml b/tests/auto/font/data/inheritance-popup.qml
index e114287f..cd2aebb5 100644
--- a/tests/auto/font/data/inheritance-popup.qml
+++ b/tests/auto/font/data/inheritance-popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/font/data/listview.qml b/tests/auto/font/data/listview.qml
index 048567e5..7c372585 100644
--- a/tests/auto/font/data/listview.qml
+++ b/tests/auto/font/data/listview.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/bindings.qml b/tests/auto/palette/data/bindings.qml
index f87b6572..5f156c96 100644
--- a/tests/auto/palette/data/bindings.qml
+++ b/tests/auto/palette/data/bindings.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 6.0
-import QtQuick.Window 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.13
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-childcontrol.qml b/tests/auto/palette/data/inheritance-childcontrol.qml
index 4ddab64c..896354df 100644
--- a/tests/auto/palette/data/inheritance-childcontrol.qml
+++ b/tests/auto/palette/data/inheritance-childcontrol.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-childpopup.qml b/tests/auto/palette/data/inheritance-childpopup.qml
index 6868949b..7896a558 100644
--- a/tests/auto/palette/data/inheritance-childpopup.qml
+++ b/tests/auto/palette/data/inheritance-childpopup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-control.qml b/tests/auto/palette/data/inheritance-control.qml
index 68f7371c..eb534180 100644
--- a/tests/auto/palette/data/inheritance-control.qml
+++ b/tests/auto/palette/data/inheritance-control.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml
index 1f7c56d1..0a4e5bc6 100644
--- a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml
index a32d34ec..0e799d47 100644
--- a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/palette/data/inheritance-dynamiccontrol.qml
index d200e397..058d5b8b 100644
--- a/tests/auto/palette/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/palette/data/inheritance-dynamiccontrol.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-dynamicpopup.qml b/tests/auto/palette/data/inheritance-dynamicpopup.qml
index a084cc1b..429669c7 100644
--- a/tests/auto/palette/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/palette/data/inheritance-dynamicpopup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/inheritance-popup.qml b/tests/auto/palette/data/inheritance-popup.qml
index e114287f..cd2aebb5 100644
--- a/tests/auto/palette/data/inheritance-popup.qml
+++ b/tests/auto/palette/data/inheritance-popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/listview.qml b/tests/auto/palette/data/listview.qml
index a19f6d26..eee6531f 100644
--- a/tests/auto/palette/data/listview.qml
+++ b/tests/auto/palette/data/listview.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/palette/data/palette-appwindow-custom.qml b/tests/auto/palette/data/palette-appwindow-custom.qml
index a59fb42c..f5f75ae7 100644
--- a/tests/auto/palette/data/palette-appwindow-custom.qml
+++ b/tests/auto/palette/data/palette-appwindow-custom.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
palette.alternateBase: "aqua"
diff --git a/tests/auto/palette/data/palette-appwindow-default.qml b/tests/auto/palette/data/palette-appwindow-default.qml
index bc75cbb2..9f2c34fe 100644
--- a/tests/auto/palette/data/palette-appwindow-default.qml
+++ b/tests/auto/palette/data/palette-appwindow-default.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
}
diff --git a/tests/auto/palette/data/palette-control-custom.qml b/tests/auto/palette/data/palette-control-custom.qml
index fb4b9282..6915404d 100644
--- a/tests/auto/palette/data/palette-control-custom.qml
+++ b/tests/auto/palette/data/palette-control-custom.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control {
palette.alternateBase: "aqua"
diff --git a/tests/auto/palette/data/palette-control-default.qml b/tests/auto/palette/data/palette-control-default.qml
index e7e78036..48afa021 100644
--- a/tests/auto/palette/data/palette-control-default.qml
+++ b/tests/auto/palette/data/palette-control-default.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control {
}
diff --git a/tests/auto/palette/data/palette-popup-custom.qml b/tests/auto/palette/data/palette-popup-custom.qml
index ffecfea2..47f52d17 100644
--- a/tests/auto/palette/data/palette-popup-custom.qml
+++ b/tests/auto/palette/data/palette-popup-custom.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Popup {
palette.alternateBase: "aqua"
diff --git a/tests/auto/palette/data/palette-popup-default.qml b/tests/auto/palette/data/palette-popup-default.qml
index a9bde413..77676bac 100644
--- a/tests/auto/palette/data/palette-popup-default.qml
+++ b/tests/auto/palette/data/palette-popup-default.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Popup {
}
diff --git a/tests/auto/palette/data/set-palette.qml b/tests/auto/palette/data/set-palette.qml
index f9f067e0..2d0fe194 100644
--- a/tests/auto/palette/data/set-palette.qml
+++ b/tests/auto/palette/data/set-palette.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 6.0
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
Control {
palette {
diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/platform/data/tst_colordialog.qml
index 98122c25..12055a5a 100644
--- a/tests/auto/platform/data/tst_colordialog.qml
+++ b/tests/auto/platform/data/tst_colordialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/platform/data/tst_filedialog.qml
index 775e24d3..5a63dd23 100644
--- a/tests/auto/platform/data/tst_filedialog.qml
+++ b/tests/auto/platform/data/tst_filedialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/platform/data/tst_folderdialog.qml
index 5f44b995..37881c1a 100644
--- a/tests/auto/platform/data/tst_folderdialog.qml
+++ b/tests/auto/platform/data/tst_folderdialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/platform/data/tst_fontdialog.qml
index 8166964f..edb62e52 100644
--- a/tests/auto/platform/data/tst_fontdialog.qml
+++ b/tests/auto/platform/data/tst_fontdialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml
index bb37c17b..7e389222 100644
--- a/tests/auto/platform/data/tst_menu.qml
+++ b/tests/auto/platform/data/tst_menu.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/platform/data/tst_menubar.qml
index 199c5010..0dd9eb91 100644
--- a/tests/auto/platform/data/tst_menubar.qml
+++ b/tests/auto/platform/data/tst_menubar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml
index 316af97d..0120832d 100644
--- a/tests/auto/platform/data/tst_menuitem.qml
+++ b/tests/auto/platform/data/tst_menuitem.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.1
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menuitemgroup.qml b/tests/auto/platform/data/tst_menuitemgroup.qml
index c65150ca..117f79ce 100644
--- a/tests/auto/platform/data/tst_menuitemgroup.qml
+++ b/tests/auto/platform/data/tst_menuitemgroup.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/platform/data/tst_menuseparator.qml
index 29c48f6b..52bb349f 100644
--- a/tests/auto/platform/data/tst_menuseparator.qml
+++ b/tests/auto/platform/data/tst_menuseparator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml
index d5f2e21f..23a5c821 100644
--- a/tests/auto/platform/data/tst_messagedialog.qml
+++ b/tests/auto/platform/data/tst_messagedialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/platform/data/tst_standardpaths.qml
index 35f0d23b..841731be 100644
--- a/tests/auto/platform/data/tst_standardpaths.qml
+++ b/tests/auto/platform/data/tst_standardpaths.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml
index d7a63551..09f10261 100644
--- a/tests/auto/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/platform/data/tst_systemtrayicon.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.1
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/pressandhold/data/dependencies.qml b/tests/auto/pressandhold/data/dependencies.qml
index dac5f935..280cfd29 100644
--- a/tests/auto/pressandhold/data/dependencies.qml
+++ b/tests/auto/pressandhold/data/dependencies.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Control { }
diff --git a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
index 743ae16d..ef694990 100644
--- a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
+++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
index 45b3d1e3..07d783ac 100644
--- a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
+++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
index fdb349ce..d241d995 100644
--- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
+++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
ApplicationWindow {
property alias childControl: childControl
diff --git a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
index a9412fd6..738022e9 100644
--- a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
index d3218998..bf8f61b7 100644
--- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
+++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtGraphicalEffects
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
index 5dff2b6c..4651c2fc 100644
--- a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
+++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
visible: true
diff --git a/tests/auto/qquickapplicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml
index d29ed0f9..082e2409 100644
--- a/tests/auto/qquickapplicationwindow/data/fill.qml
+++ b/tests/auto/qquickapplicationwindow/data/fill.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
index 313bbb5f..ca8da3c2 100644
--- a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
+++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickapplicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml
index 8bde4bf1..f0abbb9a 100644
--- a/tests/auto/qquickapplicationwindow/data/font.qml
+++ b/tests/auto/qquickapplicationwindow/data/font.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
ApplicationWindow {
objectName: "appWin"
diff --git a/tests/auto/qquickapplicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml
index dc840443..6d4f3794 100644
--- a/tests/auto/qquickapplicationwindow/data/layout.qml
+++ b/tests/auto/qquickapplicationwindow/data/layout.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickapplicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml
index 5efb948f..243ce440 100644
--- a/tests/auto/qquickapplicationwindow/data/locale.qml
+++ b/tests/auto/qquickapplicationwindow/data/locale.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
ApplicationWindow {
objectName: "appWin"
diff --git a/tests/auto/qquickapplicationwindow/data/opacity.qml b/tests/auto/qquickapplicationwindow/data/opacity.qml
new file mode 100644
index 00000000..d3272522
--- /dev/null
+++ b/tests/auto/qquickapplicationwindow/data/opacity.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+
+ApplicationWindow {
+ title: "Test Application Window"
+ width: 300
+ height: 300
+ opacity: 0.5
+
+ property bool testActive: active
+}
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index baaa3503..347c955e 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -78,6 +78,7 @@ private slots:
void clearFocusOnDestruction();
void layout();
void componentComplete();
+ void opacity();
};
void tst_QQuickApplicationWindow::qmlCreation()
@@ -871,6 +872,19 @@ void tst_QQuickApplicationWindow::componentComplete()
QVERIFY(qmlWindow->isComponentComplete());
}
+void tst_QQuickApplicationWindow::opacity()
+{
+ QQmlEngine engine;
+ QQmlComponent component(&engine);
+ component.loadUrl(testFileUrl("opacity.qml"));
+
+ QScopedPointer<QObject> object(component.create());
+ QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
+
+ QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(object.data());
+ QVERIFY(window);
+}
+
QTEST_MAIN(tst_QQuickApplicationWindow)
#include "tst_qquickapplicationwindow.moc"
diff --git a/tests/auto/qquickcolor/data/tst_color.qml b/tests/auto/qquickcolor/data/tst_color.qml
index e3083514..cdd07e14 100644
--- a/tests/auto/qquickcolor/data/tst_color.qml
+++ b/tests/auto/qquickcolor/data/tst_color.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtTest
+import QtQuick.Controls
+import QtQuick.Controls.impl
TestCase {
id: testCase
diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/qquickcontrol/CMakeLists.txt
index 59e1ccb6..0599ce32 100644
--- a/tests/auto/qquickcontrol/CMakeLists.txt
+++ b/tests/auto/qquickcontrol/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_qquickcontrol
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickcontrol/data/flickable.qml b/tests/auto/qquickcontrol/data/flickable.qml
index f3a1c381..0ac72320 100644
--- a/tests/auto/qquickcontrol/data/flickable.qml
+++ b/tests/auto/qquickcontrol/data/flickable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.14
-import QtQuick.Controls 2.14
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt
index 3679471a..e428a86c 100644
--- a/tests/auto/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/qquickdrawer/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_qquickdrawer
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml
index 8e1047b5..a7c70e04 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
index 3de06805..8b8efb48 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
index 5042f44f..449fbadb 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml
index 01b8ff77..3f2ed118 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
index 7354b6b9..6d2951f7 100644
--- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
+++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml
index 09d43029..b3f98d9e 100644
--- a/tests/auto/qquickdrawer/data/flickable.qml
+++ b/tests/auto/qquickdrawer/data/flickable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml
index 1f9bbcbb..bd1b84aa 100644
--- a/tests/auto/qquickdrawer/data/grabber.qml
+++ b/tests/auto/qquickdrawer/data/grabber.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml
index af84cf9b..dfd64ab1 100644
--- a/tests/auto/qquickdrawer/data/header.qml
+++ b/tests/auto/qquickdrawer/data/header.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml
index 57135e5f..03b69c4e 100644
--- a/tests/auto/qquickdrawer/data/multiTouch.qml
+++ b/tests/auto/qquickdrawer/data/multiTouch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml
index d629e3d0..d4d5fbd6 100644
--- a/tests/auto/qquickdrawer/data/multiple.qml
+++ b/tests/auto/qquickdrawer/data/multiple.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml
index 841e0b77..e3211fab 100644
--- a/tests/auto/qquickdrawer/data/reposition.qml
+++ b/tests/auto/qquickdrawer/data/reposition.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/qquickdrawer/data/slider.qml
index 391a79f0..b3db5a7b 100644
--- a/tests/auto/qquickdrawer/data/slider.qml
+++ b/tests/auto/qquickdrawer/data/slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
index 02b5a10f..d2aaf486 100644
--- a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
+++ b/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.5
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml
index 975d50db..02247dd0 100644
--- a/tests/auto/qquickdrawer/data/window-button.qml
+++ b/tests/auto/qquickdrawer/data/window-button.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400
diff --git a/tests/auto/qquickdrawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml
index 8360d7ce..e0b016cc 100644
--- a/tests/auto/qquickdrawer/data/window-hover.qml
+++ b/tests/auto/qquickdrawer/data/window-hover.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400
diff --git a/tests/auto/qquickdrawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml
index f313f368..e9c2eb42 100644
--- a/tests/auto/qquickdrawer/data/window-wheel.qml
+++ b/tests/auto/qquickdrawer/data/window-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
id: window
diff --git a/tests/auto/qquickdrawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml
index 578d3e9f..4bd9c9d2 100644
--- a/tests/auto/qquickdrawer/data/window.qml
+++ b/tests/auto/qquickdrawer/data/window.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400
diff --git a/tests/auto/qquickheaderview/data/ListModel.qml b/tests/auto/qquickheaderview/data/ListModel.qml
index 59021458..b8160a46 100644
--- a/tests/auto/qquickheaderview/data/ListModel.qml
+++ b/tests/auto/qquickheaderview/data/ListModel.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import TestTableModel 0.1
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import TestTableModel
Window {
objectName: "window"
diff --git a/tests/auto/qquickheaderview/data/Window.qml b/tests/auto/qquickheaderview/data/Window.qml
index 3811904e..9bf9963c 100644
--- a/tests/auto/qquickheaderview/data/Window.qml
+++ b/tests/auto/qquickheaderview/data/Window.qml
@@ -48,12 +48,12 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import TestTableModel 0.1
-import TestTableModelWithHeader 0.1
-import HeaderDataProxyModel 0.1
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import TestTableModel
+import TestTableModelWithHeader
+import HeaderDataProxyModel
Window {
objectName: "window"
diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt
index 9f6d0494..2ee0d295 100644
--- a/tests/auto/qquickiconimage/CMakeLists.txt
+++ b/tests/auto/qquickiconimage/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_add_test(tst_qquickiconimage
DEFINES
QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
LIBRARIES
- Qt::QuickControls2Private
+ Qt::QuickControls2ImplPrivate
Qt::QuickPrivate
PUBLIC_LIBRARIES
Qt::CorePrivate
@@ -33,6 +33,7 @@ qt_add_test(tst_qquickiconimage
Qt::QmlPrivate
Qt::Quick
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/qquickiconimage/data/alignment.qml
index 4e5ac6e7..e6861520 100644
--- a/tests/auto/qquickiconimage/data/alignment.qml
+++ b/tests/auto/qquickiconimage/data/alignment.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/qquickiconimage/data/color.qml
index b5d40d70..b44b4388 100644
--- a/tests/auto/qquickiconimage/data/color.qml
+++ b/tests/auto/qquickiconimage/data/color.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/qquickiconimage/data/fileSelectors.qml
index 4e5ac6e7..e6861520 100644
--- a/tests/auto/qquickiconimage/data/fileSelectors.qml
+++ b/tests/auto/qquickiconimage/data/fileSelectors.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml
index cf03ac7e..9b18a99e 100644
--- a/tests/auto/qquickiconimage/data/imageProvider.qml
+++ b/tests/auto/qquickiconimage/data/imageProvider.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
IconLabel {
icon.color: "transparent"
diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
index d0ea13c2..d457d205 100644
--- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
+++ b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
IconImage {
name: "appointment-new"
diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
index 4e5ac6e7..e6861520 100644
--- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
+++ b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
index db6697d0..5e7ebefc 100644
--- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
IconImage {
name: "appointment-new"
diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/qquickiconimage/data/root.qml
index 31ad7265..ed02d2df 100644
--- a/tests/auto/qquickiconimage/data/root.qml
+++ b/tests/auto/qquickiconimage/data/root.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
Item {
width: 200
diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
index 08dcd55e..34fc6b33 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
index 24678f8c..9f1b6290 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
index 9ac26e22..4dc3ac75 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
IconImage {
source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png"
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
index 655add7b..a54d998a 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
IconImage {
source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png"
diff --git a/tests/auto/qquickiconimage/data/svgNoSizes.qml b/tests/auto/qquickiconimage/data/svgNoSizes.qml
index d2652827..e29c23c5 100644
--- a/tests/auto/qquickiconimage/data/svgNoSizes.qml
+++ b/tests/auto/qquickiconimage/data/svgNoSizes.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
index c9157700..4674e8f1 100644
--- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
+++ b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/qquickiconimage/data/translucentColors.qml
index fd208235..ad67bfe5 100644
--- a/tests/auto/qquickiconimage/data/translucentColors.qml
+++ b/tests/auto/qquickiconimage/data/translucentColors.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
ApplicationWindow {
width: 500
diff --git a/tests/auto/qquickiconimage/qquickiconimage.pro b/tests/auto/qquickiconimage/qquickiconimage.pro
index 1a37d4ba..91b6985a 100644
--- a/tests/auto/qquickiconimage/qquickiconimage.pro
+++ b/tests/auto/qquickiconimage/qquickiconimage.pro
@@ -3,7 +3,7 @@ macos:CONFIG -= app_bundle
TARGET = tst_qquickiconimage
QT += core gui qml quick testlib
-QT_PRIVATE += quick-private quickcontrols2-private
+QT_PRIVATE += quick-private quickcontrols2impl-private
qtHaveModule(svg): QT += svg
include (../shared/util.pri)
diff --git a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
index bc24c4fb..bcf1231f 100644
--- a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
+++ b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
@@ -39,7 +39,7 @@
#include <QtQuick/qquickimageprovider.h>
#include <QtQuick/qquickitemgrabresult.h>
#include <QtQuick/private/qquickimage_p.h>
-#include <QtQuickControls2/private/qquickiconimage_p.h>
+#include <QtQuickControls2Impl/private/qquickiconimage_p.h>
#include "../shared/util.h"
#include "../shared/visualtestutil.h"
diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt
index bdbefd9d..97e115a5 100644
--- a/tests/auto/qquickiconlabel/CMakeLists.txt
+++ b/tests/auto/qquickiconlabel/CMakeLists.txt
@@ -19,7 +19,7 @@ qt_add_test(tst_qquickiconlabel
DEFINES
QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
LIBRARIES
- Qt::QuickControls2Private
+ Qt::QuickControls2ImplPrivate
Qt::QuickPrivate
PUBLIC_LIBRARIES
Qt::CorePrivate
@@ -29,6 +29,7 @@ qt_add_test(tst_qquickiconlabel
Qt::QmlPrivate
Qt::Quick
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml
index 954c1ef4..5771e1ed 100644
--- a/tests/auto/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/qquickiconlabel/data/colorChanges.qml
@@ -48,15 +48,15 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
AbstractButton {
id: button
width: 200
height: 200
- icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
icon.color: enabled ? "transparent" : "red"
IconLabel {
diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml
index b82f9faf..772b89bd 100644
--- a/tests/auto/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/qquickiconlabel/data/iconlabel.qml
@@ -48,16 +48,16 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
AbstractButton {
id: button
width: 200
height: 200
text: "Some text"
- icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
IconLabel {
icon: button.icon
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
index 61c9f74c..7921babb 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
@@ -48,15 +48,15 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
AbstractButton {
id: button
width: 200
height: 200
- icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
IconLabel {
spacing: 10
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml
index 7c2ecb0f..20c61706 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
Item {
width: 200
diff --git a/tests/auto/qquickiconlabel/qquickiconlabel.pro b/tests/auto/qquickiconlabel/qquickiconlabel.pro
index 6b0f73b3..af0a76cd 100644
--- a/tests/auto/qquickiconlabel/qquickiconlabel.pro
+++ b/tests/auto/qquickiconlabel/qquickiconlabel.pro
@@ -3,7 +3,7 @@ macos:CONFIG -= app_bundle
TARGET = tst_qquickiconlabel
QT += core gui qml quick testlib
-QT_PRIVATE += quick-private quickcontrols2-private
+QT_PRIVATE += quick-private quickcontrols2impl-private
include (../shared/util.pri)
diff --git a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
index 7a1cb259..526ecf05 100644
--- a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
+++ b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
@@ -35,8 +35,8 @@
#include <QtQuick/qquickitemgrabresult.h>
#include <QtQuick/private/qquicktext_p.h>
#include <QtQuickTemplates2/private/qquickicon_p.h>
-#include <QtQuickControls2/private/qquickiconimage_p.h>
-#include <QtQuickControls2/private/qquickiconlabel_p.h>
+#include <QtQuickControls2Impl/private/qquickiconimage_p.h>
+#include <QtQuickControls2Impl/private/qquickiconlabel_p.h>
#include "../shared/util.h"
#include "../shared/visualtestutil.h"
diff --git a/tests/auto/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/qquickimaginestyle/data/tst_imagine.qml
index b9078d78..493ff766 100644
--- a/tests/auto/qquickimaginestyle/data/tst_imagine.qml
+++ b/tests/auto/qquickimaginestyle/data/tst_imagine.qml
@@ -48,13 +48,13 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtTest 1.1
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Imagine 2.12
-import QtQuick.Controls.Imagine.impl 2.12
+import QtQuick
+import QtQuick.Window
+import QtTest
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.Imagine
+import QtQuick.Controls.Imagine.impl
TestCase {
id: testCase
diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml
index 9f2456b8..dfb0e770 100644
--- a/tests/auto/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml
@@ -48,12 +48,12 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtTest 1.0
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Window
+import QtTest
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.Material
TestCase {
id: testCase
@@ -606,7 +606,7 @@ TestCase {
verify(window)
verify(window.pane)
- var control = Qt.createQmlObject("import QtQuick.Controls 2.1; " + data.type + " { }", window.pane)
+ var control = Qt.createQmlObject("import QtQuick.Controls; " + data.type + " { }", window.pane)
verify(control)
compare(control.font[data.attribute], data.value)
diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml
index 8e3be027..1ce4598d 100644
--- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml
+++ b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt
index 478aaa82..5d6b9ffa 100644
--- a/tests/auto/qquickmenu/CMakeLists.txt
+++ b/tests/auto/qquickmenu/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_qquickmenu
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml
index 6998c722..226c9450 100644
--- a/tests/auto/qquickmenu/data/actions.qml
+++ b/tests/auto/qquickmenu/data/actions.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml
index ae592432..b9d38afd 100644
--- a/tests/auto/qquickmenu/data/addItem.qml
+++ b/tests/auto/qquickmenu/data/addItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
index b9894aed..22ab278e 100644
--- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
+++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml
index 13f14d2d..d15c0a88 100644
--- a/tests/auto/qquickmenu/data/applicationwindow.qml
+++ b/tests/auto/qquickmenu/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
index 303e9155..b2af27e9 100644
--- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 800
diff --git a/tests/auto/qquickmenu/data/disableWhenTriggered.qml b/tests/auto/qquickmenu/data/disableWhenTriggered.qml
index c64916ae..9de8868f 100644
--- a/tests/auto/qquickmenu/data/disableWhenTriggered.qml
+++ b/tests/auto/qquickmenu/data/disableWhenTriggered.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
index a39c5f44..496544e9 100644
--- a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
+++ b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/menuItemWidths.qml b/tests/auto/qquickmenu/data/menuItemWidths.qml
index 6d2baa32..e956a29f 100644
--- a/tests/auto/qquickmenu/data/menuItemWidths.qml
+++ b/tests/auto/qquickmenu/data/menuItemWidths.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 600
diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml
index ce6bd307..d71d99c5 100644
--- a/tests/auto/qquickmenu/data/menuSeparator.qml
+++ b/tests/auto/qquickmenu/data/menuSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml
index 510d2401..6525e59e 100644
--- a/tests/auto/qquickmenu/data/mnemonics.qml
+++ b/tests/auto/qquickmenu/data/mnemonics.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/data/order.qml b/tests/auto/qquickmenu/data/order.qml
index e03c86d3..f2f18168 100644
--- a/tests/auto/qquickmenu/data/order.qml
+++ b/tests/auto/qquickmenu/data/order.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml
index 3272cd6f..88c08b46 100644
--- a/tests/auto/qquickmenu/data/popup.qml
+++ b/tests/auto/qquickmenu/data/popup.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml
index bcc46c08..a16a15da 100644
--- a/tests/auto/qquickmenu/data/pressAndHold.qml
+++ b/tests/auto/qquickmenu/data/pressAndHold.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml
index 7e930812..cfe7585e 100644
--- a/tests/auto/qquickmenu/data/removeTakeItem.qml
+++ b/tests/auto/qquickmenu/data/removeTakeItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml
index 40f44281..50c8adcb 100644
--- a/tests/auto/qquickmenu/data/repeater.qml
+++ b/tests/auto/qquickmenu/data/repeater.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/scrollableWithPadding.qml b/tests/auto/qquickmenu/data/scrollableWithPadding.qml
index 86405ccb..c8e73858 100644
--- a/tests/auto/qquickmenu/data/scrollableWithPadding.qml
+++ b/tests/auto/qquickmenu/data/scrollableWithPadding.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Window 2.11
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
Window {
title: "Test Window"
diff --git a/tests/auto/qquickmenu/data/subMenuDisabled.qml b/tests/auto/qquickmenu/data/subMenuDisabled.qml
index 36ca1103..e50ab7ab 100644
--- a/tests/auto/qquickmenu/data/subMenuDisabled.qml
+++ b/tests/auto/qquickmenu/data/subMenuDisabled.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 600
diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml
index 4952e7a1..fad59ee6 100644
--- a/tests/auto/qquickmenu/data/subMenus.qml
+++ b/tests/auto/qquickmenu/data/subMenus.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 600
diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml
index 0d495242..7c3a5234 100644
--- a/tests/auto/qquickmenu/data/windowScrollable.qml
+++ b/tests/auto/qquickmenu/data/windowScrollable.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Window 2.11
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
Window {
title: "Test Window"
diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt
index 0803b4ec..72660ceb 100644
--- a/tests/auto/qquickmenubar/CMakeLists.txt
+++ b/tests/auto/qquickmenubar/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_qquickmenubar
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml b/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml
index 072fa6b1..14ee692e 100644
--- a/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml
+++ b/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 300
diff --git a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml
index 82321bca..76015190 100644
--- a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 800
diff --git a/tests/auto/qquickmenubar/data/empty.qml b/tests/auto/qquickmenubar/data/empty.qml
index 87a3d73d..6cb3c922 100644
--- a/tests/auto/qquickmenubar/data/empty.qml
+++ b/tests/auto/qquickmenubar/data/empty.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
MenuBar { }
diff --git a/tests/auto/qquickmenubar/data/menubar.qml b/tests/auto/qquickmenubar/data/menubar.qml
index 1ef83a6f..fcfe6c52 100644
--- a/tests/auto/qquickmenubar/data/menubar.qml
+++ b/tests/auto/qquickmenubar/data/menubar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt
index 23c2adb2..4372cbce 100644
--- a/tests/auto/qquickninepatchimage/CMakeLists.txt
+++ b/tests/auto/qquickninepatchimage/CMakeLists.txt
@@ -34,6 +34,7 @@ qt_add_test(tst_qquickninepatchimage
Qt::QmlPrivate
Qt::Quick
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml
index 4b9ac278..410a61f9 100644
--- a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml
+++ b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml
@@ -1,7 +1,7 @@
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Controls.Imagine 2.12
-import QtQuick.Controls.Imagine.impl 2.12
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Controls.Imagine
+import QtQuick.Controls.Imagine.impl
NinePatchImage {
}
diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt
index beb744a7..43d6d778 100644
--- a/tests/auto/qquickpopup/CMakeLists.txt
+++ b/tests/auto/qquickpopup/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_qquickpopup
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
index ed9b65e1..9a76ebea 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
index d089fbbb..6d004b17 100644
--- a/