diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-16 12:14:23 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-24 13:48:57 +0200 |
commit | 526729cb8a53972b6925cbfd7a5f5cbf124be71c (patch) | |
tree | c2e90c6e6ba9ff8a198ea2a8f1c76b29773bf1dc /src/imports/controls/basic | |
parent | 9219e86aa571d8b2f5da1ec92a461e5add38f57c (diff) |
Remove QtQuick.Controls imports from styles' QML files
This is necessary to support compile-time style selection. If we don't
do this, QtQuickControls2Plugin (which is now only used for run-time
style selection) will be loaded unnecessarily.
Task-number: QTBUG-86284
Change-Id: Id5338f147e3e97f25574ec98377d26b111f8341a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/imports/controls/basic')
49 files changed, 0 insertions, 49 deletions
diff --git a/src/imports/controls/basic/ApplicationWindow.qml b/src/imports/controls/basic/ApplicationWindow.qml index b383139b..b6f9cf65 100644 --- a/src/imports/controls/basic/ApplicationWindow.qml +++ b/src/imports/controls/basic/ApplicationWindow.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Window -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/BusyIndicator.qml b/src/imports/controls/basic/BusyIndicator.qml index 1dc2b5bd..0c51c9a2 100644 --- a/src/imports/controls/basic/BusyIndicator.qml +++ b/src/imports/controls/basic/BusyIndicator.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.Basic.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Button.qml b/src/imports/controls/basic/Button.qml index 06d4e93f..f657a0d2 100644 --- a/src/imports/controls/basic/Button.qml +++ b/src/imports/controls/basic/Button.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/CheckBox.qml b/src/imports/controls/basic/CheckBox.qml index 7d29ff34..6465460d 100644 --- a/src/imports/controls/basic/CheckBox.qml +++ b/src/imports/controls/basic/CheckBox.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.CheckBox { diff --git a/src/imports/controls/basic/CheckDelegate.qml b/src/imports/controls/basic/CheckDelegate.qml index 25eb3c06..1a1827e3 100644 --- a/src/imports/controls/basic/CheckDelegate.qml +++ b/src/imports/controls/basic/CheckDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.CheckDelegate { diff --git a/src/imports/controls/basic/ComboBox.qml b/src/imports/controls/basic/ComboBox.qml index 935befd3..22df1d30 100644 --- a/src/imports/controls/basic/ComboBox.qml +++ b/src/imports/controls/basic/ComboBox.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Window -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/DelayButton.qml b/src/imports/controls/basic/DelayButton.qml index 3dbed315..367384c0 100644 --- a/src/imports/controls/basic/DelayButton.qml +++ b/src/imports/controls/basic/DelayButton.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Dial.qml b/src/imports/controls/basic/Dial.qml index 979d3644..8450e9f9 100644 --- a/src/imports/controls/basic/Dial.qml +++ b/src/imports/controls/basic/Dial.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Basic.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Dialog.qml b/src/imports/controls/basic/Dialog.qml index 254a6dcb..1f2b4fbb 100644 --- a/src/imports/controls/basic/Dialog.qml +++ b/src/imports/controls/basic/Dialog.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.Dialog { diff --git a/src/imports/controls/basic/Drawer.qml b/src/imports/controls/basic/Drawer.qml index 719e5e1c..0d286f99 100644 --- a/src/imports/controls/basic/Drawer.qml +++ b/src/imports/controls/basic/Drawer.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Frame.qml b/src/imports/controls/basic/Frame.qml index 9696b5c9..22f29806 100644 --- a/src/imports/controls/basic/Frame.qml +++ b/src/imports/controls/basic/Frame.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/GroupBox.qml b/src/imports/controls/basic/GroupBox.qml index d6244113..27ff8ce6 100644 --- a/src/imports/controls/basic/GroupBox.qml +++ b/src/imports/controls/basic/GroupBox.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/HorizontalHeaderView.qml b/src/imports/controls/basic/HorizontalHeaderView.qml index 093c868b..e5214593 100644 --- a/src/imports/controls/basic/HorizontalHeaderView.qml +++ b/src/imports/controls/basic/HorizontalHeaderView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T T.HorizontalHeaderView { diff --git a/src/imports/controls/basic/ItemDelegate.qml b/src/imports/controls/basic/ItemDelegate.qml index 1183eb2b..3a1cb298 100644 --- a/src/imports/controls/basic/ItemDelegate.qml +++ b/src/imports/controls/basic/ItemDelegate.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Label.qml b/src/imports/controls/basic/Label.qml index 6d0aca41..9d7dfdfd 100644 --- a/src/imports/controls/basic/Label.qml +++ b/src/imports/controls/basic/Label.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Menu.qml b/src/imports/controls/basic/Menu.qml index 91384e4f..e138a755 100644 --- a/src/imports/controls/basic/Menu.qml +++ b/src/imports/controls/basic/Menu.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T import QtQuick.Window diff --git a/src/imports/controls/basic/MenuBar.qml b/src/imports/controls/basic/MenuBar.qml index 9745a52d..79199d12 100644 --- a/src/imports/controls/basic/MenuBar.qml +++ b/src/imports/controls/basic/MenuBar.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.MenuBar { diff --git a/src/imports/controls/basic/MenuBarItem.qml b/src/imports/controls/basic/MenuBarItem.qml index b2771a3c..e7fd1c0b 100644 --- a/src/imports/controls/basic/MenuBarItem.qml +++ b/src/imports/controls/basic/MenuBarItem.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.MenuBarItem { diff --git a/src/imports/controls/basic/MenuItem.qml b/src/imports/controls/basic/MenuItem.qml index 143e4df3..ab1f12f5 100644 --- a/src/imports/controls/basic/MenuItem.qml +++ b/src/imports/controls/basic/MenuItem.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/MenuSeparator.qml b/src/imports/controls/basic/MenuSeparator.qml index d503aecd..bc17dc39 100644 --- a/src/imports/controls/basic/MenuSeparator.qml +++ b/src/imports/controls/basic/MenuSeparator.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Page.qml b/src/imports/controls/basic/Page.qml index 2fec37f0..ff75ee4e 100644 --- a/src/imports/controls/basic/Page.qml +++ b/src/imports/controls/basic/Page.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/PageIndicator.qml b/src/imports/controls/basic/PageIndicator.qml index 3942f54f..bd5ef290 100644 --- a/src/imports/controls/basic/PageIndicator.qml +++ b/src/imports/controls/basic/PageIndicator.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Pane.qml b/src/imports/controls/basic/Pane.qml index 221819d4..181db9e4 100644 --- a/src/imports/controls/basic/Pane.qml +++ b/src/imports/controls/basic/Pane.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Popup.qml b/src/imports/controls/basic/Popup.qml index 71372107..720483d9 100644 --- a/src/imports/controls/basic/Popup.qml +++ b/src/imports/controls/basic/Popup.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ProgressBar.qml b/src/imports/controls/basic/ProgressBar.qml index d8a1453c..a49538d1 100644 --- a/src/imports/controls/basic/ProgressBar.qml +++ b/src/imports/controls/basic/ProgressBar.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.Basic.impl T.ProgressBar { diff --git a/src/imports/controls/basic/RadioButton.qml b/src/imports/controls/basic/RadioButton.qml index 02b2f627..adb91435 100644 --- a/src/imports/controls/basic/RadioButton.qml +++ b/src/imports/controls/basic/RadioButton.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/RadioDelegate.qml b/src/imports/controls/basic/RadioDelegate.qml index dc998363..69be290c 100644 --- a/src/imports/controls/basic/RadioDelegate.qml +++ b/src/imports/controls/basic/RadioDelegate.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/RangeSlider.qml b/src/imports/controls/basic/RangeSlider.qml index 1132a78b..e47cbd52 100644 --- a/src/imports/controls/basic/RangeSlider.qml +++ b/src/imports/controls/basic/RangeSlider.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/RoundButton.qml b/src/imports/controls/basic/RoundButton.qml index 9445ecdf..6ab810fd 100644 --- a/src/imports/controls/basic/RoundButton.qml +++ b/src/imports/controls/basic/RoundButton.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ScrollBar.qml b/src/imports/controls/basic/ScrollBar.qml index 1652ea81..763f96bb 100644 --- a/src/imports/controls/basic/ScrollBar.qml +++ b/src/imports/controls/basic/ScrollBar.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ScrollIndicator.qml b/src/imports/controls/basic/ScrollIndicator.qml index 4f3ece0c..dcb23d65 100644 --- a/src/imports/controls/basic/ScrollIndicator.qml +++ b/src/imports/controls/basic/ScrollIndicator.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ScrollView.qml b/src/imports/controls/basic/ScrollView.qml index 76094c6c..43c4e428 100644 --- a/src/imports/controls/basic/ScrollView.qml +++ b/src/imports/controls/basic/ScrollView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Slider.qml b/src/imports/controls/basic/Slider.qml index cdd72b76..425f4975 100644 --- a/src/imports/controls/basic/Slider.qml +++ b/src/imports/controls/basic/Slider.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/SpinBox.qml b/src/imports/controls/basic/SpinBox.qml index 46eca36e..772cc583 100644 --- a/src/imports/controls/basic/SpinBox.qml +++ b/src/imports/controls/basic/SpinBox.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/SplitView.qml b/src/imports/controls/basic/SplitView.qml index 020d07ea..66d24743 100644 --- a/src/imports/controls/basic/SplitView.qml +++ b/src/imports/controls/basic/SplitView.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.SplitView { diff --git a/src/imports/controls/basic/StackView.qml b/src/imports/controls/basic/StackView.qml index 3b388e46..cbf13f36 100644 --- a/src/imports/controls/basic/StackView.qml +++ b/src/imports/controls/basic/StackView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T T.StackView { diff --git a/src/imports/controls/basic/SwipeDelegate.qml b/src/imports/controls/basic/SwipeDelegate.qml index ff56f6f0..f8209a1e 100644 --- a/src/imports/controls/basic/SwipeDelegate.qml +++ b/src/imports/controls/basic/SwipeDelegate.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/SwipeView.qml b/src/imports/controls/basic/SwipeView.qml index 7fb8d449..6ce4ee6c 100644 --- a/src/imports/controls/basic/SwipeView.qml +++ b/src/imports/controls/basic/SwipeView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T T.SwipeView { diff --git a/src/imports/controls/basic/Switch.qml b/src/imports/controls/basic/Switch.qml index 12420bed..0d919f9e 100644 --- a/src/imports/controls/basic/Switch.qml +++ b/src/imports/controls/basic/Switch.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.Switch { diff --git a/src/imports/controls/basic/SwitchDelegate.qml b/src/imports/controls/basic/SwitchDelegate.qml index e2a9f7b5..8203e107 100644 --- a/src/imports/controls/basic/SwitchDelegate.qml +++ b/src/imports/controls/basic/SwitchDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl T.SwitchDelegate { diff --git a/src/imports/controls/basic/TabButton.qml b/src/imports/controls/basic/TabButton.qml index 0935d463..5e38f69c 100644 --- a/src/imports/controls/basic/TabButton.qml +++ b/src/imports/controls/basic/TabButton.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/TextArea.qml b/src/imports/controls/basic/TextArea.qml index e6a1509e..fa6112f6 100644 --- a/src/imports/controls/basic/TextArea.qml +++ b/src/imports/controls/basic/TextArea.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/TextField.qml b/src/imports/controls/basic/TextField.qml index 2c69d351..9c66e4ba 100644 --- a/src/imports/controls/basic/TextField.qml +++ b/src/imports/controls/basic/TextField.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ToolBar.qml b/src/imports/controls/basic/ToolBar.qml index 6f5e54e6..1d21c51d 100644 --- a/src/imports/controls/basic/ToolBar.qml +++ b/src/imports/controls/basic/ToolBar.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ToolButton.qml b/src/imports/controls/basic/ToolButton.qml index 63b40233..8a4f8097 100644 --- a/src/imports/controls/basic/ToolButton.qml +++ b/src/imports/controls/basic/ToolButton.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ToolSeparator.qml b/src/imports/controls/basic/ToolSeparator.qml index e6d6a7f7..774e41ec 100644 --- a/src/imports/controls/basic/ToolSeparator.qml +++ b/src/imports/controls/basic/ToolSeparator.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/ToolTip.qml b/src/imports/controls/basic/ToolTip.qml index 933b7400..9d10f7fa 100644 --- a/src/imports/controls/basic/ToolTip.qml +++ b/src/imports/controls/basic/ToolTip.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/Tumbler.qml b/src/imports/controls/basic/Tumbler.qml index 89f7f056..a69df1f3 100644 --- a/src/imports/controls/basic/Tumbler.qml +++ b/src/imports/controls/basic/Tumbler.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T diff --git a/src/imports/controls/basic/VerticalHeaderView.qml b/src/imports/controls/basic/VerticalHeaderView.qml index 21e39c39..7c057e01 100644 --- a/src/imports/controls/basic/VerticalHeaderView.qml +++ b/src/imports/controls/basic/VerticalHeaderView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T T.VerticalHeaderView { |