Merge branch 'dev' into nativestyle

Change-Id: I9999194551f71abec3731355cd746e69e2e0b187

52 files changed, 111 insertions, 52 deletions

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