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/material | |
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/material')
23 files changed, 0 insertions, 23 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 9bda0128..352eebec 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index e5ea5716..ea42d666 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 7abb8ddd..0f2a6a88 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Window -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T import QtQuick.Controls.Material diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml index 68773b04..d35df35c 100644 --- a/src/imports/controls/material/DelayButton.qml +++ b/src/imports/controls/material/DelayButton.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 0a711eec..1cb7f8c1 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/Dialog.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index fda957b1..e32fa812 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/HorizontalHeaderView.qml b/src/imports/controls/material/HorizontalHeaderView.qml index f6c76c4a..d2608c76 100644 --- a/src/imports/controls/material/HorizontalHeaderView.qml +++ b/src/imports/controls/material/HorizontalHeaderView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index f8cf41df..7d06b05b 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 8e362964..b7e80c92 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/MenuBar.qml b/src/imports/controls/material/MenuBar.qml index 621cfbd5..a0c3bd3f 100644 --- a/src/imports/controls/material/MenuBar.qml +++ b/src/imports/controls/material/MenuBar.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/imports/controls/material/MenuBarItem.qml index 957ee867..f1d4e87d 100644 --- a/src/imports/controls/material/MenuBarItem.qml +++ b/src/imports/controls/material/MenuBarItem.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 522efd4d..fab2de26 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index f9737fa5..334e570b 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index 79f4a249..f93f2425 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/RoundButton.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/SplitView.qml b/src/imports/controls/material/SplitView.qml index e6e3ed3b..95556cd0 100644 --- a/src/imports/controls/material/SplitView.qml +++ b/src/imports/controls/material/SplitView.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index 16ef8ea2..c7aff94a 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index dd1c4e8d..fd7b7ab0 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index eacc95b8..bae0cdb8 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index b1529437..a213bd7a 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 2c123c91..8623ddf5 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index dc27157f..be7ae332 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -36,7 +36,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Controls.Material import QtQuick.Controls.Material.impl diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 81e35044..2c1e5d66 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Controls.impl import QtQuick.Templates as T import QtQuick.Controls.Material diff --git a/src/imports/controls/material/VerticalHeaderView.qml b/src/imports/controls/material/VerticalHeaderView.qml index 1a38b30a..9769627e 100644 --- a/src/imports/controls/material/VerticalHeaderView.qml +++ b/src/imports/controls/material/VerticalHeaderView.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls import QtQuick.Templates as T import QtQuick.Controls.Material import QtQuick.Controls.Material.impl |