From d451cab0c8b727fa7f12a169a3d6ee449a3a1902 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 26 Mar 2020 17:01:51 +0100 Subject: Remove all version numbers from QML imports As of Qt 6, the latest version will be used by default. This saves us a lot of effort in terms of version bumps. Task-number: QTBUG-82922 Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928 Reviewed-by: Fabian Kosmale --- tests/auto/customization/data/styles/identified/AbstractButton.qml | 4 ++-- .../auto/customization/data/styles/identified/ApplicationWindow.qml | 4 ++-- tests/auto/customization/data/styles/identified/BusyIndicator.qml | 4 ++-- tests/auto/customization/data/styles/identified/Button.qml | 4 ++-- tests/auto/customization/data/styles/identified/CheckBox.qml | 4 ++-- tests/auto/customization/data/styles/identified/CheckDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/ComboBox.qml | 6 +++--- tests/auto/customization/data/styles/identified/Container.qml | 4 ++-- tests/auto/customization/data/styles/identified/Control.qml | 4 ++-- tests/auto/customization/data/styles/identified/DelayButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/Dial.qml | 4 ++-- tests/auto/customization/data/styles/identified/Dialog.qml | 4 ++-- tests/auto/customization/data/styles/identified/DialogButtonBox.qml | 4 ++-- tests/auto/customization/data/styles/identified/Drawer.qml | 4 ++-- tests/auto/customization/data/styles/identified/Frame.qml | 4 ++-- tests/auto/customization/data/styles/identified/GroupBox.qml | 4 ++-- tests/auto/customization/data/styles/identified/ItemDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/Label.qml | 4 ++-- tests/auto/customization/data/styles/identified/Menu.qml | 4 ++-- tests/auto/customization/data/styles/identified/MenuBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/MenuBarItem.qml | 4 ++-- tests/auto/customization/data/styles/identified/MenuItem.qml | 4 ++-- tests/auto/customization/data/styles/identified/MenuSeparator.qml | 4 ++-- tests/auto/customization/data/styles/identified/Page.qml | 4 ++-- tests/auto/customization/data/styles/identified/PageIndicator.qml | 4 ++-- tests/auto/customization/data/styles/identified/Pane.qml | 4 ++-- tests/auto/customization/data/styles/identified/Popup.qml | 4 ++-- tests/auto/customization/data/styles/identified/ProgressBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/RadioButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/RadioDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/RangeSlider.qml | 4 ++-- tests/auto/customization/data/styles/identified/RoundButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/ScrollBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/ScrollIndicator.qml | 4 ++-- tests/auto/customization/data/styles/identified/ScrollView.qml | 4 ++-- tests/auto/customization/data/styles/identified/Slider.qml | 4 ++-- tests/auto/customization/data/styles/identified/SpinBox.qml | 4 ++-- tests/auto/customization/data/styles/identified/StackView.qml | 4 ++-- tests/auto/customization/data/styles/identified/SwipeDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/SwipeView.qml | 4 ++-- tests/auto/customization/data/styles/identified/Switch.qml | 4 ++-- tests/auto/customization/data/styles/identified/SwitchDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/TabBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/TabButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/TextArea.qml | 4 ++-- tests/auto/customization/data/styles/identified/TextField.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolSeparator.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolTip.qml | 4 ++-- tests/auto/customization/data/styles/identified/Tumbler.qml | 4 ++-- 51 files changed, 103 insertions(+), 103 deletions(-) (limited to 'tests/auto/customization/data/styles/identified') diff --git a/tests/auto/customization/data/styles/identified/AbstractButton.qml b/tests/auto/customization/data/styles/identified/AbstractButton.qml index cd2b5bdc..1c5bd318 100644 --- a/tests/auto/customization/data/styles/identified/AbstractButton.qml +++ b/tests/auto/customization/data/styles/identified/AbstractButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.AbstractButton { id: control diff --git a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml b/tests/auto/customization/data/styles/identified/ApplicationWindow.qml index b77eebfc..dc3f0db1 100644 --- a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/identified/ApplicationWindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ApplicationWindow { id: control diff --git a/tests/auto/customization/data/styles/identified/BusyIndicator.qml b/tests/auto/customization/data/styles/identified/BusyIndicator.qml index dc4c14b7..2deab679 100644 --- a/tests/auto/customization/data/styles/identified/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/identified/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.BusyIndicator { id: control diff --git a/tests/auto/customization/data/styles/identified/Button.qml b/tests/auto/customization/data/styles/identified/Button.qml index dca3b9d0..dc805080 100644 --- a/tests/auto/customization/data/styles/identified/Button.qml +++ b/tests/auto/customization/data/styles/identified/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Button { id: control diff --git a/tests/auto/customization/data/styles/identified/CheckBox.qml b/tests/auto/customization/data/styles/identified/CheckBox.qml index 8f1f9b25..13f98af9 100644 --- a/tests/auto/customization/data/styles/identified/CheckBox.qml +++ b/tests/auto/customization/data/styles/identified/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.CheckBox { id: control diff --git a/tests/auto/customization/data/styles/identified/CheckDelegate.qml b/tests/auto/customization/data/styles/identified/CheckDelegate.qml index cfba67d3..b0d8a8d2 100644 --- a/tests/auto/customization/data/styles/identified/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/identified/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.CheckDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/ComboBox.qml b/tests/auto/customization/data/styles/identified/ComboBox.qml index 873d1c2a..ff117ce8 100644 --- a/tests/auto/customization/data/styles/identified/ComboBox.qml +++ b/tests/auto/customization/data/styles/identified/ComboBox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T +import QtQuick.Templates as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/identified/Container.qml b/tests/auto/customization/data/styles/identified/Container.qml index 8170e937..a282528d 100644 --- a/tests/auto/customization/data/styles/identified/Container.qml +++ b/tests/auto/customization/data/styles/identified/Container.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Container { id: control diff --git a/tests/auto/customization/data/styles/identified/Control.qml b/tests/auto/customization/data/styles/identified/Control.qml index 0eb28c21..90229e47 100644 --- a/tests/auto/customization/data/styles/identified/Control.qml +++ b/tests/auto/customization/data/styles/identified/Control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Control { id: control diff --git a/tests/auto/customization/data/styles/identified/DelayButton.qml b/tests/auto/customization/data/styles/identified/DelayButton.qml index fc7f67c9..90f980ea 100644 --- a/tests/auto/customization/data/styles/identified/DelayButton.qml +++ b/tests/auto/customization/data/styles/identified/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.DelayButton { id: control diff --git a/tests/auto/customization/data/styles/identified/Dial.qml b/tests/auto/customization/data/styles/identified/Dial.qml index 423c64e2..9260972c 100644 --- a/tests/auto/customization/data/styles/identified/Dial.qml +++ b/tests/auto/customization/data/styles/identified/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Dial { id: control diff --git a/tests/auto/customization/data/styles/identified/Dialog.qml b/tests/auto/customization/data/styles/identified/Dialog.qml index 58d0120e..6392be7d 100644 --- a/tests/auto/customization/data/styles/identified/Dialog.qml +++ b/tests/auto/customization/data/styles/identified/Dialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Dialog { id: control diff --git a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml b/tests/auto/customization/data/styles/identified/DialogButtonBox.qml index 0bf56268..11c596a1 100644 --- a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/identified/DialogButtonBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.DialogButtonBox { id: control diff --git a/tests/auto/customization/data/styles/identified/Drawer.qml b/tests/auto/customization/data/styles/identified/Drawer.qml index 82d09bd4..6b340f2a 100644 --- a/tests/auto/customization/data/styles/identified/Drawer.qml +++ b/tests/auto/customization/data/styles/identified/Drawer.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Drawer { id: control diff --git a/tests/auto/customization/data/styles/identified/Frame.qml b/tests/auto/customization/data/styles/identified/Frame.qml index e84e18b1..830ac584 100644 --- a/tests/auto/customization/data/styles/identified/Frame.qml +++ b/tests/auto/customization/data/styles/identified/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Frame { id: control diff --git a/tests/auto/customization/data/styles/identified/GroupBox.qml b/tests/auto/customization/data/styles/identified/GroupBox.qml index ed56f89b..fffd44e8 100644 --- a/tests/auto/customization/data/styles/identified/GroupBox.qml +++ b/tests/auto/customization/data/styles/identified/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.GroupBox { id: control diff --git a/tests/auto/customization/data/styles/identified/ItemDelegate.qml b/tests/auto/customization/data/styles/identified/ItemDelegate.qml index 92801c53..b04d2f59 100644 --- a/tests/auto/customization/data/styles/identified/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/identified/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ItemDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/Label.qml b/tests/auto/customization/data/styles/identified/Label.qml index d19da135..95d1f191 100644 --- a/tests/auto/customization/data/styles/identified/Label.qml +++ b/tests/auto/customization/data/styles/identified/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Label { id: control diff --git a/tests/auto/customization/data/styles/identified/Menu.qml b/tests/auto/customization/data/styles/identified/Menu.qml index 5a9ac617..66239254 100644 --- a/tests/auto/customization/data/styles/identified/Menu.qml +++ b/tests/auto/customization/data/styles/identified/Menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Menu { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuBar.qml b/tests/auto/customization/data/styles/identified/MenuBar.qml index d846e3c9..f815b73f 100644 --- a/tests/auto/customization/data/styles/identified/MenuBar.qml +++ b/tests/auto/customization/data/styles/identified/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.MenuBar { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuBarItem.qml b/tests/auto/customization/data/styles/identified/MenuBarItem.qml index 94fdef89..abf3be5d 100644 --- a/tests/auto/customization/data/styles/identified/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/identified/MenuBarItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.MenuBarItem { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuItem.qml b/tests/auto/customization/data/styles/identified/MenuItem.qml index 34f12cca..3a174ecf 100644 --- a/tests/auto/customization/data/styles/identified/MenuItem.qml +++ b/tests/auto/customization/data/styles/identified/MenuItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.MenuItem { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuSeparator.qml b/tests/auto/customization/data/styles/identified/MenuSeparator.qml index 14154e2f..7ecb176b 100644 --- a/tests/auto/customization/data/styles/identified/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/identified/MenuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.MenuSeparator { id: control diff --git a/tests/auto/customization/data/styles/identified/Page.qml b/tests/auto/customization/data/styles/identified/Page.qml index 945f2ac7..b2416247 100644 --- a/tests/auto/customization/data/styles/identified/Page.qml +++ b/tests/auto/customization/data/styles/identified/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Page { id: control diff --git a/tests/auto/customization/data/styles/identified/PageIndicator.qml b/tests/auto/customization/data/styles/identified/PageIndicator.qml index ef0ab44f..2370a334 100644 --- a/tests/auto/customization/data/styles/identified/PageIndicator.qml +++ b/tests/auto/customization/data/styles/identified/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.PageIndicator { id: control diff --git a/tests/auto/customization/data/styles/identified/Pane.qml b/tests/auto/customization/data/styles/identified/Pane.qml index 849c7907..0dbf4b1c 100644 --- a/tests/auto/customization/data/styles/identified/Pane.qml +++ b/tests/auto/customization/data/styles/identified/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Pane { id: control diff --git a/tests/auto/customization/data/styles/identified/Popup.qml b/tests/auto/customization/data/styles/identified/Popup.qml index 65de416c..b6381170 100644 --- a/tests/auto/customization/data/styles/identified/Popup.qml +++ b/tests/auto/customization/data/styles/identified/Popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Popup { id: control diff --git a/tests/auto/customization/data/styles/identified/ProgressBar.qml b/tests/auto/customization/data/styles/identified/ProgressBar.qml index 24888624..dc7d7658 100644 --- a/tests/auto/customization/data/styles/identified/ProgressBar.qml +++ b/tests/auto/customization/data/styles/identified/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ProgressBar { id: control diff --git a/tests/auto/customization/data/styles/identified/RadioButton.qml b/tests/auto/customization/data/styles/identified/RadioButton.qml index 3a0c4e44..2b4a0b62 100644 --- a/tests/auto/customization/data/styles/identified/RadioButton.qml +++ b/tests/auto/customization/data/styles/identified/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.RadioButton { id: control diff --git a/tests/auto/customization/data/styles/identified/RadioDelegate.qml b/tests/auto/customization/data/styles/identified/RadioDelegate.qml index 3eda2408..75cda63d 100644 --- a/tests/auto/customization/data/styles/identified/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/identified/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.RadioDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/RangeSlider.qml b/tests/auto/customization/data/styles/identified/RangeSlider.qml index 18118dbe..fab56fcd 100644 --- a/tests/auto/customization/data/styles/identified/RangeSlider.qml +++ b/tests/auto/customization/data/styles/identified/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.RangeSlider { id: control diff --git a/tests/auto/customization/data/styles/identified/RoundButton.qml b/tests/auto/customization/data/styles/identified/RoundButton.qml index fc6bc95a..ec075db3 100644 --- a/tests/auto/customization/data/styles/identified/RoundButton.qml +++ b/tests/auto/customization/data/styles/identified/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.RoundButton { id: control diff --git a/tests/auto/customization/data/styles/identified/ScrollBar.qml b/tests/auto/customization/data/styles/identified/ScrollBar.qml index f9a4445d..418f2908 100644 --- a/tests/auto/customization/data/styles/identified/ScrollBar.qml +++ b/tests/auto/customization/data/styles/identified/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ScrollBar { id: control diff --git a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml b/tests/auto/customization/data/styles/identified/ScrollIndicator.qml index 0f15aa2d..b427b757 100644 --- a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/identified/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ScrollIndicator { id: control diff --git a/tests/auto/customization/data/styles/identified/ScrollView.qml b/tests/auto/customization/data/styles/identified/ScrollView.qml index 0855a5af..7f4e2c40 100644 --- a/tests/auto/customization/data/styles/identified/ScrollView.qml +++ b/tests/auto/customization/data/styles/identified/ScrollView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ScrollView { id: control diff --git a/tests/auto/customization/data/styles/identified/Slider.qml b/tests/auto/customization/data/styles/identified/Slider.qml index 23afb67e..88c5b22f 100644 --- a/tests/auto/customization/data/styles/identified/Slider.qml +++ b/tests/auto/customization/data/styles/identified/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Slider { id: control diff --git a/tests/auto/customization/data/styles/identified/SpinBox.qml b/tests/auto/customization/data/styles/identified/SpinBox.qml index 7871c975..0c058269 100644 --- a/tests/auto/customization/data/styles/identified/SpinBox.qml +++ b/tests/auto/customization/data/styles/identified/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.SpinBox { id: control diff --git a/tests/auto/customization/data/styles/identified/StackView.qml b/tests/auto/customization/data/styles/identified/StackView.qml index 20459d99..1bc5bf50 100644 --- a/tests/auto/customization/data/styles/identified/StackView.qml +++ b/tests/auto/customization/data/styles/identified/StackView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.StackView { id: control diff --git a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml b/tests/auto/customization/data/styles/identified/SwipeDelegate.qml index e60780f5..dadb54a5 100644 --- a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/identified/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.SwipeDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/SwipeView.qml b/tests/auto/customization/data/styles/identified/SwipeView.qml index 0e5a19f6..aa256d99 100644 --- a/tests/auto/customization/data/styles/identified/SwipeView.qml +++ b/tests/auto/customization/data/styles/identified/SwipeView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.SwipeView { id: control diff --git a/tests/auto/customization/data/styles/identified/Switch.qml b/tests/auto/customization/data/styles/identified/Switch.qml index f7e22f1f..be10b520 100644 --- a/tests/auto/customization/data/styles/identified/Switch.qml +++ b/tests/auto/customization/data/styles/identified/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Switch { id: control diff --git a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml b/tests/auto/customization/data/styles/identified/SwitchDelegate.qml index bda30715..7205c973 100644 --- a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/identified/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.SwitchDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/TabBar.qml b/tests/auto/customization/data/styles/identified/TabBar.qml index 3589f505..5d360cb1 100644 --- a/tests/auto/customization/data/styles/identified/TabBar.qml +++ b/tests/auto/customization/data/styles/identified/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.TabBar { id: control diff --git a/tests/auto/customization/data/styles/identified/TabButton.qml b/tests/auto/customization/data/styles/identified/TabButton.qml index cc24fdfe..bc065b22 100644 --- a/tests/auto/customization/data/styles/identified/TabButton.qml +++ b/tests/auto/customization/data/styles/identified/TabButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.TabButton { id: control diff --git a/tests/auto/customization/data/styles/identified/TextArea.qml b/tests/auto/customization/data/styles/identified/TextArea.qml index c7ef2545..56671240 100644 --- a/tests/auto/customization/data/styles/identified/TextArea.qml +++ b/tests/auto/customization/data/styles/identified/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.TextArea { id: control diff --git a/tests/auto/customization/data/styles/identified/TextField.qml b/tests/auto/customization/data/styles/identified/TextField.qml index 670fa9f7..1fef7ab5 100644 --- a/tests/auto/customization/data/styles/identified/TextField.qml +++ b/tests/auto/customization/data/styles/identified/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.TextField { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolBar.qml b/tests/auto/customization/data/styles/identified/ToolBar.qml index 950f0c53..2061949c 100644 --- a/tests/auto/customization/data/styles/identified/ToolBar.qml +++ b/tests/auto/customization/data/styles/identified/ToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ToolBar { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolButton.qml b/tests/auto/customization/data/styles/identified/ToolButton.qml index 792de9e5..253391a8 100644 --- a/tests/auto/customization/data/styles/identified/ToolButton.qml +++ b/tests/auto/customization/data/styles/identified/ToolButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ToolButton { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolSeparator.qml b/tests/auto/customization/data/styles/identified/ToolSeparator.qml index a44fb331..b8cf9daa 100644 --- a/tests/auto/customization/data/styles/identified/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/identified/ToolSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ToolSeparator { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolTip.qml b/tests/auto/customization/data/styles/identified/ToolTip.qml index 5ddf8920..1ef95c99 100644 --- a/tests/auto/customization/data/styles/identified/ToolTip.qml +++ b/tests/auto/customization/data/styles/identified/ToolTip.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ToolTip { id: control diff --git a/tests/auto/customization/data/styles/identified/Tumbler.qml b/tests/auto/customization/data/styles/identified/Tumbler.qml index ae123f08..3bfdafc4 100644 --- a/tests/auto/customization/data/styles/identified/Tumbler.qml +++ b/tests/auto/customization/data/styles/identified/Tumbler.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Tumbler { id: control -- cgit v1.2.3 From 501bc44bb006ee8021cbaaa7a696e7c9263395d3 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 17 Apr 2020 14:32:55 +0200 Subject: Use qmlRegisterModuleImport() to register styles This patch completes the cumulative work done in previous patches. - Uses qmlRegisterModuleImport() to register styles. This has some added requirements: - Each style must now be a QML module -- that is, it must have a qmldir file. - As a result of the above, the module must be available within the QML import path in order to be found. - The various forms of accepted style names have been reduced down to one ("Material", "MyStyle", etc). See below for an explanation of why. - The following API in QQuickStyle is removed: addStylePath(), availableStyles(), path(), stylePathList(). These no longer make sense now that we reuse the existing QML import system. - Adds the tst_qquickstyleselector auto test back as "styleimports". qmlRegisterModuleImport() vs resolvedUrl() Previously we would use QQuickStyleSelector to select individual QML files based on which style was set. We'd do this once when QtQuick.Controls was first imported. With Qt 6, and the requirement that each style be a proper QML module, qmlRegisterModuleImport() was introduced. This allows us to "link" one import with another. For an example of what this looks like in practice, suppose the style was set to "MyStyle", and the fallback to "Material". The "QtQuick.Controls" import will be linked to "MyStyle", "MyStyle" to "QtQuick.Controls.Material", and as a final fallback (for controls like Action which only the Default style implements), "QtQuick.Controls.Material" to "QtQuick.Controls.Default". This is the same behavior as in Qt 5 (see qquickstyleselector.cpp): // 1) requested style (e.g. "MyStyle", included in d->selectors) // 2) fallback style (e.g. "Material", included in d->selectors) // 3) default style (empty selector, not in d->selectors) This is a necessary step to enable compilation of QML to C++. Reducing the set of accepted style names The problem In QtQuickControls2Plugin() we need to call QQuickStylePrivate::init(baseUrl()) in order to detect if the style is a custom style in QQuickStyleSpec::resolve() (by checking if the style path starts with the base URL). In Qt 5, init() is called in QtQuickControls2Plugin::registerTypes(), but in Qt 6 that's too late, because we need to call qmlRegisterModuleImport() in the constructor. qmlRegisterModuleImport() itself requires the style to have already been set in order to create the correct import URI ("QtQuick.Controls.X" for built-in styles, "MyCustomStyle" for custom styles). The solution By reducing the valid forms for style names down to one: ./myapp -style MyStyle we solve the problem of needing baseUrl() to determine if the style is a custom style or not, but needing to call it too early (since we now call qmlRegisterModuleImport() in QtQuickControls2Plugin(), which itself requires the style to have already been set). baseUrl() can't have been set before the constructor is finished. All of the various forms for _setting_ a style are still valid; environment variables, qtquickcontrols2.conf, etc. [ChangeLog][Important Behavior Changes] Custom styles must now have a qmldir that lists the files that the style implements. For example, for a style that only implements Button: --- module MyStyle Button 1.0 Button.qml --- In addition, there is now only one valid, case-sensitive form for style names: "Material", "MyStyle", etc. These changes are done to help enable the compilation of QML code to C++, as well as improve tooling capabilities. [ChangeLog][Important Behavior Changes] The following API was removed: - QQuickStyle::addStylePath() - QQuickStyle::availableStyles() - QQuickStyle::path() - QQuickStyle::stylePathList() - QT_QUICK_CONTROLS_STYLE_PATH This API is no longer necessary and/or able to be provided now that styles are treated as regular QML modules. Task-number: QTBUG-82922 Change-Id: I3b281131903c7c3c1cf0616eb7486a872dccd730 Reviewed-by: Fabian Kosmale --- .../customization/data/styles/identified/qmldir | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 tests/auto/customization/data/styles/identified/qmldir (limited to 'tests/auto/customization/data/styles/identified') diff --git a/tests/auto/customization/data/styles/identified/qmldir b/tests/auto/customization/data/styles/identified/qmldir new file mode 100644 index 00000000..1ee2a92e --- /dev/null +++ b/tests/auto/customization/data/styles/identified/qmldir @@ -0,0 +1,59 @@ +module identified + +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 -- cgit v1.2.3