aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-27 09:14:08 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-28 14:01:35 +0000
commiteff6448667f4b8e9f3ccf871c708be5b66880115 (patch)
treeac4ddff825f5362894d9e5c7b5d9cb990903bd1a
parentd6b60800d4cc70fb24646f8ebe13557420434a8d (diff)
Native style: clean-up imports
Change-Id: Id05edfccb617c72db902f5a7147ed8433be62e7c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/macos/Button.qml1
-rw-r--r--src/imports/controls/macos/CheckBox.qml1
-rw-r--r--src/imports/controls/macos/ComboBox.qml1
-rw-r--r--src/imports/controls/macos/Dial.qml1
-rw-r--r--src/imports/controls/macos/Frame.qml1
-rw-r--r--src/imports/controls/macos/GroupBox.qml1
-rw-r--r--src/imports/controls/macos/ProgressBar.qml1
-rw-r--r--src/imports/controls/macos/RadioButton.qml1
-rw-r--r--src/imports/controls/macos/ScrollBar.qml1
-rw-r--r--src/imports/controls/macos/Slider.qml1
-rw-r--r--src/imports/controls/macos/SpinBox.qml1
-rw-r--r--src/imports/controls/macos/TextArea.qml1
-rw-r--r--src/imports/controls/macos/TextField.qml1
-rw-r--r--src/imports/controls/windows/CheckBox.qml1
-rw-r--r--src/imports/controls/windows/ComboBox.qml1
-rw-r--r--src/imports/controls/windows/Frame.qml1
-rw-r--r--src/imports/controls/windows/GroupBox.qml1
-rw-r--r--src/imports/controls/windows/RadioButton.qml1
-rw-r--r--src/imports/controls/windows/Slider.qml1
-rw-r--r--src/imports/controls/windows/TextArea.qml1
-rw-r--r--src/imports/controls/windows/TextField.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultDial.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultFrame.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultGroupBox.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultProgressBar.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultScrollBar.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultSlider.qml1
-rw-r--r--src/imports/nativestyle/controls/DefaultSpinBox.qml1
-rw-r--r--tests/manual/nativestyle/CheckBoxes.qml1
-rw-r--r--tests/manual/nativestyle/CustomDials.qml2
-rw-r--r--tests/manual/nativestyle/CustomProgressBars.qml2
31 files changed, 2 insertions, 31 deletions
diff --git a/src/imports/controls/macos/Button.qml b/src/imports/controls/macos/Button.qml
index 7db1f9ed..72b74ce0 100644
--- a/src/imports/controls/macos/Button.qml
+++ b/src/imports/controls/macos/Button.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultButton {
diff --git a/src/imports/controls/macos/CheckBox.qml b/src/imports/controls/macos/CheckBox.qml
index 00ab05d6..23b60bbe 100644
--- a/src/imports/controls/macos/CheckBox.qml
+++ b/src/imports/controls/macos/CheckBox.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultCheckBox {
diff --git a/src/imports/controls/macos/ComboBox.qml b/src/imports/controls/macos/ComboBox.qml
index e331c401..0398decc 100644
--- a/src/imports/controls/macos/ComboBox.qml
+++ b/src/imports/controls/macos/ComboBox.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultComboBox {
diff --git a/src/imports/controls/macos/Dial.qml b/src/imports/controls/macos/Dial.qml
index d21bfbed..a811c7ce 100644
--- a/src/imports/controls/macos/Dial.qml
+++ b/src/imports/controls/macos/Dial.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultDial {
diff --git a/src/imports/controls/macos/Frame.qml b/src/imports/controls/macos/Frame.qml
index 024e31a2..eb287d35 100644
--- a/src/imports/controls/macos/Frame.qml
+++ b/src/imports/controls/macos/Frame.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultFrame {
diff --git a/src/imports/controls/macos/GroupBox.qml b/src/imports/controls/macos/GroupBox.qml
index 45911ba1..5bc64a43 100644
--- a/src/imports/controls/macos/GroupBox.qml
+++ b/src/imports/controls/macos/GroupBox.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultGroupBox {
diff --git a/src/imports/controls/macos/ProgressBar.qml b/src/imports/controls/macos/ProgressBar.qml
index 6c4c9c22..a6ce2506 100644
--- a/src/imports/controls/macos/ProgressBar.qml
+++ b/src/imports/controls/macos/ProgressBar.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/controls/macos/RadioButton.qml b/src/imports/controls/macos/RadioButton.qml
index 6f1bdb04..1f24b240 100644
--- a/src/imports/controls/macos/RadioButton.qml
+++ b/src/imports/controls/macos/RadioButton.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultRadioButton {
diff --git a/src/imports/controls/macos/ScrollBar.qml b/src/imports/controls/macos/ScrollBar.qml
index 8facff8e..de8acf48 100644
--- a/src/imports/controls/macos/ScrollBar.qml
+++ b/src/imports/controls/macos/ScrollBar.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultScrollBar {
diff --git a/src/imports/controls/macos/Slider.qml b/src/imports/controls/macos/Slider.qml
index 3aed431f..a1381591 100644
--- a/src/imports/controls/macos/Slider.qml
+++ b/src/imports/controls/macos/Slider.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultSlider {
diff --git a/src/imports/controls/macos/SpinBox.qml b/src/imports/controls/macos/SpinBox.qml
index 57b7669d..039f267c 100644
--- a/src/imports/controls/macos/SpinBox.qml
+++ b/src/imports/controls/macos/SpinBox.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/controls/macos/TextArea.qml b/src/imports/controls/macos/TextArea.qml
index 6845c13e..e27f2d06 100644
--- a/src/imports/controls/macos/TextArea.qml
+++ b/src/imports/controls/macos/TextArea.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultTextArea {
diff --git a/src/imports/controls/macos/TextField.qml b/src/imports/controls/macos/TextField.qml
index 5728689b..a35b7f8e 100644
--- a/src/imports/controls/macos/TextField.qml
+++ b/src/imports/controls/macos/TextField.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultTextField {
diff --git a/src/imports/controls/windows/CheckBox.qml b/src/imports/controls/windows/CheckBox.qml
index 00ab05d6..23b60bbe 100644
--- a/src/imports/controls/windows/CheckBox.qml
+++ b/src/imports/controls/windows/CheckBox.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultCheckBox {
diff --git a/src/imports/controls/windows/ComboBox.qml b/src/imports/controls/windows/ComboBox.qml
index e331c401..0398decc 100644
--- a/src/imports/controls/windows/ComboBox.qml
+++ b/src/imports/controls/windows/ComboBox.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultComboBox {
diff --git a/src/imports/controls/windows/Frame.qml b/src/imports/controls/windows/Frame.qml
index 024e31a2..eb287d35 100644
--- a/src/imports/controls/windows/Frame.qml
+++ b/src/imports/controls/windows/Frame.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultFrame {
diff --git a/src/imports/controls/windows/GroupBox.qml b/src/imports/controls/windows/GroupBox.qml
index 45911ba1..5bc64a43 100644
--- a/src/imports/controls/windows/GroupBox.qml
+++ b/src/imports/controls/windows/GroupBox.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultGroupBox {
diff --git a/src/imports/controls/windows/RadioButton.qml b/src/imports/controls/windows/RadioButton.qml
index 6f1bdb04..1f24b240 100644
--- a/src/imports/controls/windows/RadioButton.qml
+++ b/src/imports/controls/windows/RadioButton.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultRadioButton {
diff --git a/src/imports/controls/windows/Slider.qml b/src/imports/controls/windows/Slider.qml
index 3aed431f..a1381591 100644
--- a/src/imports/controls/windows/Slider.qml
+++ b/src/imports/controls/windows/Slider.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultSlider {
diff --git a/src/imports/controls/windows/TextArea.qml b/src/imports/controls/windows/TextArea.qml
index 6845c13e..e27f2d06 100644
--- a/src/imports/controls/windows/TextArea.qml
+++ b/src/imports/controls/windows/TextArea.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultTextArea {
diff --git a/src/imports/controls/windows/TextField.qml b/src/imports/controls/windows/TextField.qml
index 5728689b..a35b7f8e 100644
--- a/src/imports/controls/windows/TextField.qml
+++ b/src/imports/controls/windows/TextField.qml
@@ -36,7 +36,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
import QtQuick.NativeStyle 6.0 as NativeStyle
NativeStyle.DefaultTextField {
diff --git a/src/imports/nativestyle/controls/DefaultDial.qml b/src/imports/nativestyle/controls/DefaultDial.qml
index d4fc3b98..c9f6104a 100644
--- a/src/imports/nativestyle/controls/DefaultDial.qml
+++ b/src/imports/nativestyle/controls/DefaultDial.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/nativestyle/controls/DefaultFrame.qml b/src/imports/nativestyle/controls/DefaultFrame.qml
index 3dffd4d1..2c6a5039 100644
--- a/src/imports/nativestyle/controls/DefaultFrame.qml
+++ b/src/imports/nativestyle/controls/DefaultFrame.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/nativestyle/controls/DefaultGroupBox.qml b/src/imports/nativestyle/controls/DefaultGroupBox.qml
index 0d29fd7d..04bdeeed 100644
--- a/src/imports/nativestyle/controls/DefaultGroupBox.qml
+++ b/src/imports/nativestyle/controls/DefaultGroupBox.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/nativestyle/controls/DefaultProgressBar.qml b/src/imports/nativestyle/controls/DefaultProgressBar.qml
index e86f9410..45c5d605 100644
--- a/src/imports/nativestyle/controls/DefaultProgressBar.qml
+++ b/src/imports/nativestyle/controls/DefaultProgressBar.qml
@@ -37,7 +37,6 @@
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
T.ProgressBar {
diff --git a/src/imports/nativestyle/controls/DefaultScrollBar.qml b/src/imports/nativestyle/controls/DefaultScrollBar.qml
index a73383de..ce6255a8 100644
--- a/src/imports/nativestyle/controls/DefaultScrollBar.qml
+++ b/src/imports/nativestyle/controls/DefaultScrollBar.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/nativestyle/controls/DefaultSlider.qml b/src/imports/nativestyle/controls/DefaultSlider.qml
index 00069137..040315e0 100644
--- a/src/imports/nativestyle/controls/DefaultSlider.qml
+++ b/src/imports/nativestyle/controls/DefaultSlider.qml
@@ -36,7 +36,6 @@
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
diff --git a/src/imports/nativestyle/controls/DefaultSpinBox.qml b/src/imports/nativestyle/controls/DefaultSpinBox.qml
index 11cf345d..7a9d1b8e 100644
--- a/src/imports/nativestyle/controls/DefaultSpinBox.qml
+++ b/src/imports/nativestyle/controls/DefaultSpinBox.qml
@@ -36,7 +36,6 @@
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
diff --git a/tests/manual/nativestyle/CheckBoxes.qml b/tests/manual/nativestyle/CheckBoxes.qml
index 50b81ec4..6c27adab 100644
--- a/tests/manual/nativestyle/CheckBoxes.qml
+++ b/tests/manual/nativestyle/CheckBoxes.qml
@@ -37,7 +37,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 2.15
-import QtQuick.Controls.impl 2.12
ControlContainer {
id: container
diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/nativestyle/CustomDials.qml
index c1a0ac4e..e131548d 100644
--- a/tests/manual/nativestyle/CustomDials.qml
+++ b/tests/manual/nativestyle/CustomDials.qml
@@ -36,7 +36,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
-import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Default.impl 2.12
import QtQuick.Layouts 2.15
ControlContainer {
diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml
index 93932a5e..c6cffa23 100644
--- a/tests/manual/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/nativestyle/CustomProgressBars.qml
@@ -37,7 +37,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 2.15
-import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Default.impl 2.12
ControlContainer {
id: container