aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-27 17:36:45 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-28 14:01:57 +0000
commit7e54b75b8660c794d5e5ed5e252b4a87fa105c2b (patch)
tree038c2bd14145f20fd7ddf95a0f8cba8337e2a636
parenteff6448667f4b8e9f3ccf871c708be5b66880115 (diff)
Native style: remove versioning from imports
Change-Id: I73319d18ca6540227ce6bf4bdcf217a3c279c64c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/macos/Button.qml6
-rw-r--r--src/imports/controls/macos/CheckBox.qml6
-rw-r--r--src/imports/controls/macos/ComboBox.qml6
-rw-r--r--src/imports/controls/macos/Dial.qml6
-rw-r--r--src/imports/controls/macos/Frame.qml6
-rw-r--r--src/imports/controls/macos/GroupBox.qml6
-rw-r--r--src/imports/controls/macos/ProgressBar.qml8
-rw-r--r--src/imports/controls/macos/RadioButton.qml6
-rw-r--r--src/imports/controls/macos/ScrollBar.qml6
-rw-r--r--src/imports/controls/macos/Slider.qml6
-rw-r--r--src/imports/controls/macos/SpinBox.qml8
-rw-r--r--src/imports/controls/macos/TextArea.qml6
-rw-r--r--src/imports/controls/macos/TextField.qml6
-rw-r--r--src/imports/controls/windows/Button.qml10
-rw-r--r--src/imports/controls/windows/CheckBox.qml6
-rw-r--r--src/imports/controls/windows/ComboBox.qml6
-rw-r--r--src/imports/controls/windows/Frame.qml6
-rw-r--r--src/imports/controls/windows/GroupBox.qml6
-rw-r--r--src/imports/controls/windows/RadioButton.qml6
-rw-r--r--src/imports/controls/windows/Slider.qml6
-rw-r--r--src/imports/controls/windows/SpinBox.qml10
-rw-r--r--src/imports/controls/windows/TextArea.qml6
-rw-r--r--src/imports/controls/windows/TextField.qml6
-rw-r--r--src/imports/nativestyle/controls/DefaultButton.qml10
-rw-r--r--src/imports/nativestyle/controls/DefaultCheckBox.qml10
-rw-r--r--src/imports/nativestyle/controls/DefaultComboBox.qml12
-rw-r--r--src/imports/nativestyle/controls/DefaultDial.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultFrame.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultGroupBox.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultProgressBar.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultRadioButton.qml10
-rw-r--r--src/imports/nativestyle/controls/DefaultScrollBar.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultSlider.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultSpinBox.qml8
-rw-r--r--src/imports/nativestyle/controls/DefaultTextArea.qml10
-rw-r--r--src/imports/nativestyle/controls/DefaultTextField.qml10
-rw-r--r--tests/manual/nativestyle/Buttons.qml6
-rw-r--r--tests/manual/nativestyle/CheckBoxes.qml6
-rw-r--r--tests/manual/nativestyle/ComboBoxes.qml6
-rw-r--r--tests/manual/nativestyle/ControlContainer.qml6
-rw-r--r--tests/manual/nativestyle/CustomButtons.qml6
-rw-r--r--tests/manual/nativestyle/CustomCheckBoxes.qml8
-rw-r--r--tests/manual/nativestyle/CustomComboBoxes.qml8
-rw-r--r--tests/manual/nativestyle/CustomDials.qml8
-rw-r--r--tests/manual/nativestyle/CustomFrames.qml6
-rw-r--r--tests/manual/nativestyle/CustomProgressBars.qml8
-rw-r--r--tests/manual/nativestyle/CustomRadioButtons.qml8
-rw-r--r--tests/manual/nativestyle/CustomScrollBars.qml6
-rw-r--r--tests/manual/nativestyle/CustomSliders.qml6
-rw-r--r--tests/manual/nativestyle/CustomSpinBoxes.qml6
-rw-r--r--tests/manual/nativestyle/CustomTextAreas.qml6
-rw-r--r--tests/manual/nativestyle/CustomTextFields.qml6
-rw-r--r--tests/manual/nativestyle/Dials.qml6
-rw-r--r--tests/manual/nativestyle/Frames.qml6
-rw-r--r--tests/manual/nativestyle/ProgressBars.qml6
-rw-r--r--tests/manual/nativestyle/RadioButtons.qml8
-rw-r--r--tests/manual/nativestyle/ScrollBars.qml6
-rw-r--r--tests/manual/nativestyle/Sliders.qml6
-rw-r--r--tests/manual/nativestyle/SlidersMini.qml6
-rw-r--r--tests/manual/nativestyle/SlidersSmall.qml6
-rw-r--r--tests/manual/nativestyle/SpinBoxes.qml6
-rw-r--r--tests/manual/nativestyle/TextAreas.qml6
-rw-r--r--tests/manual/nativestyle/TextFields.qml6
-rw-r--r--tests/manual/nativestyle/main.qml8
64 files changed, 225 insertions, 225 deletions
diff --git a/src/imports/controls/macos/Button.qml b/src/imports/controls/macos/Button.qml
index 72b74ce0..6d5e1503 100644
--- a/src/imports/controls/macos/Button.qml
+++ b/src/imports/controls/macos/Button.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultButton {
}
diff --git a/src/imports/controls/macos/CheckBox.qml b/src/imports/controls/macos/CheckBox.qml
index 23b60bbe..9caf3dd0 100644
--- a/src/imports/controls/macos/CheckBox.qml
+++ b/src/imports/controls/macos/CheckBox.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultCheckBox {
}
diff --git a/src/imports/controls/macos/ComboBox.qml b/src/imports/controls/macos/ComboBox.qml
index 0398decc..c3880aba 100644
--- a/src/imports/controls/macos/ComboBox.qml
+++ b/src/imports/controls/macos/ComboBox.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultComboBox {
}
diff --git a/src/imports/controls/macos/Dial.qml b/src/imports/controls/macos/Dial.qml
index a811c7ce..90779f71 100644
--- a/src/imports/controls/macos/Dial.qml
+++ b/src/imports/controls/macos/Dial.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultDial {
}
diff --git a/src/imports/controls/macos/Frame.qml b/src/imports/controls/macos/Frame.qml
index eb287d35..0b45b352 100644
--- a/src/imports/controls/macos/Frame.qml
+++ b/src/imports/controls/macos/Frame.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultFrame {
}
diff --git a/src/imports/controls/macos/GroupBox.qml b/src/imports/controls/macos/GroupBox.qml
index 5bc64a43..42e6993d 100644
--- a/src/imports/controls/macos/GroupBox.qml
+++ b/src/imports/controls/macos/GroupBox.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultGroupBox {
}
diff --git a/src/imports/controls/macos/ProgressBar.qml b/src/imports/controls/macos/ProgressBar.qml
index a6ce2506..feeaca23 100644
--- a/src/imports/controls/macos/ProgressBar.qml
+++ b/src/imports/controls/macos/ProgressBar.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.ProgressBar {
id: control
diff --git a/src/imports/controls/macos/RadioButton.qml b/src/imports/controls/macos/RadioButton.qml
index 1f24b240..9670abef 100644
--- a/src/imports/controls/macos/RadioButton.qml
+++ b/src/imports/controls/macos/RadioButton.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultRadioButton {
}
diff --git a/src/imports/controls/macos/ScrollBar.qml b/src/imports/controls/macos/ScrollBar.qml
index de8acf48..72430e95 100644
--- a/src/imports/controls/macos/ScrollBar.qml
+++ b/src/imports/controls/macos/ScrollBar.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultScrollBar {
id: controlRoot
diff --git a/src/imports/controls/macos/Slider.qml b/src/imports/controls/macos/Slider.qml
index a1381591..1d04beca 100644
--- a/src/imports/controls/macos/Slider.qml
+++ b/src/imports/controls/macos/Slider.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultSlider {
}
diff --git a/src/imports/controls/macos/SpinBox.qml b/src/imports/controls/macos/SpinBox.qml
index 039f267c..06663375 100644
--- a/src/imports/controls/macos/SpinBox.qml
+++ b/src/imports/controls/macos/SpinBox.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.SpinBox {
id: control
diff --git a/src/imports/controls/macos/TextArea.qml b/src/imports/controls/macos/TextArea.qml
index e27f2d06..51982ff6 100644
--- a/src/imports/controls/macos/TextArea.qml
+++ b/src/imports/controls/macos/TextArea.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultTextArea {
}
diff --git a/src/imports/controls/macos/TextField.qml b/src/imports/controls/macos/TextField.qml
index a35b7f8e..f96023a6 100644
--- a/src/imports/controls/macos/TextField.qml
+++ b/src/imports/controls/macos/TextField.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultTextField {
}
diff --git a/src/imports/controls/windows/Button.qml b/src/imports/controls/windows/Button.qml
index a00a3ea4..71a0bad5 100644
--- a/src/imports/controls/windows/Button.qml
+++ b/src/imports/controls/windows/Button.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.Button {
id: control
diff --git a/src/imports/controls/windows/CheckBox.qml b/src/imports/controls/windows/CheckBox.qml
index 23b60bbe..9caf3dd0 100644
--- a/src/imports/controls/windows/CheckBox.qml
+++ b/src/imports/controls/windows/CheckBox.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultCheckBox {
}
diff --git a/src/imports/controls/windows/ComboBox.qml b/src/imports/controls/windows/ComboBox.qml
index 0398decc..c3880aba 100644
--- a/src/imports/controls/windows/ComboBox.qml
+++ b/src/imports/controls/windows/ComboBox.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultComboBox {
}
diff --git a/src/imports/controls/windows/Frame.qml b/src/imports/controls/windows/Frame.qml
index eb287d35..0b45b352 100644
--- a/src/imports/controls/windows/Frame.qml
+++ b/src/imports/controls/windows/Frame.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultFrame {
}
diff --git a/src/imports/controls/windows/GroupBox.qml b/src/imports/controls/windows/GroupBox.qml
index 5bc64a43..42e6993d 100644
--- a/src/imports/controls/windows/GroupBox.qml
+++ b/src/imports/controls/windows/GroupBox.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultGroupBox {
}
diff --git a/src/imports/controls/windows/RadioButton.qml b/src/imports/controls/windows/RadioButton.qml
index 1f24b240..9670abef 100644
--- a/src/imports/controls/windows/RadioButton.qml
+++ b/src/imports/controls/windows/RadioButton.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultRadioButton {
}
diff --git a/src/imports/controls/windows/Slider.qml b/src/imports/controls/windows/Slider.qml
index a1381591..1d04beca 100644
--- a/src/imports/controls/windows/Slider.qml
+++ b/src/imports/controls/windows/Slider.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultSlider {
}
diff --git a/src/imports/controls/windows/SpinBox.qml b/src/imports/controls/windows/SpinBox.qml
index 57b7669d..df9351c1 100644
--- a/src/imports/controls/windows/SpinBox.qml
+++ b/src/imports/controls/windows/SpinBox.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.SpinBox {
id: control
diff --git a/src/imports/controls/windows/TextArea.qml b/src/imports/controls/windows/TextArea.qml
index e27f2d06..51982ff6 100644
--- a/src/imports/controls/windows/TextArea.qml
+++ b/src/imports/controls/windows/TextArea.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultTextArea {
}
diff --git a/src/imports/controls/windows/TextField.qml b/src/imports/controls/windows/TextField.qml
index a35b7f8e..f96023a6 100644
--- a/src/imports/controls/windows/TextField.qml
+++ b/src/imports/controls/windows/TextField.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultTextField {
}
diff --git a/src/imports/nativestyle/controls/DefaultButton.qml b/src/imports/nativestyle/controls/DefaultButton.qml
index d98916ca..de0c8b70 100644
--- a/src/imports/nativestyle/controls/DefaultButton.qml
+++ b/src/imports/nativestyle/controls/DefaultButton.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.Button {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultCheckBox.qml b/src/imports/nativestyle/controls/DefaultCheckBox.qml
index c75e755e..09166820 100644
--- a/src/imports/nativestyle/controls/DefaultCheckBox.qml
+++ b/src/imports/nativestyle/controls/DefaultCheckBox.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.NativeStyle as NativeStyle
T.CheckBox {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultComboBox.qml b/src/imports/nativestyle/controls/DefaultComboBox.qml
index ec6fe7c8..9d0ed5cf 100644
--- a/src/imports/nativestyle/controls/DefaultComboBox.qml
+++ b/src/imports/nativestyle/controls/DefaultComboBox.qml
@@ -34,12 +34,12 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.impl 2.15
-import QtQuick.Templates 2.15 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.ComboBox {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultDial.qml b/src/imports/nativestyle/controls/DefaultDial.qml
index c9f6104a..0f1d2c7d 100644
--- a/src/imports/nativestyle/controls/DefaultDial.qml
+++ b/src/imports/nativestyle/controls/DefaultDial.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.Dial {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultFrame.qml b/src/imports/nativestyle/controls/DefaultFrame.qml
index 2c6a5039..6241a91e 100644
--- a/src/imports/nativestyle/controls/DefaultFrame.qml
+++ b/src/imports/nativestyle/controls/DefaultFrame.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.Frame {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultGroupBox.qml b/src/imports/nativestyle/controls/DefaultGroupBox.qml
index 04bdeeed..d5265bc0 100644
--- a/src/imports/nativestyle/controls/DefaultGroupBox.qml
+++ b/src/imports/nativestyle/controls/DefaultGroupBox.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.GroupBox {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultProgressBar.qml b/src/imports/nativestyle/controls/DefaultProgressBar.qml
index 45c5d605..646a0ab5 100644
--- a/src/imports/nativestyle/controls/DefaultProgressBar.qml
+++ b/src/imports/nativestyle/controls/DefaultProgressBar.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.NativeStyle as NativeStyle
T.ProgressBar {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultRadioButton.qml b/src/imports/nativestyle/controls/DefaultRadioButton.qml
index e22e2f2f..29746ba7 100644
--- a/src/imports/nativestyle/controls/DefaultRadioButton.qml
+++ b/src/imports/nativestyle/controls/DefaultRadioButton.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.NativeStyle as NativeStyle
T.RadioButton {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultScrollBar.qml b/src/imports/nativestyle/controls/DefaultScrollBar.qml
index ce6255a8..0f42bc80 100644
--- a/src/imports/nativestyle/controls/DefaultScrollBar.qml
+++ b/src/imports/nativestyle/controls/DefaultScrollBar.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.ScrollBar {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultSlider.qml b/src/imports/nativestyle/controls/DefaultSlider.qml
index 040315e0..8648143d 100644
--- a/src/imports/nativestyle/controls/DefaultSlider.qml
+++ b/src/imports/nativestyle/controls/DefaultSlider.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.Slider {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultSpinBox.qml b/src/imports/nativestyle/controls/DefaultSpinBox.qml
index 7a9d1b8e..c959516a 100644
--- a/src/imports/nativestyle/controls/DefaultSpinBox.qml
+++ b/src/imports/nativestyle/controls/DefaultSpinBox.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.SpinBox {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultTextArea.qml b/src/imports/nativestyle/controls/DefaultTextArea.qml
index 9a0c62a6..819e32ad 100644
--- a/src/imports/nativestyle/controls/DefaultTextArea.qml
+++ b/src/imports/nativestyle/controls/DefaultTextArea.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.TextArea {
id: control
diff --git a/src/imports/nativestyle/controls/DefaultTextField.qml b/src/imports/nativestyle/controls/DefaultTextField.qml
index 8df069d8..c2081d61 100644
--- a/src/imports/nativestyle/controls/DefaultTextField.qml
+++ b/src/imports/nativestyle/controls/DefaultTextField.qml
@@ -34,11 +34,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.NativeStyle 6.0 as NativeStyle
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
T.TextField {
id: control
diff --git a/tests/manual/nativestyle/Buttons.qml b/tests/manual/nativestyle/Buttons.qml
index 2a11dea3..d5eb2a9c 100644
--- a/tests/manual/nativestyle/Buttons.qml
+++ b/tests/manual/nativestyle/Buttons.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CheckBoxes.qml b/tests/manual/nativestyle/CheckBoxes.qml
index 6c27adab..c24e9a54 100644
--- a/tests/manual/nativestyle/CheckBoxes.qml
+++ b/tests/manual/nativestyle/CheckBoxes.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/ComboBoxes.qml b/tests/manual/nativestyle/ComboBoxes.qml
index 37c6982c..21dd5b09 100644
--- a/tests/manual/nativestyle/ComboBoxes.qml
+++ b/tests/manual/nativestyle/ComboBoxes.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/ControlContainer.qml b/tests/manual/nativestyle/ControlContainer.qml
index 30022540..f528e994 100644
--- a/tests/manual/nativestyle/ControlContainer.qml
+++ b/tests/manual/nativestyle/ControlContainer.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
Item {
anchors.left: parent.left
diff --git a/tests/manual/nativestyle/CustomButtons.qml b/tests/manual/nativestyle/CustomButtons.qml
index edcdb086..6a01faed 100644
--- a/tests/manual/nativestyle/CustomButtons.qml
+++ b/tests/manual/nativestyle/CustomButtons.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/nativestyle/CustomCheckBoxes.qml
index fcec932f..3bcb05e9 100644
--- a/tests/manual/nativestyle/CustomCheckBoxes.qml
+++ b/tests/manual/nativestyle/CustomCheckBoxes.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.impl
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/nativestyle/CustomComboBoxes.qml
index 58793182..2308509d 100644
--- a/tests/manual/nativestyle/CustomComboBoxes.qml
+++ b/tests/manual/nativestyle/CustomComboBoxes.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
-import QtQuick.Controls.impl 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.impl
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/nativestyle/CustomDials.qml
index e131548d..b9c614c1 100644
--- a/tests/manual/nativestyle/CustomDials.qml
+++ b/tests/manual/nativestyle/CustomDials.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Default.impl 2.12
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Default.impl
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomFrames.qml b/tests/manual/nativestyle/CustomFrames.qml
index 0b74b220..e2b045a5 100644
--- a/tests/manual/nativestyle/CustomFrames.qml
+++ b/tests/manual/nativestyle/CustomFrames.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml
index c6cffa23..c920d243 100644
--- a/tests/manual/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/nativestyle/CustomProgressBars.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
-import QtQuick.Controls.Default.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Default.impl
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomRadioButtons.qml b/tests/manual/nativestyle/CustomRadioButtons.qml
index 9418b689..8a657cdd 100644
--- a/tests/manual/nativestyle/CustomRadioButtons.qml
+++ b/tests/manual/nativestyle/CustomRadioButtons.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.impl
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomScrollBars.qml b/tests/manual/nativestyle/CustomScrollBars.qml
index fcac2eaf..07319952 100644
--- a/tests/manual/nativestyle/CustomScrollBars.qml
+++ b/tests/manual/nativestyle/CustomScrollBars.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomSliders.qml b/tests/manual/nativestyle/CustomSliders.qml
index 38cdf0a2..075c10d3 100644
--- a/tests/manual/nativestyle/CustomSliders.qml
+++ b/tests/manual/nativestyle/CustomSliders.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomSpinBoxes.qml b/tests/manual/nativestyle/CustomSpinBoxes.qml
index b632f311..b6de2b57 100644
--- a/tests/manual/nativestyle/CustomSpinBoxes.qml
+++ b/tests/manual/nativestyle/CustomSpinBoxes.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomTextAreas.qml b/tests/manual/nativestyle/CustomTextAreas.qml
index a729ea10..77e97b0c 100644
--- a/tests/manual/nativestyle/CustomTextAreas.qml
+++ b/tests/manual/nativestyle/CustomTextAreas.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomTextFields.qml b/tests/manual/nativestyle/CustomTextFields.qml
index f781eb19..3e8ccd1e 100644
--- a/tests/manual/nativestyle/CustomTextFields.qml
+++ b/tests/manual/nativestyle/CustomTextFields.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/Dials.qml b/tests/manual/nativestyle/Dials.qml
index 56dff2a4..f0655f25 100644
--- a/tests/manual/nativestyle/Dials.qml
+++ b/tests/manual/nativestyle/Dials.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/Frames.qml b/tests/manual/nativestyle/Frames.qml
index 91cbec6d..220f8d03 100644
--- a/tests/manual/nativestyle/Frames.qml
+++ b/tests/manual/nativestyle/Frames.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/ProgressBars.qml b/tests/manual/nativestyle/ProgressBars.qml
index f19c05bd..8abd076d 100644
--- a/tests/manual/nativestyle/ProgressBars.qml
+++ b/tests/manual/nativestyle/ProgressBars.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/RadioButtons.qml b/tests/manual/nativestyle/RadioButtons.qml
index b9c49e7d..24a96b59 100644
--- a/tests/manual/nativestyle/RadioButtons.qml
+++ b/tests/manual/nativestyle/RadioButtons.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.impl
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/ScrollBars.qml b/tests/manual/nativestyle/ScrollBars.qml
index f7b78f86..a5764c78 100644
--- a/tests/manual/nativestyle/ScrollBars.qml
+++ b/tests/manual/nativestyle/ScrollBars.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/Sliders.qml b/tests/manual/nativestyle/Sliders.qml
index dba0794b..dcc6c79c 100644
--- a/tests/manual/nativestyle/Sliders.qml
+++ b/tests/manual/nativestyle/Sliders.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/SlidersMini.qml b/tests/manual/nativestyle/SlidersMini.qml
index 542719e9..4c7610c4 100644
--- a/tests/manual/nativestyle/SlidersMini.qml
+++ b/tests/manual/nativestyle/SlidersMini.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/SlidersSmall.qml b/tests/manual/nativestyle/SlidersSmall.qml
index bd1f85a6..04c9cb24 100644
--- a/tests/manual/nativestyle/SlidersSmall.qml
+++ b/tests/manual/nativestyle/SlidersSmall.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/SpinBoxes.qml b/tests/manual/nativestyle/SpinBoxes.qml
index 0b66e977..60e2213b 100644
--- a/tests/manual/nativestyle/SpinBoxes.qml
+++ b/tests/manual/nativestyle/SpinBoxes.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/TextAreas.qml b/tests/manual/nativestyle/TextAreas.qml
index f0406146..0e1573b0 100644
--- a/tests/manual/nativestyle/TextAreas.qml
+++ b/tests/manual/nativestyle/TextAreas.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/TextFields.qml b/tests/manual/nativestyle/TextFields.qml
index 75f2b720..10e97da5 100644
--- a/tests/manual/nativestyle/TextFields.qml
+++ b/tests/manual/nativestyle/TextFields.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/main.qml b/tests/manual/nativestyle/main.qml
index 6cf7a646..f0575820 100644
--- a/tests/manual/nativestyle/main.qml
+++ b/tests/manual/nativestyle/main.qml
@@ -34,10 +34,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Window 2.13
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 2.15
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
ApplicationWindow {
visible: true