diff options
1227 files changed, 3471 insertions, 3471 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml index 29e5c30022..3dc93e47d0 100644 --- a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 540 diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml index 8308f5c07a..66a51d2db2 100644 --- a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 540 diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml index 826aee429b..080d8bdb30 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml index 9494219100..2ae56444c7 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml index 3c0d1a23d1..029f45e3c8 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml index 61819491c1..c8e8872420 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls -import io.qt.examples.chattutorial 1.0 +import io.qt.examples.chattutorial Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml index d616fa388a..35f770f58b 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls -import io.qt.examples.chattutorial 1.0 +import io.qt.examples.chattutorial Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml index 3c0d1a23d1..029f45e3c8 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml index 1252706b34..d4a66764bd 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick.Controls +import QtQuick.Controls.Material ToolBar { Material.theme: Material.Dark diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml index 32e6217c7a..c192aeb51a 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 +import QtQuick.Controls ToolBar { } diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml index f26712f852..65460bf127 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls -import io.qt.examples.chattutorial 1.0 +import io.qt.examples.chattutorial Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml index 312384546a..c668072e34 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls -import io.qt.examples.chattutorial 1.0 +import io.qt.examples.chattutorial Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml index 3c0d1a23d1..029f45e3c8 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml index 368035990f..dde9a4f425 100644 --- a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls ItemDelegate { id: delegate diff --git a/examples/quickcontrols2/contactlist/ContactDialog.qml b/examples/quickcontrols2/contactlist/ContactDialog.qml index 7569f356c2..679a2673b1 100644 --- a/examples/quickcontrols2/contactlist/ContactDialog.qml +++ b/examples/quickcontrols2/contactlist/ContactDialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Dialog { id: dialog diff --git a/examples/quickcontrols2/contactlist/ContactForm.ui.qml b/examples/quickcontrols2/contactlist/ContactForm.ui.qml index 5988735aad..406a300a26 100644 --- a/examples/quickcontrols2/contactlist/ContactForm.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls GridLayout { id: grid diff --git a/examples/quickcontrols2/contactlist/ContactView.ui.qml b/examples/quickcontrols2/contactlist/ContactView.ui.qml index 984fc78787..88ac01cfd5 100644 --- a/examples/quickcontrols2/contactlist/ContactView.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactView.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import Backend 1.0 +import QtQuick +import QtQuick.Controls +import Backend ListView { id: listView diff --git a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml index e7d7c2aa36..49ae528b56 100644 --- a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml +++ b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolBar { id: background diff --git a/examples/quickcontrols2/contactlist/contactlist.qml b/examples/quickcontrols2/contactlist/contactlist.qml index f79c609be2..e904c9faeb 100644 --- a/examples/quickcontrols2/contactlist/contactlist.qml +++ b/examples/quickcontrols2/contactlist/contactlist.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml index 12c1d41621..2bdeae2e70 100644 --- a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml +++ b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick ListModel { ListElement { diff --git a/examples/quickcontrols2/flatstyle/Flat/Button.qml b/examples/quickcontrols2/flatstyle/Flat/Button.qml index 0420ddb489..f072038a1d 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Button.qml +++ b/examples/quickcontrols2/flatstyle/Flat/Button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import Theme 1.0 +import QtQuick +import QtQuick.Templates as T +import Theme T.Button { id: control diff --git a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml index ae819afa9a..014160330e 100644 --- a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml +++ b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import Theme 1.0 +import QtQuick +import QtQuick.Templates as T +import Theme T.CheckBox { id: control diff --git a/examples/quickcontrols2/flatstyle/Flat/Switch.qml b/examples/quickcontrols2/flatstyle/Flat/Switch.qml index 3eea062fdc..1f3bd3251e 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Switch.qml +++ b/examples/quickcontrols2/flatstyle/Flat/Switch.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import Theme 1.0 +import QtQuick +import QtQuick.Templates as T +import Theme T.Switch { id: control diff --git a/examples/quickcontrols2/flatstyle/MainForm.ui.qml b/examples/quickcontrols2/flatstyle/MainForm.ui.qml index e25158a3a0..fcb17adc08 100644 --- a/examples/quickcontrols2/flatstyle/MainForm.ui.qml +++ b/examples/quickcontrols2/flatstyle/MainForm.ui.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import Theme 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Theme Item { id: form diff --git a/examples/quickcontrols2/flatstyle/flatstyle.qml b/examples/quickcontrols2/flatstyle/flatstyle.qml index 44a29cda3f..273cd3db27 100644 --- a/examples/quickcontrols2/flatstyle/flatstyle.qml +++ b/examples/quickcontrols2/flatstyle/flatstyle.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import Qt.labs.platform 1.0 -import Theme 1.0 +import QtQuick +import QtQuick.Controls +import Qt.labs.platform +import Theme ApplicationWindow { id: window diff --git a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml index 9018ece5f0..4529fd547a 100644 --- a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml +++ b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml @@ -50,7 +50,7 @@ pragma Singleton -import QtQuick 2.12 +import QtQuick QtObject { readonly property color gray: "#b2b1b1" diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 504a36c7ab..f76315ccb1 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 -import Qt.labs.settings 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Controls.Universal +import Qt.labs.settings ApplicationWindow { id: window diff --git a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml index b0aa6284b5..867f5d2886 100644 --- a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml +++ b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ButtonPage.qml b/examples/quickcontrols2/gallery/pages/ButtonPage.qml index c77b41e4dc..3840457005 100644 --- a/examples/quickcontrols2/gallery/pages/ButtonPage.qml +++ b/examples/quickcontrols2/gallery/pages/ButtonPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml index 7795f814d0..39ea53ca6c 100644 --- a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml index ec75607c27..04bb634ab7 100644 --- a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml index 91110567f6..b0cc30c2dc 100644 --- a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml +++ b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml index 20ceaa6bf9..d2064d9870 100644 --- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml +++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Pane { padding: 0 diff --git a/examples/quickcontrols2/gallery/pages/DialPage.qml b/examples/quickcontrols2/gallery/pages/DialPage.qml index 3bb3bb2867..55519fb3a9 100644 --- a/examples/quickcontrols2/gallery/pages/DialPage.qml +++ b/examples/quickcontrols2/gallery/pages/DialPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/DialogPage.qml b/examples/quickcontrols2/gallery/pages/DialogPage.qml index 9d23e26098..e5162b36f4 100644 --- a/examples/quickcontrols2/gallery/pages/DialogPage.qml +++ b/examples/quickcontrols2/gallery/pages/DialogPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml index 4834d04da4..7fda3d6683 100644 --- a/examples/quickcontrols2/gallery/pages/FramePage.qml +++ b/examples/quickcontrols2/gallery/pages/FramePage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml index 16f8762a40..2a01297bbb 100644 --- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml index 4f13ce3332..612a942c83 100644 --- a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml +++ b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml index 1f3c81b985..252e8eff9c 100644 --- a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml +++ b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml index b573731e21..41d4d34ea4 100644 --- a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml +++ b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml index b6c357664b..65f852ffd0 100644 --- a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml +++ b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml index d9e77fa4bc..90c43965b0 100644 --- a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml +++ b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Flickable { id: flickable diff --git a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml index 2adcbc6b93..301146eaf0 100644 --- a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml +++ b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Flickable { id: flickable diff --git a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml index afb5ef5c15..483159e72c 100644 --- a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml +++ b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Page { id: page diff --git a/examples/quickcontrols2/gallery/pages/SliderPage.qml b/examples/quickcontrols2/gallery/pages/SliderPage.qml index 93a1ebb1a6..5dcac2d899 100644 --- a/examples/quickcontrols2/gallery/pages/SliderPage.qml +++ b/examples/quickcontrols2/gallery/pages/SliderPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml index 9e45833176..6fddbd27e4 100644 --- a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/StackViewPage.qml b/examples/quickcontrols2/gallery/pages/StackViewPage.qml index 43ee568494..fc2a4bdf17 100644 --- a/examples/quickcontrols2/gallery/pages/StackViewPage.qml +++ b/examples/quickcontrols2/gallery/pages/StackViewPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls StackView { id: stackView diff --git a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml index 3c3bc56cce..9cff5db89a 100644 --- a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml +++ b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Pane { id: pane diff --git a/examples/quickcontrols2/gallery/pages/SwitchPage.qml b/examples/quickcontrols2/gallery/pages/SwitchPage.qml index 53ee1660a0..2f4089a0e3 100644 --- a/examples/quickcontrols2/gallery/pages/SwitchPage.qml +++ b/examples/quickcontrols2/gallery/pages/SwitchPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/TabBarPage.qml b/examples/quickcontrols2/gallery/pages/TabBarPage.qml index 7c3cae44fd..b14df6d125 100644 --- a/examples/quickcontrols2/gallery/pages/TabBarPage.qml +++ b/examples/quickcontrols2/gallery/pages/TabBarPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Page { id: page diff --git a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml index 7ed2b58b82..91ecb16e41 100644 --- a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml +++ b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml index 37a5d605a1..7ecdddc203 100644 --- a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml +++ b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml index 295ea2c456..eaae72b15e 100644 --- a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml +++ b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/TumblerPage.qml b/examples/quickcontrols2/gallery/pages/TumblerPage.qml index af4caee3a8..8a22a02545 100644 --- a/examples/quickcontrols2/gallery/pages/TumblerPage.qml +++ b/examples/quickcontrols2/gallery/pages/TumblerPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollablePage { id: page diff --git a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml index 483059ae3e..e8481930dc 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtGraphicalEffects 1.12 +import QtGraphicalEffects Glow { color: glowColor diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml index d86b39c700..54ebeb4861 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Button { id: button diff --git a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml index 088e9c1648..39c5d6fece 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls // This container and the transform on the Label are // necessary to get precise bounding rect of the text for layouting reasons, diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml index 2c001db23b..88a7ba5f42 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Window ApplicationWindow { id: window diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml index 28ed5861a7..61b295cd91 100644 --- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window ApplicationWindow { id: window diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols2/sidepanel/sidepanel.qml index 7f207e2f12..70af901d4e 100644 --- a/examples/quickcontrols2/sidepanel/sidepanel.qml +++ b/examples/quickcontrols2/sidepanel/sidepanel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material ApplicationWindow { id: window diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.qml b/examples/quickcontrols2/swipetoremove/swipetoremove.qml index 65127a1ae2..41c578c685 100644 --- a/examples/quickcontrols2/swipetoremove/swipetoremove.qml +++ b/examples/quickcontrols2/swipetoremove/swipetoremove.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material ApplicationWindow { id: window diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml index e56eddcdb9..61d7de8a9b 100644 --- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml +++ b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml @@ -48,13 +48,13 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts +import QtQuick.Window -import io.qt.examples.texteditor 1.0 +import io.qt.examples.texteditor // TODO: // - make designer-friendly diff --git a/examples/quickcontrols2/texteditor/qml/texteditor.qml b/examples/quickcontrols2/texteditor/qml/texteditor.qml index b14855824b..0c0f75e113 100644 --- a/examples/quickcontrols2/texteditor/qml/texteditor.qml +++ b/examples/quickcontrols2/texteditor/qml/texteditor.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Window +import Qt.labs.platform -import io.qt.examples.texteditor 1.0 +import io.qt.examples.texteditor // TODO: // - make designer-friendly diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml index 6874008f49..eda81e1f2f 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/DemoMode.qml b/examples/quickcontrols2/wearable/qml/DemoMode.qml index 9d0f4d6b94..17b1ea3c31 100644 --- a/examples/quickcontrols2/wearable/qml/DemoMode.qml +++ b/examples/quickcontrols2/wearable/qml/DemoMode.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "Style" diff --git a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml index 88678b36fe..a264a79b3d 100644 --- a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml +++ b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import "Style" Item { diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml index 0e361066a7..81bad76195 100644 --- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml +++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import ".." import "../Style" import "fitness.js" as FitnessData diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml index 96a2d975d2..e0de97c3de 100644 --- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import "Style" PathView { diff --git a/examples/quickcontrols2/wearable/qml/NaviButton.qml b/examples/quickcontrols2/wearable/qml/NaviButton.qml index 55ccc19df5..1d4dc552dd 100644 --- a/examples/quickcontrols2/wearable/qml/NaviButton.qml +++ b/examples/quickcontrols2/wearable/qml/NaviButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import "Style" QQC2.AbstractButton { diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml index 4a7fbde150..06c9909eb7 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../Style" import "navigation.js" as NavigationData diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml index 005ae3f79b..4f5262f1d7 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../Style" Rectangle { diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml index a8e9934584..45f0dcb271 100644 --- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import "../Style" import "notifications.js" as NotificationData diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml index 23bb9acd6e..347ad417e4 100644 --- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml index 68485f5d43..8328f627dc 100644 --- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml +++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import "." T.PageIndicator { diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols2/wearable/qml/Style/Slider.qml index a0be11c7e1..533510f5cd 100644 --- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml +++ b/examples/quickcontrols2/wearable/qml/Style/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import "." T.Slider { diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols2/wearable/qml/Style/Switch.qml index 4a0f4e4953..e5631bbbfa 100644 --- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml +++ b/examples/quickcontrols2/wearable/qml/Style/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import "." T.Switch { diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml index 0efe84e53e..626d37ec6d 100644 --- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml +++ b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick pragma Singleton diff --git a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml index 1417d9f71a..b897127ba8 100644 --- a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml +++ b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { // Don't show the item when the StackView that contains us diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml index 2d41130273..28fc0bc1eb 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml +++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import ".." import "../Style" import "weather.js" as WeatherData diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml index 613d936bf8..312113091e 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml index 8def8b4590..b2f881e363 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 import "../Style" Item { diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml index bda7d169e6..645ff5619c 100644 --- a/examples/quickcontrols2/wearable/wearable.qml +++ b/examples/quickcontrols2/wearable/wearable.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import Qt.labs.settings 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import Qt.labs.settings import "qml" import "qml/Style" diff --git a/src/imports/controls/default/AbstractButton.qml b/src/imports/controls/default/AbstractButton.qml index 50ddb933a7..a4855c2197 100644 --- a/src/imports/controls/default/AbstractButton.qml +++ b/src/imports/controls/default/AbstractButton.qml @@ -34,8 +34,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/src/imports/controls/default/Action.qml b/src/imports/controls/default/Action.qml index 996e9086a0..bb66fc8fb5 100644 --- a/src/imports/controls/default/Action.qml +++ b/src/imports/controls/default/Action.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.Action { } diff --git a/src/imports/controls/default/ActionGroup.qml b/src/imports/controls/default/ActionGroup.qml index 89e72c8fcf..70170f0e4e 100644 --- a/src/imports/controls/default/ActionGroup.qml +++ b/src/imports/controls/default/ActionGroup.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ActionGroup { } diff --git a/src/imports/controls/default/ApplicationWindow.qml b/src/imports/controls/default/ApplicationWindow.qml index 235ebf133d..b383139b8b 100644 --- a/src/imports/controls/default/ApplicationWindow.qml +++ b/src/imports/controls/default/ApplicationWindow.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ApplicationWindow { id: window diff --git a/src/imports/controls/default/BusyIndicator.qml b/src/imports/controls/default/BusyIndicator.qml index c8b12732e2..5db2a083db 100644 --- a/src/imports/controls/default/BusyIndicator.qml +++ b/src/imports/controls/default/BusyIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Default.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Default.impl +import QtQuick.Templates as T T.BusyIndicator { id: control diff --git a/src/imports/controls/default/Button.qml b/src/imports/controls/default/Button.qml index a9e7fce63b..06d4e93fdf 100644 --- a/src/imports/controls/default/Button.qml +++ b/src/imports/controls/default/Button.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Button { id: control diff --git a/src/imports/controls/default/ButtonGroup.qml b/src/imports/controls/default/ButtonGroup.qml index cf0355ba7b..fadc538a49 100644 --- a/src/imports/controls/default/ButtonGroup.qml +++ b/src/imports/controls/default/ButtonGroup.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ButtonGroup { } diff --git a/src/imports/controls/default/CheckBox.qml b/src/imports/controls/default/CheckBox.qml index eae6e20878..d9c92a56be 100644 --- a/src/imports/controls/default/CheckBox.qml +++ b/src/imports/controls/default/CheckBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.CheckBox { id: control diff --git a/src/imports/controls/default/CheckDelegate.qml b/src/imports/controls/default/CheckDelegate.qml index 176e0843d8..3153bb3e0f 100644 --- a/src/imports/controls/default/CheckDelegate.qml +++ b/src/imports/controls/default/CheckDelegate.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.CheckDelegate { id: control diff --git a/src/imports/controls/default/ComboBox.qml b/src/imports/controls/default/ComboBox.qml index a402b7bebb..e1e6016492 100644 --- a/src/imports/controls/default/ComboBox.qml +++ b/src/imports/controls/default/ComboBox.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -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 +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ComboBox { id: control diff --git a/src/imports/controls/default/Container.qml b/src/imports/controls/default/Container.qml index 83ab957d33..939190755c 100644 --- a/src/imports/controls/default/Container.qml +++ b/src/imports/controls/default/Container.qml @@ -34,8 +34,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/src/imports/controls/default/Control.qml b/src/imports/controls/default/Control.qml index a963a56330..7a68a43166 100644 --- a/src/imports/controls/default/Control.qml +++ b/src/imports/controls/default/Control.qml @@ -34,8 +34,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/src/imports/controls/default/DelayButton.qml b/src/imports/controls/default/DelayButton.qml index 1c545a71e6..3dbed315a2 100644 --- a/src/imports/controls/default/DelayButton.qml +++ b/src/imports/controls/default/DelayButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.DelayButton { id: control diff --git a/src/imports/controls/default/Dial.qml b/src/imports/controls/default/Dial.qml index 8e94e2fbdc..80f2bfb06b 100644 --- a/src/imports/controls/default/Dial.qml +++ b/src/imports/controls/default/Dial.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Default.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Default.impl +import QtQuick.Templates as T T.Dial { id: control diff --git a/src/imports/controls/default/Dialog.qml b/src/imports/controls/default/Dialog.qml index 6c2e4b1b19..254a6dcb4a 100644 --- a/src/imports/controls/default/Dialog.qml +++ b/src/imports/controls/default/Dialog.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.Dialog { id: control diff --git a/src/imports/controls/default/DialogButtonBox.qml b/src/imports/controls/default/DialogButtonBox.qml index 3c9d5b48eb..e4cdbd14de 100644 --- a/src/imports/controls/default/DialogButtonBox.qml +++ b/src/imports/controls/default/DialogButtonBox.qml @@ -34,8 +34,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/src/imports/controls/default/Drawer.qml b/src/imports/controls/default/Drawer.qml index 17465fd44c..719e5e1cef 100644 --- a/src/imports/controls/default/Drawer.qml +++ b/src/imports/controls/default/Drawer.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Drawer { id: control diff --git a/src/imports/controls/default/Frame.qml b/src/imports/controls/default/Frame.qml index 2fe461040e..9696b5c96a 100644 --- a/src/imports/controls/default/Frame.qml +++ b/src/imports/controls/default/Frame.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Frame { id: control diff --git a/src/imports/controls/default/GroupBox.qml b/src/imports/controls/default/GroupBox.qml index 96f776f292..d6244113dd 100644 --- a/src/imports/controls/default/GroupBox.qml +++ b/src/imports/controls/default/GroupBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.GroupBox { id: control diff --git a/src/imports/controls/default/HorizontalHeaderView.qml b/src/imports/controls/default/HorizontalHeaderView.qml index ec91af258e..093c868b32 100644 --- a/src/imports/controls/default/HorizontalHeaderView.qml +++ b/src/imports/controls/default/HorizontalHeaderView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.HorizontalHeaderView { id: control diff --git a/src/imports/controls/default/ItemDelegate.qml b/src/imports/controls/default/ItemDelegate.qml index 6229e2bbad..1183eb2b08 100644 --- a/src/imports/controls/default/ItemDelegate.qml +++ b/src/imports/controls/default/ItemDelegate.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ItemDelegate { id: control diff --git a/src/imports/controls/default/Label.qml b/src/imports/controls/default/Label.qml index 9a42635fcf..6d0aca41ba 100644 --- a/src/imports/controls/default/Label.qml +++ b/src/imports/controls/default/Label.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Label { id: control diff --git a/src/imports/controls/default/Menu.qml b/src/imports/controls/default/Menu.qml index cf3a52f248..91384e4fea 100644 --- a/src/imports/controls/default/Menu.qml +++ b/src/imports/controls/default/Menu.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.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Window T.Menu { id: control diff --git a/src/imports/controls/default/MenuBar.qml b/src/imports/controls/default/MenuBar.qml index 122cdc5310..9745a52deb 100644 --- a/src/imports/controls/default/MenuBar.qml +++ b/src/imports/controls/default/MenuBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.MenuBar { id: control diff --git a/src/imports/controls/default/MenuBarItem.qml b/src/imports/controls/default/MenuBarItem.qml index f6835412a8..b2771a3c0e 100644 --- a/src/imports/controls/default/MenuBarItem.qml +++ b/src/imports/controls/default/MenuBarItem.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.MenuBarItem { id: control diff --git a/src/imports/controls/default/MenuItem.qml b/src/imports/controls/default/MenuItem.qml index 678bac57c3..fc2d434f78 100644 --- a/src/imports/controls/default/MenuItem.qml +++ b/src/imports/controls/default/MenuItem.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.MenuItem { id: control diff --git a/src/imports/controls/default/MenuSeparator.qml b/src/imports/controls/default/MenuSeparator.qml index cc5c2b6e8f..d503aecd34 100644 --- a/src/imports/controls/default/MenuSeparator.qml +++ b/src/imports/controls/default/MenuSeparator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.MenuSeparator { id: control diff --git a/src/imports/controls/default/Page.qml b/src/imports/controls/default/Page.qml index 4b3cf3d26e..2fec37f02e 100644 --- a/src/imports/controls/default/Page.qml +++ b/src/imports/controls/default/Page.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Page { id: control diff --git a/src/imports/controls/default/PageIndicator.qml b/src/imports/controls/default/PageIndicator.qml index 78f9e3cf76..3942f54f4d 100644 --- a/src/imports/controls/default/PageIndicator.qml +++ b/src/imports/controls/default/PageIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.PageIndicator { id: control diff --git a/src/imports/controls/default/Pane.qml b/src/imports/controls/default/Pane.qml index 47b916e321..221819d4ed 100644 --- a/src/imports/controls/default/Pane.qml +++ b/src/imports/controls/default/Pane.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Pane { id: control diff --git a/src/imports/controls/default/Popup.qml b/src/imports/controls/default/Popup.qml index ee243c10cd..713721076d 100644 --- a/src/imports/controls/default/Popup.qml +++ b/src/imports/controls/default/Popup.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Popup { id: control diff --git a/src/imports/controls/default/ProgressBar.qml b/src/imports/controls/default/ProgressBar.qml index 218cc442f7..56739f4f8f 100644 --- a/src/imports/controls/default/ProgressBar.qml +++ b/src/imports/controls/default/ProgressBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Default.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Default.impl T.ProgressBar { id: control diff --git a/src/imports/controls/default/RadioButton.qml b/src/imports/controls/default/RadioButton.qml index cdf0c30ec4..02b2f627ec 100644 --- a/src/imports/controls/default/RadioButton.qml +++ b/src/imports/controls/default/RadioButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.RadioButton { id: control diff --git a/src/imports/controls/default/RadioDelegate.qml b/src/imports/controls/default/RadioDelegate.qml index a7e7dec004..dc99836373 100644 --- a/src/imports/controls/default/RadioDelegate.qml +++ b/src/imports/controls/default/RadioDelegate.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.RadioDelegate { id: control diff --git a/src/imports/controls/default/RangeSlider.qml b/src/imports/controls/default/RangeSlider.qml index c3e7c96464..1132a78b03 100644 --- a/src/imports/controls/default/RangeSlider.qml +++ b/src/imports/controls/default/RangeSlider.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.RangeSlider { id: control diff --git a/src/imports/controls/default/RoundButton.qml b/src/imports/controls/default/RoundButton.qml index 825d52529a..9445ecdf83 100644 --- a/src/imports/controls/default/RoundButton.qml +++ b/src/imports/controls/default/RoundButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.RoundButton { id: control diff --git a/src/imports/controls/default/ScrollBar.qml b/src/imports/controls/default/ScrollBar.qml index 0948fb1d1e..1652ea814a 100644 --- a/src/imports/controls/default/ScrollBar.qml +++ b/src/imports/controls/default/ScrollBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ScrollBar { id: control diff --git a/src/imports/controls/default/ScrollIndicator.qml b/src/imports/controls/default/ScrollIndicator.qml index 795c20ee73..4f3ece0c49 100644 --- a/src/imports/controls/default/ScrollIndicator.qml +++ b/src/imports/controls/default/ScrollIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ScrollIndicator { id: control diff --git a/src/imports/controls/default/ScrollView.qml b/src/imports/controls/default/ScrollView.qml index f775d62462..76094c6cca 100644 --- a/src/imports/controls/default/ScrollView.qml +++ b/src/imports/controls/default/ScrollView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ScrollView { id: control diff --git a/src/imports/controls/default/Slider.qml b/src/imports/controls/default/Slider.qml index 6d532389ba..cdd72b767d 100644 --- a/src/imports/controls/default/Slider.qml +++ b/src/imports/controls/default/Slider.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Slider { id: control diff --git a/src/imports/controls/default/SpinBox.qml b/src/imports/controls/default/SpinBox.qml index d1c2ea5bc0..46eca36ed7 100644 --- a/src/imports/controls/default/SpinBox.qml +++ b/src/imports/controls/default/SpinBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.SpinBox { id: control diff --git a/src/imports/controls/default/SplitView.qml b/src/imports/controls/default/SplitView.qml index 9d37a83e62..020d07ea8a 100644 --- a/src/imports/controls/default/SplitView.qml +++ b/src/imports/controls/default/SplitView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Templates 2.13 as T -import QtQuick.Controls 2.13 -import QtQuick.Controls.impl 2.13 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.SplitView { id: control diff --git a/src/imports/controls/default/StackView.qml b/src/imports/controls/default/StackView.qml index 3e416b8716..3b388e46ea 100644 --- a/src/imports/controls/default/StackView.qml +++ b/src/imports/controls/default/StackView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.StackView { id: control diff --git a/src/imports/controls/default/SwipeDelegate.qml b/src/imports/controls/default/SwipeDelegate.qml index 37d66bb664..ff56f6f00f 100644 --- a/src/imports/controls/default/SwipeDelegate.qml +++ b/src/imports/controls/default/SwipeDelegate.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.SwipeDelegate { id: control diff --git a/src/imports/controls/default/SwipeView.qml b/src/imports/controls/default/SwipeView.qml index 7722d2588f..7fb8d449ad 100644 --- a/src/imports/controls/default/SwipeView.qml +++ b/src/imports/controls/default/SwipeView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.SwipeView { id: control diff --git a/src/imports/controls/default/Switch.qml b/src/imports/controls/default/Switch.qml index f62e2502c7..12420bedc4 100644 --- a/src/imports/controls/default/Switch.qml +++ b/src/imports/controls/default/Switch.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.Switch { id: control diff --git a/src/imports/controls/default/SwitchDelegate.qml b/src/imports/controls/default/SwitchDelegate.qml index d6447e7747..e2a9f7b5e9 100644 --- a/src/imports/controls/default/SwitchDelegate.qml +++ b/src/imports/controls/default/SwitchDelegate.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl T.SwitchDelegate { id: control diff --git a/src/imports/controls/default/TabBar.qml b/src/imports/controls/default/TabBar.qml index 83f6b3b277..f1b11ac297 100644 --- a/src/imports/controls/default/TabBar.qml +++ b/src/imports/controls/default/TabBar.qml @@ -34,8 +34,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/src/imports/controls/default/TabButton.qml b/src/imports/controls/default/TabButton.qml index f8b303eaf5..0935d46361 100644 --- a/src/imports/controls/default/TabButton.qml +++ b/src/imports/controls/default/TabButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.TabButton { id: control diff --git a/src/imports/controls/default/TextArea.qml b/src/imports/controls/default/TextArea.qml index 45790e67b2..e6a1509e43 100644 --- a/src/imports/controls/default/TextArea.qml +++ b/src/imports/controls/default/TextArea.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.TextArea { id: control diff --git a/src/imports/controls/default/TextField.qml b/src/imports/controls/default/TextField.qml index 4d9cb6916e..2c69d35163 100644 --- a/src/imports/controls/default/TextField.qml +++ b/src/imports/controls/default/TextField.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.TextField { id: control diff --git a/src/imports/controls/default/ToolBar.qml b/src/imports/controls/default/ToolBar.qml index 1e07b6bf79..6f5e54e68e 100644 --- a/src/imports/controls/default/ToolBar.qml +++ b/src/imports/controls/default/ToolBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ToolBar { id: control diff --git a/src/imports/controls/default/ToolButton.qml b/src/imports/controls/default/ToolButton.qml index 63aaf893e2..63b40233d4 100644 --- a/src/imports/controls/default/ToolButton.qml +++ b/src/imports/controls/default/ToolButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ToolButton { id: control diff --git a/src/imports/controls/default/ToolSeparator.qml b/src/imports/controls/default/ToolSeparator.qml index 188d075835..e6d6a7f7f4 100644 --- a/src/imports/controls/default/ToolSeparator.qml +++ b/src/imports/controls/default/ToolSeparator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ToolSeparator { id: control diff --git a/src/imports/controls/default/ToolTip.qml b/src/imports/controls/default/ToolTip.qml index e038990380..933b74003c 100644 --- a/src/imports/controls/default/ToolTip.qml +++ b/src/imports/controls/default/ToolTip.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.ToolTip { id: control diff --git a/src/imports/controls/default/Tumbler.qml b/src/imports/controls/default/Tumbler.qml index 4d1abdd37f..89f7f056bf 100644 --- a/src/imports/controls/default/Tumbler.qml +++ b/src/imports/controls/default/Tumbler.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T T.Tumbler { id: control diff --git a/src/imports/controls/default/VerticalHeaderView.qml b/src/imports/controls/default/VerticalHeaderView.qml index 3fc9ca5ace..21e39c3983 100644 --- a/src/imports/controls/default/VerticalHeaderView.qml +++ b/src/imports/controls/default/VerticalHeaderView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.VerticalHeaderView { id: control diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/imports/controls/designer/AbstractButtonSection.qml index e8aa39c2ac..1b529c9858 100644 --- a/src/imports/controls/designer/AbstractButtonSection.qml +++ b/src/imports/controls/designer/AbstractButtonSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { caption: qsTr("AbstractButton") diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/imports/controls/designer/BusyIndicatorSpecifics.qml index 7ae927fcc6..7b2899d304 100644 --- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml +++ b/src/imports/controls/designer/BusyIndicatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml index fef460715e..de8194dacf 100644 --- a/src/imports/controls/designer/ButtonSection.qml +++ b/src/imports/controls/designer/ButtonSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { id: section diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/imports/controls/designer/ButtonSpecifics.qml index e094b9dfc9..5a46e72aff 100644 --- a/src/imports/controls/designer/ButtonSpecifics.qml +++ b/src/imports/controls/designer/ButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/imports/controls/designer/CheckBoxSpecifics.qml index f76aa21590..d3aae9b679 100644 --- a/src/imports/controls/designer/CheckBoxSpecifics.qml +++ b/src/imports/controls/designer/CheckBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/CheckDelegateSpecifics.qml b/src/imports/controls/designer/CheckDelegateSpecifics.qml index 1df55e1134..8014480cd5 100644 --- a/src/imports/controls/designer/CheckDelegateSpecifics.qml +++ b/src/imports/controls/designer/CheckDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/CheckSection.qml b/src/imports/controls/designer/CheckSection.qml index 76cde03eeb..0f49fa25af 100644 --- a/src/imports/controls/designer/CheckSection.qml +++ b/src/imports/controls/designer/CheckSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { SectionLayout { diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/imports/controls/designer/ComboBoxSpecifics.qml index 8a5e33b687..810f19b5ff 100644 --- a/src/imports/controls/designer/ComboBoxSpecifics.qml +++ b/src/imports/controls/designer/ComboBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ContainerSection.qml b/src/imports/controls/designer/ContainerSection.qml index 896804c042..15d1ddf598 100644 --- a/src/imports/controls/designer/ContainerSection.qml +++ b/src/imports/controls/designer/ContainerSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { caption: qsTr("Container") diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml index 3446c08f70..31780129d8 100644 --- a/src/imports/controls/designer/ControlSection.qml +++ b/src/imports/controls/designer/ControlSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { caption: qsTr("Control") diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/imports/controls/designer/ControlSpecifics.qml index ccfd8853bc..3937437b5e 100644 --- a/src/imports/controls/designer/ControlSpecifics.qml +++ b/src/imports/controls/designer/ControlSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/DelayButtonSpecifics.qml b/src/imports/controls/designer/DelayButtonSpecifics.qml index 40b673a13a..024fe589d7 100644 --- a/src/imports/controls/designer/DelayButtonSpecifics.qml +++ b/src/imports/controls/designer/DelayButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/imports/controls/designer/DialSpecifics.qml index a0df81ef6c..026cb2b1b0 100644 --- a/src/imports/controls/designer/DialSpecifics.qml +++ b/src/imports/controls/designer/DialSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/imports/controls/designer/FrameSpecifics.qml index f17b6399d1..3673995659 100644 --- a/src/imports/controls/designer/FrameSpecifics.qml +++ b/src/imports/controls/designer/FrameSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/imports/controls/designer/GroupBoxSpecifics.qml index 3a705bcc00..f808b00103 100644 --- a/src/imports/controls/designer/GroupBoxSpecifics.qml +++ b/src/imports/controls/designer/GroupBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/InsetSection.qml b/src/imports/controls/designer/InsetSection.qml index 4253b17064..45a4df4fcc 100644 --- a/src/imports/controls/designer/InsetSection.qml +++ b/src/imports/controls/designer/InsetSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { caption: qsTr("Inset") diff --git a/src/imports/controls/designer/ItemDelegateSection.qml b/src/imports/controls/designer/ItemDelegateSection.qml index a337bcee9a..448a20d99d 100644 --- a/src/imports/controls/designer/ItemDelegateSection.qml +++ b/src/imports/controls/designer/ItemDelegateSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { id: section diff --git a/src/imports/controls/designer/ItemDelegateSpecifics.qml b/src/imports/controls/designer/ItemDelegateSpecifics.qml index 5806398054..1757521dd8 100644 --- a/src/imports/controls/designer/ItemDelegateSpecifics.qml +++ b/src/imports/controls/designer/ItemDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml index e5d5e04f84..569b44c8da 100644 --- a/src/imports/controls/designer/LabelSpecifics.qml +++ b/src/imports/controls/designer/LabelSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/imports/controls/designer/PaddingSection.qml index a7dee28e57..325c5698e0 100644 --- a/src/imports/controls/designer/PaddingSection.qml +++ b/src/imports/controls/designer/PaddingSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { caption: qsTr("Padding") diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml index 20aa857786..c73652e951 100644 --- a/src/imports/controls/designer/PageIndicatorSpecifics.qml +++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/PageSpecifics.qml b/src/imports/controls/designer/PageSpecifics.qml index 2dca1100a3..965ed655e7 100644 --- a/src/imports/controls/designer/PageSpecifics.qml +++ b/src/imports/controls/designer/PageSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/PaneSection.qml b/src/imports/controls/designer/PaneSection.qml index 80d154c93c..9dcc2097a9 100644 --- a/src/imports/controls/designer/PaneSection.qml +++ b/src/imports/controls/designer/PaneSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Section { caption: qsTr("Pane") diff --git a/src/imports/controls/designer/PaneSpecifics.qml b/src/imports/controls/designer/PaneSpecifics.qml index f17b6399d1..3673995659 100644 --- a/src/imports/controls/designer/PaneSpecifics.qml +++ b/src/imports/controls/designer/PaneSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/imports/controls/designer/ProgressBarSpecifics.qml index c24d71db57..aa834142da 100644 --- a/src/imports/controls/designer/ProgressBarSpecifics.qml +++ b/src/imports/controls/designer/ProgressBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/imports/controls/designer/RadioButtonSpecifics.qml index 6137ad8cd4..df0af7e748 100644 --- a/src/imports/controls/designer/RadioButtonSpecifics.qml +++ b/src/imports/controls/designer/RadioButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/RadioDelegateSpecifics.qml b/src/imports/controls/designer/RadioDelegateSpecifics.qml index 5806398054..1757521dd8 100644 --- a/src/imports/controls/designer/RadioDelegateSpecifics.qml +++ b/src/imports/controls/designer/RadioDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/RangeSliderSpecifics.qml b/src/imports/controls/designer/RangeSliderSpecifics.qml index 2324a66f17..9ff032b9fd 100644 --- a/src/imports/controls/designer/RangeSliderSpecifics.qml +++ b/src/imports/controls/designer/RangeSliderSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/RoundButtonSpecifics.qml b/src/imports/controls/designer/RoundButtonSpecifics.qml index af4ab5d005..58d3468952 100644 --- a/src/imports/controls/designer/RoundButtonSpecifics.qml +++ b/src/imports/controls/designer/RoundButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ScrollViewSpecifics.qml b/src/imports/controls/designer/ScrollViewSpecifics.qml index 0f3d56d2bf..ae525b747c 100644 --- a/src/imports/controls/designer/ScrollViewSpecifics.qml +++ b/src/imports/controls/designer/ScrollViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml index d126dd0672..3edc2a668c 100644 --- a/src/imports/controls/designer/SliderSpecifics.qml +++ b/src/imports/controls/designer/SliderSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/SpinBoxSpecifics.qml b/src/imports/controls/designer/SpinBoxSpecifics.qml index db59f074df..9c07e8c524 100644 --- a/src/imports/controls/designer/SpinBoxSpecifics.qml +++ b/src/imports/controls/designer/SpinBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/StackViewSpecifics.qml b/src/imports/controls/designer/StackViewSpecifics.qml index ccfd8853bc..3937437b5e 100644 --- a/src/imports/controls/designer/StackViewSpecifics.qml +++ b/src/imports/controls/designer/StackViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/SwipeDelegateSpecifics.qml b/src/imports/controls/designer/SwipeDelegateSpecifics.qml index 5806398054..1757521dd8 100644 --- a/src/imports/controls/designer/SwipeDelegateSpecifics.qml +++ b/src/imports/controls/designer/SwipeDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/SwipeViewSpecifics.qml b/src/imports/controls/designer/SwipeViewSpecifics.qml index 02cc900ec5..a28a291781 100644 --- a/src/imports/controls/designer/SwipeViewSpecifics.qml +++ b/src/imports/controls/designer/SwipeViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/SwitchDelegateSpecifics.qml b/src/imports/controls/designer/SwitchDelegateSpecifics.qml index f8c0dcc6da..4236de6772 100644 --- a/src/imports/controls/designer/SwitchDelegateSpecifics.qml +++ b/src/imports/controls/designer/SwitchDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/imports/controls/designer/SwitchSpecifics.qml index 6137ad8cd4..df0af7e748 100644 --- a/src/imports/controls/designer/SwitchSpecifics.qml +++ b/src/imports/controls/designer/SwitchSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/TabBarSpecifics.qml b/src/imports/controls/designer/TabBarSpecifics.qml index f17e8e9ab3..6f02cdaac2 100644 --- a/src/imports/controls/designer/TabBarSpecifics.qml +++ b/src/imports/controls/designer/TabBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/TabButtonSpecifics.qml b/src/imports/controls/designer/TabButtonSpecifics.qml index 6137ad8cd4..df0af7e748 100644 --- a/src/imports/controls/designer/TabButtonSpecifics.qml +++ b/src/imports/controls/designer/TabButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml index f8cf92e8b6..785d7a5017 100644 --- a/src/imports/controls/designer/TextAreaSpecifics.qml +++ b/src/imports/controls/designer/TextAreaSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml index f95f282c9b..33a90f2ae8 100644 --- a/src/imports/controls/designer/TextFieldSpecifics.qml +++ b/src/imports/controls/designer/TextFieldSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/imports/controls/designer/ToolBarSpecifics.qml index acf02e7b59..2b1b17d2bb 100644 --- a/src/imports/controls/designer/ToolBarSpecifics.qml +++ b/src/imports/controls/designer/ToolBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/imports/controls/designer/ToolButtonSpecifics.qml index e094b9dfc9..5a46e72aff 100644 --- a/src/imports/controls/designer/ToolButtonSpecifics.qml +++ b/src/imports/controls/designer/ToolButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/ToolSeparatorSpecifics.qml b/src/imports/controls/designer/ToolSeparatorSpecifics.qml index d0ebd57c96..a62147ecaf 100644 --- a/src/imports/controls/designer/ToolSeparatorSpecifics.qml +++ b/src/imports/controls/designer/ToolSeparatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/designer/TumblerSpecifics.qml b/src/imports/controls/designer/TumblerSpecifics.qml index 04507ef62e..25fb927581 100644 --- a/src/imports/controls/designer/TumblerSpecifics.qml +++ b/src/imports/controls/designer/TumblerSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick +import HelperWidgets +import QtQuick.Layouts Column { width: parent.width diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml index 11c7e80248..1b65a824b0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { //! [action] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml index 93ba9c447a..8daffed7cf 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls BusyIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml index 3145a6effa..095657b5a6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Button { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml index ec9d773e18..36d1f84818 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Button { icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml index 3bd35a8440..3fe434e4a0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Button { text: "Button" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml index 1ff1f0a8ff..59054f7714 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Button { text: "Button" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml index 806655a340..93ebe46dca 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls CheckBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml index a32e9f5fa6..c503216586 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] Column { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml index b8fbbf69b5..91970f529f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls CheckDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml index 9f2ad92834..b420e3a572 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [combobox] ComboBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml index b902dab1e8..fea7e6d5ec 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ComboBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-valuerole.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-valuerole.qml index 4d7ae3d31c..a4c40c0f0b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-valuerole.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-valuerole.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.14 +import QtQuick +import QtQuick.Controls //! [file] ApplicationWindow { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml index 4bcbaa6778..0b86f1d002 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls DelayButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml index 0221350dc3..170e9ccf09 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Dial { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml index c8a71e5b37..d60e4e309b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml index be0e6f023c..6acb74e59c 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml index 2953c3712e..13fbb0e843 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml index f71f91cbc3..45a0b9e920 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] DialogButtonBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml index adfd803561..bcfd405b12 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] DialogButtonBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml index 0e90f0aacc..798f95da13 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Frame { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml index 8f8f9c233c..71b9b310d4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls //! [1] Frame { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml index 5f6ee59130..91689d9fae 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml index 7ccb55c3a3..e3355b2337 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls GroupBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml index 67c68cf316..e9f1c7dcc0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-headerview-simple.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-headerview-simple.qml index 07ec84d878..6878904f3c 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-headerview-simple.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-headerview-simple.qml @@ -49,9 +49,9 @@ ****************************************************************************/ //![file] -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Controls +import Qt.labs.qmlmodels ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml index d6ec5f788c..fd52b46f32 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ItemDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml index 8f483ed910..70d6104f52 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml index e984fc71c3..cc88d00f42 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Label { text: qsTr("Label") diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml index fb68bb0430..c492af50d4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] Label { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml index 5191efce2f..aa4c62b8e5 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Material Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml index cdbc16cceb..f64e48d225 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml index e15bc21636..f9e189f17a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material Pane { contentWidth: 120 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml index 003b562424..070576f541 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml index 955290fd8a..586433c369 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml index ce8a0356c0..1283fb4332 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts Pane { implicitWidth: 400 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml index 5a702b9f62..3e766e8a7a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml index ea27acf6fc..4b3d641e21 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml index 87371877ee..7ae22ae8c2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [begin] ApplicationWindow { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml index ea2d6ae767..fa7fa14a44 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml index 0712c5faa5..cd5d544155 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml index 8913e5bdb7..9751f05781 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Window Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml index 96fb606f27..a4951d1386 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Window Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml index 7f828d9328..ba0d2db958 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls PageIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml index 0a40c8b06b..8f2221ee4e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 +import QtQuick.Controls Pane { //! [1] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml index 0eeec4d857..b3912efe7a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml @@ -24,8 +24,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] PageIndicator { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml index dfe2eaa402..855423c4c2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Pane { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml index 9ed7a5b42a..a8c8672e77 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls //! [1] Pane { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml index 9408cd66b3..ad5481e34d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Window Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml index 6d46b81008..76ec20cdb2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { //! [centerIn] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml index e23c14382c..d96161577b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ProgressBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml index 1361f09e43..b33ce6b6d9 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RadioButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml index 27ad9da23c..ed3dae678a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RadioDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml index b8510ddd5e..fcddc40067 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RangeSlider { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml index 4f727344c4..201ee24403 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] RoundButton { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml index a4a66e9336..bd417955e4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml index 5efcb4610e..0aea2572d9 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml index 43e2853e40..7ca6661557 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml index 942722a593..c608dac44a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] Flickable { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml index 6cb749e654..719b9393f1 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml index 616c877d28..b18d391c4d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml index f1b99bca47..0d6c4529dd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml index 9010f0aff8..1a80d263b7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml index 26b0b5c4d8..8386172035 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [file] ScrollView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml index 6907d67437..f1fbb62724 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml index f5c3397584..78098eaaa6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [file] ScrollView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml index cbdf9eb8ec..dce07b39f0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Rectangle { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml index 7745892dfd..c3d7f4b2d1 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Slider { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml index ad05d46343..89f6244f70 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SpinBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml index 6f1bb55bf8..852ee5be6f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml index dd58b5abf5..c1879d9314 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml index 32d39b9f41..8772274969 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml index 96e8ad2fd1..570c3acd33 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-splitview-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml index cfeab812d2..64cdb3ceb9 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls StackView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml index a9298460d6..0e1a0dd495 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] StackView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml index 432fcc874d..c89b96a42f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwipeDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml index 6b71a5f0ba..dc0d58a2ca 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] SwipeDelegate { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml index 6e02c057de..dcab908ebd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml index 40833ddeb0..b8cddb315a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwipeView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml index 1869a03270..98b381f14e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml index a7dd2eea40..9adccbed2f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Switch { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml index 1906082409..bea35f29ea 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwitchDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml index c06c44c702..eba4825632 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TabBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml index 01f0d87572..5f5482551f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 360 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml index 628aef8027..8e41bbf0ca 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 360 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml index cbf6d72813..7a02f37521 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Column { width: 300 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml index 0aae7d15e3..e7240db4dc 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] TabBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml index 3ce856acaf..e4f1b397d4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextArea { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml index e16c6bbf0b..52d9996e9b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml index e48e0d6581..8f1aba233e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextField { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml index 18634d5e03..3d92b64760 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml index 5d8e067bc5..f276198857 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml index b0a04674e7..c9208c0e8f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml index 3d26e510b3..2cb9d0c5c7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml index e1c8c58037..2ed5c23fb0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Item { width: children[0].implicitWidth * 2 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml index cf5bc70e4e..8eb27430da 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml index e26986cc3b..f630256dd9 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml index 2ccfb43956..514b97fa68 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls //! [1] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml index 6a0a5b38c2..7b40c974b6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { ToolTip { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml index 812b5ba2c5..6d1ee4c41b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] Button { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml index 927d29c3c2..cea495538b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [1] Button { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml index 508a417edb..5f40822457 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml index a4e92f880a..2e5231dc40 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml index ee054106ca..792e0e14bc 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Tumbler { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml index 7d16d1393e..54ce78afd3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [contentItem] Tumbler { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml index 61e4ce01fd..408b747920 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls //! [contentItem] Tumbler { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml index 13130f971e..d9edb2cb00 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml @@ -26,9 +26,9 @@ ****************************************************************************/ //! [tumbler] -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Rectangle { width: frame.implicitWidth + 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml index c54a18a00a..f429359e4f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Universal Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml index f22b53089a..558618e65e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Universal Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml index 8c5b99a350..39a292d88b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Universal Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml index 1f0d6bd02d..b55bf188bf 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Universal Pane { padding: 10 diff --git a/src/imports/controls/fusion/ApplicationWindow.qml b/src/imports/controls/fusion/ApplicationWindow.qml index 26dfbbdf83..090d361c02 100644 --- a/src/imports/controls/fusion/ApplicationWindow.qml +++ b/src/imports/controls/fusion/ApplicationWindow.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ApplicationWindow { id: window diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/imports/controls/fusion/BusyIndicator.qml index 554c3368de..e5f5b75ada 100644 --- a/src/imports/controls/fusion/BusyIndicator.qml +++ b/src/imports/controls/fusion/BusyIndicator.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.BusyIndicator { id: control diff --git a/src/imports/controls/fusion/Button.qml b/src/imports/controls/fusion/Button.qml index 7822634de3..f0a8bfcdef 100644 --- a/src/imports/controls/fusion/Button.qml +++ b/src/imports/controls/fusion/Button.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Button { id: control diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml index edb4c77faa..fec41f2234 100644 --- a/src/imports/controls/fusion/CheckBox.qml +++ b/src/imports/controls/fusion/CheckBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.CheckBox { id: control diff --git a/src/imports/controls/fusion/CheckDelegate.qml b/src/imports/controls/fusion/CheckDelegate.qml index 1b97b1fd38..81c5da0b7d 100644 --- a/src/imports/controls/fusion/CheckDelegate.qml +++ b/src/imports/controls/fusion/CheckDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.CheckDelegate { id: control diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index 64e9603ffe..b8ad32e9b7 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -34,13 +34,13 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Controls.Fusion 2.15 -import QtQuick.Controls.Fusion.impl 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ComboBox { id: control diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml index 622de111df..9a9371fbf6 100644 --- a/src/imports/controls/fusion/DelayButton.qml +++ b/src/imports/controls/fusion/DelayButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.DelayButton { id: control diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml index 3c22c66a29..94558e3bc0 100644 --- a/src/imports/controls/fusion/Dial.qml +++ b/src/imports/controls/fusion/Dial.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Dial { id: control diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml index 79e179d9e8..600777d989 100644 --- a/src/imports/controls/fusion/Dialog.qml +++ b/src/imports/controls/fusion/Dialog.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Dialog { id: control diff --git a/src/imports/controls/fusion/DialogButtonBox.qml b/src/imports/controls/fusion/DialogButtonBox.qml index a0b0f243c2..101c0ba301 100644 --- a/src/imports/controls/fusion/DialogButtonBox.qml +++ b/src/imports/controls/fusion/DialogButtonBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.DialogButtonBox { id: control diff --git a/src/imports/controls/fusion/Drawer.qml b/src/imports/controls/fusion/Drawer.qml index 5a23dde1ff..2f7e510e52 100644 --- a/src/imports/controls/fusion/Drawer.qml +++ b/src/imports/controls/fusion/Drawer.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Drawer { id: control diff --git a/src/imports/controls/fusion/Frame.qml b/src/imports/controls/fusion/Frame.qml index c2df635198..d0d7d8f2b0 100644 --- a/src/imports/controls/fusion/Frame.qml +++ b/src/imports/controls/fusion/Frame.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Frame { id: control diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/imports/controls/fusion/GroupBox.qml index 3df3e1e60d..501db7acef 100644 --- a/src/imports/controls/fusion/GroupBox.qml +++ b/src/imports/controls/fusion/GroupBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.GroupBox { id: control diff --git a/src/imports/controls/fusion/HorizontalHeaderView.qml b/src/imports/controls/fusion/HorizontalHeaderView.qml index bbd9dc3f13..ef4db4b573 100644 --- a/src/imports/controls/fusion/HorizontalHeaderView.qml +++ b/src/imports/controls/fusion/HorizontalHeaderView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.HorizontalHeaderView { id: control diff --git a/src/imports/controls/fusion/ItemDelegate.qml b/src/imports/controls/fusion/ItemDelegate.qml index 4c15ae6889..a90dc8e4f5 100644 --- a/src/imports/controls/fusion/ItemDelegate.qml +++ b/src/imports/controls/fusion/ItemDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ItemDelegate { id: control diff --git a/src/imports/controls/fusion/Label.qml b/src/imports/controls/fusion/Label.qml index 9821f71c98..ddd1634ca5 100644 --- a/src/imports/controls/fusion/Label.qml +++ b/src/imports/controls/fusion/Label.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Label { id: control diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml index 8bace6b93f..8ce88e3717 100644 --- a/src/imports/controls/fusion/Menu.qml +++ b/src/imports/controls/fusion/Menu.qml @@ -34,13 +34,13 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl +import QtQuick.Window T.Menu { id: control diff --git a/src/imports/controls/fusion/MenuBar.qml b/src/imports/controls/fusion/MenuBar.qml index 4ba71feed6..1f54d6f2a9 100644 --- a/src/imports/controls/fusion/MenuBar.qml +++ b/src/imports/controls/fusion/MenuBar.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.MenuBar { id: control diff --git a/src/imports/controls/fusion/MenuBarItem.qml b/src/imports/controls/fusion/MenuBarItem.qml index 9fa685dcc0..c12bd3446c 100644 --- a/src/imports/controls/fusion/MenuBarItem.qml +++ b/src/imports/controls/fusion/MenuBarItem.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.MenuBarItem { id: control diff --git a/src/imports/controls/fusion/MenuItem.qml b/src/imports/controls/fusion/MenuItem.qml index ebd727e09e..2f179b1773 100644 --- a/src/imports/controls/fusion/MenuItem.qml +++ b/src/imports/controls/fusion/MenuItem.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.MenuItem { id: control diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/imports/controls/fusion/MenuSeparator.qml index 522ada150e..1ff0dfa8e8 100644 --- a/src/imports/controls/fusion/MenuSeparator.qml +++ b/src/imports/controls/fusion/MenuSeparator.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.MenuSeparator { id: control diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml index ce4b1d54c8..3353f15546 100644 --- a/src/imports/controls/fusion/Page.qml +++ b/src/imports/controls/fusion/Page.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Page { id: control diff --git a/src/imports/controls/fusion/PageIndicator.qml b/src/imports/controls/fusion/PageIndicator.qml index 5679b14f29..907a86cba1 100644 --- a/src/imports/controls/fusion/PageIndicator.qml +++ b/src/imports/controls/fusion/PageIndicator.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.PageIndicator { id: control diff --git a/src/imports/controls/fusion/Pane.qml b/src/imports/controls/fusion/Pane.qml index 28be3b47f3..a05092dc0e 100644 --- a/src/imports/controls/fusion/Pane.qml +++ b/src/imports/controls/fusion/Pane.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Pane { id: control diff --git a/src/imports/controls/fusion/Popup.qml b/src/imports/controls/fusion/Popup.qml index 25a8c5ae07..75923a1f2e 100644 --- a/src/imports/controls/fusion/Popup.qml +++ b/src/imports/controls/fusion/Popup.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Popup { id: control diff --git a/src/imports/controls/fusion/ProgressBar.qml b/src/imports/controls/fusion/ProgressBar.qml index a522563a5f..91ccbf195d 100644 --- a/src/imports/controls/fusion/ProgressBar.qml +++ b/src/imports/controls/fusion/ProgressBar.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ProgressBar { id: control diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml index a940aff3cc..81100e9c57 100644 --- a/src/imports/controls/fusion/RadioButton.qml +++ b/src/imports/controls/fusion/RadioButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.RadioButton { id: control diff --git a/src/imports/controls/fusion/RadioDelegate.qml b/src/imports/controls/fusion/RadioDelegate.qml index e8555a17e1..701a58f738 100644 --- a/src/imports/controls/fusion/RadioDelegate.qml +++ b/src/imports/controls/fusion/RadioDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.RadioDelegate { id: control diff --git a/src/imports/controls/fusion/RangeSlider.qml b/src/imports/controls/fusion/RangeSlider.qml index 7edbed5763..3a635459b6 100644 --- a/src/imports/controls/fusion/RangeSlider.qml +++ b/src/imports/controls/fusion/RangeSlider.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.RangeSlider { id: control diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/imports/controls/fusion/RoundButton.qml index 59bf4c16d2..3fa2778349 100644 --- a/src/imports/controls/fusion/RoundButton.qml +++ b/src/imports/controls/fusion/RoundButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.RoundButton { id: control diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/imports/controls/fusion/ScrollBar.qml index 93b58f0e34..4288adb521 100644 --- a/src/imports/controls/fusion/ScrollBar.qml +++ b/src/imports/controls/fusion/ScrollBar.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ScrollBar { id: control diff --git a/src/imports/controls/fusion/ScrollIndicator.qml b/src/imports/controls/fusion/ScrollIndicator.qml index efe0b2fa81..c8ffb076c9 100644 --- a/src/imports/controls/fusion/ScrollIndicator.qml +++ b/src/imports/controls/fusion/ScrollIndicator.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ScrollIndicator { id: control diff --git a/src/imports/controls/fusion/Slider.qml b/src/imports/controls/fusion/Slider.qml index d212a233b0..9d0dbb7ae1 100644 --- a/src/imports/controls/fusion/Slider.qml +++ b/src/imports/controls/fusion/Slider.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Slider { id: control diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/imports/controls/fusion/SpinBox.qml index 44387e3c30..a94451cb05 100644 --- a/src/imports/controls/fusion/SpinBox.qml +++ b/src/imports/controls/fusion/SpinBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.SpinBox { id: control diff --git a/src/imports/controls/fusion/SplitView.qml b/src/imports/controls/fusion/SplitView.qml index 6a04b4da13..8da522e69e 100644 --- a/src/imports/controls/fusion/SplitView.qml +++ b/src/imports/controls/fusion/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Templates 2.13 as T -import QtQuick.Controls 2.13 -import QtQuick.Controls.impl 2.13 -import QtQuick.Controls.Fusion 2.13 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion T.SplitView { id: control diff --git a/src/imports/controls/fusion/SwipeDelegate.qml b/src/imports/controls/fusion/SwipeDelegate.qml index 48c531ea44..107900b0a3 100644 --- a/src/imports/controls/fusion/SwipeDelegate.qml +++ b/src/imports/controls/fusion/SwipeDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.SwipeDelegate { id: control diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml index bf18003a8d..2ff19073ec 100644 --- a/src/imports/controls/fusion/Switch.qml +++ b/src/imports/controls/fusion/Switch.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Switch { id: control diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/imports/controls/fusion/SwitchDelegate.qml index 67c419244e..3c3c24e3e2 100644 --- a/src/imports/controls/fusion/SwitchDelegate.qml +++ b/src/imports/controls/fusion/SwitchDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.SwitchDelegate { id: control diff --git a/src/imports/controls/fusion/TabBar.qml b/src/imports/controls/fusion/TabBar.qml index 233a2acdfc..1707b305ec 100644 --- a/src/imports/controls/fusion/TabBar.qml +++ b/src/imports/controls/fusion/TabBar.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.TabBar { id: control diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml index 136503b6b3..3ee09eebfe 100644 --- a/src/imports/controls/fusion/TabButton.qml +++ b/src/imports/controls/fusion/TabButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.TabButton { id: control diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml index c7107ac444..336c699e73 100644 --- a/src/imports/controls/fusion/TextArea.qml +++ b/src/imports/controls/fusion/TextArea.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.TextArea { id: control diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml index d5b5788d2b..187aebaf66 100644 --- a/src/imports/controls/fusion/TextField.qml +++ b/src/imports/controls/fusion/TextField.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.TextField { id: control diff --git a/src/imports/controls/fusion/ToolBar.qml b/src/imports/controls/fusion/ToolBar.qml index fa069c0b75..73324de0f4 100644 --- a/src/imports/controls/fusion/ToolBar.qml +++ b/src/imports/controls/fusion/ToolBar.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ToolBar { id: control diff --git a/src/imports/controls/fusion/ToolButton.qml b/src/imports/controls/fusion/ToolButton.qml index 4c00b40275..65626ba16f 100644 --- a/src/imports/controls/fusion/ToolButton.qml +++ b/src/imports/controls/fusion/ToolButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ToolButton { id: control diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/imports/controls/fusion/ToolSeparator.qml index 5d36665214..6051e6fee1 100644 --- a/src/imports/controls/fusion/ToolSeparator.qml +++ b/src/imports/controls/fusion/ToolSeparator.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ToolSeparator { id: control diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/imports/controls/fusion/ToolTip.qml index b505e2c99d..bd1f3dd571 100644 --- a/src/imports/controls/fusion/ToolTip.qml +++ b/src/imports/controls/fusion/ToolTip.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.ToolTip { id: control diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml index c26bd14535..cbb8442317 100644 --- a/src/imports/controls/fusion/Tumbler.qml +++ b/src/imports/controls/fusion/Tumbler.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl T.Tumbler { id: control diff --git a/src/imports/controls/fusion/VerticalHeaderView.qml b/src/imports/controls/fusion/VerticalHeaderView.qml index b220cdf23b..7eeb65f1de 100644 --- a/src/imports/controls/fusion/VerticalHeaderView.qml +++ b/src/imports/controls/fusion/VerticalHeaderView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.VerticalHeaderView { id: control diff --git a/src/imports/controls/fusion/impl/ButtonPanel.qml b/src/imports/controls/fusion/impl/ButtonPanel.qml index 125aa2f3dd..bb0bd45efc 100644 --- a/src/imports/controls/fusion/impl/ButtonPanel.qml +++ b/src/imports/controls/fusion/impl/ButtonPanel.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl Rectangle { id: panel diff --git a/src/imports/controls/fusion/impl/CheckIndicator.qml b/src/imports/controls/fusion/impl/CheckIndicator.qml index f8c127c4dc..75d1c5d6ad 100644 --- a/src/imports/controls/fusion/impl/CheckIndicator.qml +++ b/src/imports/controls/fusion/impl/CheckIndicator.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl Rectangle { id: indicator diff --git a/src/imports/controls/fusion/impl/RadioIndicator.qml b/src/imports/controls/fusion/impl/RadioIndicator.qml index c73cd49f47..3dac4d7a1f 100644 --- a/src/imports/controls/fusion/impl/RadioIndicator.qml +++ b/src/imports/controls/fusion/impl/RadioIndicator.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl Rectangle { id: indicator diff --git a/src/imports/controls/fusion/impl/SliderGroove.qml b/src/imports/controls/fusion/impl/SliderGroove.qml index 381a02b598..62dc05c7f2 100644 --- a/src/imports/controls/fusion/impl/SliderGroove.qml +++ b/src/imports/controls/fusion/impl/SliderGroove.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl Rectangle { id: groove diff --git a/src/imports/controls/fusion/impl/SliderHandle.qml b/src/imports/controls/fusion/impl/SliderHandle.qml index c53af57e6a..e56642f4e1 100644 --- a/src/imports/controls/fusion/impl/SliderHandle.qml +++ b/src/imports/controls/fusion/impl/SliderHandle.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl Rectangle { id: handle diff --git a/src/imports/controls/fusion/impl/SwitchIndicator.qml b/src/imports/controls/fusion/impl/SwitchIndicator.qml index ae7c89a088..8d1a8096e1 100644 --- a/src/imports/controls/fusion/impl/SwitchIndicator.qml +++ b/src/imports/controls/fusion/impl/SwitchIndicator.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Fusion +import QtQuick.Controls.Fusion.impl Rectangle { id: indicator diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/imports/controls/imagine/ApplicationWindow.qml index 092da1f64a..b54527eb9e 100644 --- a/src/imports/controls/imagine/ApplicationWindow.qml +++ b/src/imports/controls/imagine/ApplicationWindow.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ApplicationWindow { id: window diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml index 652365b16d..163a64b435 100644 --- a/src/imports/controls/imagine/BusyIndicator.qml +++ b/src/imports/controls/imagine/BusyIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.BusyIndicator { id: control diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml index e7171eb14b..4d6b2ce0e3 100644 --- a/src/imports/controls/imagine/Button.qml +++ b/src/imports/controls/imagine/Button.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Button { id: control diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml index b91ceb40f2..a92837b502 100644 --- a/src/imports/controls/imagine/CheckBox.qml +++ b/src/imports/controls/imagine/CheckBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.CheckBox { id: control diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/imports/controls/imagine/CheckDelegate.qml index 1997515282..7017b47af0 100644 --- a/src/imports/controls/imagine/CheckDelegate.qml +++ b/src/imports/controls/imagine/CheckDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.CheckDelegate { id: control diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index d657e734ad..166ee7afe6 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls 2.15 -import QtQuick.Controls.Imagine 2.15 -import QtQuick.Controls.Imagine.impl 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ComboBox { id: control diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/imports/controls/imagine/DelayButton.qml index ed4ad1e523..e542eb695a 100644 --- a/src/imports/controls/imagine/DelayButton.qml +++ b/src/imports/controls/imagine/DelayButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.DelayButton { id: control diff --git a/src/imports/controls/imagine/Dial.qml b/src/imports/controls/imagine/Dial.qml index 83daf14a17..224bff56ad 100644 --- a/src/imports/controls/imagine/Dial.qml +++ b/src/imports/controls/imagine/Dial.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Dial { id: control diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml index 730b7f573b..46c22b6c51 100644 --- a/src/imports/controls/imagine/Dialog.qml +++ b/src/imports/controls/imagine/Dialog.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Dialog { id: control diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml index c24b29fc48..5094582a00 100644 --- a/src/imports/controls/imagine/DialogButtonBox.qml +++ b/src/imports/controls/imagine/DialogButtonBox.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.DialogButtonBox { id: control diff --git a/src/imports/controls/imagine/Drawer.qml b/src/imports/controls/imagine/Drawer.qml index 8f2786213e..414516d307 100644 --- a/src/imports/controls/imagine/Drawer.qml +++ b/src/imports/controls/imagine/Drawer.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Drawer { id: control diff --git a/src/imports/controls/imagine/Frame.qml b/src/imports/controls/imagine/Frame.qml index 2bef3c88a9..7ba93dbceb 100644 --- a/src/imports/controls/imagine/Frame.qml +++ b/src/imports/controls/imagine/Frame.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Frame { id: control diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml index 7abdb6f05c..ecee0691aa 100644 --- a/src/imports/controls/imagine/GroupBox.qml +++ b/src/imports/controls/imagine/GroupBox.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.GroupBox { id: control diff --git a/src/imports/controls/imagine/HorizontalHeaderView.qml b/src/imports/controls/imagine/HorizontalHeaderView.qml index ec91af258e..093c868b32 100644 --- a/src/imports/controls/imagine/HorizontalHeaderView.qml +++ b/src/imports/controls/imagine/HorizontalHeaderView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.HorizontalHeaderView { id: control diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/imports/controls/imagine/ItemDelegate.qml index 0b3edeaff9..8073bec413 100644 --- a/src/imports/controls/imagine/ItemDelegate.qml +++ b/src/imports/controls/imagine/ItemDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ItemDelegate { id: control diff --git a/src/imports/controls/imagine/Label.qml b/src/imports/controls/imagine/Label.qml index 82c0ef475f..3654cd7d8a 100644 --- a/src/imports/controls/imagine/Label.qml +++ b/src/imports/controls/imagine/Label.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Label { id: control diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index 832565e6b1..162edda02c 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl +import QtQuick.Window T.Menu { id: control diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/imports/controls/imagine/MenuItem.qml index f85fc657f2..717d6af548 100644 --- a/src/imports/controls/imagine/MenuItem.qml +++ b/src/imports/controls/imagine/MenuItem.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.MenuItem { id: control diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/imports/controls/imagine/MenuSeparator.qml index 9ed3908736..42d1812fa5 100644 --- a/src/imports/controls/imagine/MenuSeparator.qml +++ b/src/imports/controls/imagine/MenuSeparator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.MenuSeparator { id: control diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml index 07ec0a758f..1b77112f3d 100644 --- a/src/imports/controls/imagine/Page.qml +++ b/src/imports/controls/imagine/Page.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Page { id: control diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/imports/controls/imagine/PageIndicator.qml index 8da89f5a16..ba9bb85c62 100644 --- a/src/imports/controls/imagine/PageIndicator.qml +++ b/src/imports/controls/imagine/PageIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.PageIndicator { id: control diff --git a/src/imports/controls/imagine/Pane.qml b/src/imports/controls/imagine/Pane.qml index 970b22b94d..4fdfaa18ce 100644 --- a/src/imports/controls/imagine/Pane.qml +++ b/src/imports/controls/imagine/Pane.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Pane { id: control diff --git a/src/imports/controls/imagine/Popup.qml b/src/imports/controls/imagine/Popup.qml index 8f69bef463..bc7e544be7 100644 --- a/src/imports/controls/imagine/Popup.qml +++ b/src/imports/controls/imagine/Popup.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Popup { id: control diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/imports/controls/imagine/ProgressBar.qml index 69d352eb38..0c2ed8d79b 100644 --- a/src/imports/controls/imagine/ProgressBar.qml +++ b/src/imports/controls/imagine/ProgressBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ProgressBar { id: control diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml index a50bc12765..e1a81321b2 100644 --- a/src/imports/controls/imagine/RadioButton.qml +++ b/src/imports/controls/imagine/RadioButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.RadioButton { id: control diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/imports/controls/imagine/RadioDelegate.qml index 5a8356f878..f8bf6c4448 100644 --- a/src/imports/controls/imagine/RadioDelegate.qml +++ b/src/imports/controls/imagine/RadioDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.RadioDelegate { id: control diff --git a/src/imports/controls/imagine/RangeSlider.qml b/src/imports/controls/imagine/RangeSlider.qml index 47d90cf3e1..37f59a3a13 100644 --- a/src/imports/controls/imagine/RangeSlider.qml +++ b/src/imports/controls/imagine/RangeSlider.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.RangeSlider { id: control diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml index fe4cbb3663..fe3c3da65b 100644 --- a/src/imports/controls/imagine/RoundButton.qml +++ b/src/imports/controls/imagine/RoundButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.RoundButton { id: control diff --git a/src/imports/controls/imagine/ScrollBar.qml b/src/imports/controls/imagine/ScrollBar.qml index 68772e12d6..f512a0b71c 100644 --- a/src/imports/controls/imagine/ScrollBar.qml +++ b/src/imports/controls/imagine/ScrollBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ScrollBar { id: control diff --git a/src/imports/controls/imagine/ScrollIndicator.qml b/src/imports/controls/imagine/ScrollIndicator.qml index 896cd87685..316b749c50 100644 --- a/src/imports/controls/imagine/ScrollIndicator.qml +++ b/src/imports/controls/imagine/ScrollIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ScrollIndicator { id: control diff --git a/src/imports/controls/imagine/ScrollView.qml b/src/imports/controls/imagine/ScrollView.qml index 9d469ba535..a251a827c0 100644 --- a/src/imports/controls/imagine/ScrollView.qml +++ b/src/imports/controls/imagine/ScrollView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ScrollView { id: control diff --git a/src/imports/controls/imagine/Slider.qml b/src/imports/controls/imagine/Slider.qml index fe9c338880..597e222ad4 100644 --- a/src/imports/controls/imagine/Slider.qml +++ b/src/imports/controls/imagine/Slider.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Slider { id: control diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/imports/controls/imagine/SpinBox.qml index 6113580676..6d1bdababb 100644 --- a/src/imports/controls/imagine/SpinBox.qml +++ b/src/imports/controls/imagine/SpinBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.SpinBox { id: control diff --git a/src/imports/controls/imagine/SplitView.qml b/src/imports/controls/imagine/SplitView.qml index a4a858f430..36e1b2134a 100644 --- a/src/imports/controls/imagine/SplitView.qml +++ b/src/imports/controls/imagine/SplitView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Templates 2.13 as T -import QtQuick.Controls.Imagine 2.13 -import QtQuick.Controls.Imagine.impl 2.13 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.SplitView { id: control diff --git a/src/imports/controls/imagine/StackView.qml b/src/imports/controls/imagine/StackView.qml index 407b1d15dd..a9ddac66d6 100644 --- a/src/imports/controls/imagine/StackView.qml +++ b/src/imports/controls/imagine/StackView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.StackView { id: control diff --git a/src/imports/controls/imagine/SwipeDelegate.qml b/src/imports/controls/imagine/SwipeDelegate.qml index 3850253f63..ff0924b4e4 100644 --- a/src/imports/controls/imagine/SwipeDelegate.qml +++ b/src/imports/controls/imagine/SwipeDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.SwipeDelegate { id: control diff --git a/src/imports/controls/imagine/SwipeView.qml b/src/imports/controls/imagine/SwipeView.qml index 70d65fef56..12cafbb815 100644 --- a/src/imports/controls/imagine/SwipeView.qml +++ b/src/imports/controls/imagine/SwipeView.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.SwipeView { id: control diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml index 50b407acb4..a2f7a9a7f4 100644 --- a/src/imports/controls/imagine/Switch.qml +++ b/src/imports/controls/imagine/Switch.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Switch { id: control diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/imports/controls/imagine/SwitchDelegate.qml index 73e5aac014..5b4b28365d 100644 --- a/src/imports/controls/imagine/SwitchDelegate.qml +++ b/src/imports/controls/imagine/SwitchDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.SwitchDelegate { id: control diff --git a/src/imports/controls/imagine/TabBar.qml b/src/imports/controls/imagine/TabBar.qml index 69516e03e4..26c30e926e 100644 --- a/src/imports/controls/imagine/TabBar.qml +++ b/src/imports/controls/imagine/TabBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.TabBar { id: control diff --git a/src/imports/controls/imagine/TabButton.qml b/src/imports/controls/imagine/TabButton.qml index 1cdcfc4bd4..bdd27b932c 100644 --- a/src/imports/controls/imagine/TabButton.qml +++ b/src/imports/controls/imagine/TabButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.TabButton { id: control diff --git a/src/imports/controls/imagine/TextArea.qml b/src/imports/controls/imagine/TextArea.qml index c7505b5209..43c34bd213 100644 --- a/src/imports/controls/imagine/TextArea.qml +++ b/src/imports/controls/imagine/TextArea.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.TextArea { id: control diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml index 3ff0ad4431..e6f0c8892c 100644 --- a/src/imports/controls/imagine/TextField.qml +++ b/src/imports/controls/imagine/TextField.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.TextField { id: control diff --git a/src/imports/controls/imagine/ToolBar.qml b/src/imports/controls/imagine/ToolBar.qml index 99bcd3ba97..4a343e3c03 100644 --- a/src/imports/controls/imagine/ToolBar.qml +++ b/src/imports/controls/imagine/ToolBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ToolBar { id: control diff --git a/src/imports/controls/imagine/ToolButton.qml b/src/imports/controls/imagine/ToolButton.qml index cc22f88d29..4f1c43b1ae 100644 --- a/src/imports/controls/imagine/ToolButton.qml +++ b/src/imports/controls/imagine/ToolButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ToolButton { id: control diff --git a/src/imports/controls/imagine/ToolSeparator.qml b/src/imports/controls/imagine/ToolSeparator.qml index c0887e4d62..962c14c741 100644 --- a/src/imports/controls/imagine/ToolSeparator.qml +++ b/src/imports/controls/imagine/ToolSeparator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ToolSeparator { id: control diff --git a/src/imports/controls/imagine/ToolTip.qml b/src/imports/controls/imagine/ToolTip.qml index 21d75ebcb5..f52614000e 100644 --- a/src/imports/controls/imagine/ToolTip.qml +++ b/src/imports/controls/imagine/ToolTip.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.ToolTip { id: control diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml index b53b626593..79c719bf12 100644 --- a/src/imports/controls/imagine/Tumbler.qml +++ b/src/imports/controls/imagine/Tumbler.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl T.Tumbler { id: control diff --git a/src/imports/controls/imagine/VerticalHeaderView.qml b/src/imports/controls/imagine/VerticalHeaderView.qml index 3fc9ca5ace..21e39c3983 100644 --- a/src/imports/controls/imagine/VerticalHeaderView.qml +++ b/src/imports/controls/imagine/VerticalHeaderView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T T.VerticalHeaderView { id: control diff --git a/src/imports/controls/imagine/impl/OpacityMask.qml b/src/imports/controls/imagine/impl/OpacityMask.qml index 9017538687..2f1ab13993 100644 --- a/src/imports/controls/imagine/impl/OpacityMask.qml +++ b/src/imports/controls/imagine/impl/OpacityMask.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick /* A cross-graphics API implementation of QtGraphicalEffects' OpacityMask. diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 5b8cefacd0..82a0da8b3a 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls.Material T.ApplicationWindow { id: window diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 8173248cd2..621b2b434a 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.BusyIndicator { id: control diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 04c6664c34..9bda0128de 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Button { id: control diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 159e2f12dc..a3f717be6a 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.CheckBox { id: control diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index c7d7575ee8..e5ea571637 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.CheckDelegate { id: control diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 791e57ab76..7abb8dddfd 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -34,13 +34,13 @@ ** ****************************************************************************/ -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.Controls.Material 2.15 -import QtQuick.Controls.Material.impl 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.ComboBox { id: control diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml index 6b5ef3ad00..68773b0423 100644 --- a/src/imports/controls/material/DelayButton.qml +++ b/src/imports/controls/material/DelayButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.DelayButton { id: control diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index 1ad9a0ce20..2731436f60 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Dial { id: control diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 364c0e570d..0a711eeceb 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/Dialog.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Dialog { id: control diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index c53b821034..fda957b190 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.DialogButtonBox { id: control diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index 3d64cdef47..93c4bf5698 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Drawer { id: control diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 0001825ea4..8626f7661a 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Frame { id: control diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index e18a5949ec..4a27b83241 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.GroupBox { id: control diff --git a/src/imports/controls/material/HorizontalHeaderView.qml b/src/imports/controls/material/HorizontalHeaderView.qml index fd672f34a9..f6c76c4a9c 100644 --- a/src/imports/controls/material/HorizontalHeaderView.qml +++ b/src/imports/controls/material/HorizontalHeaderView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Material 2.15 -import QtQuick.Controls.Material.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.HorizontalHeaderView { id: control diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index 2078ce6cb5..f8cf41df63 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.ItemDelegate { id: control diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index ad923a24d5..77e85f4297 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.Label { id: control diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 94bcc15ed6..8e362964d4 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl +import QtQuick.Window T.Menu { id: control diff --git a/src/imports/controls/material/MenuBar.qml b/src/imports/controls/material/MenuBar.qml index 66252d6edb..621cfbd523 100644 --- a/src/imports/controls/material/MenuBar.qml +++ b/src/imports/controls/material/MenuBar.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.MenuBar { id: control diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/imports/controls/material/MenuBarItem.qml index 588d6fbb7a..957ee867aa 100644 --- a/src/imports/controls/material/MenuBarItem.qml +++ b/src/imports/controls/material/MenuBarItem.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.MenuBarItem { id: control diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index cb558e4c5f..522efd4d58 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.MenuItem { id: control diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/imports/controls/material/MenuSeparator.qml index 6d80c04906..08a33ffe15 100644 --- a/src/imports/controls/material/MenuSeparator.qml +++ b/src/imports/controls/material/MenuSeparator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.MenuSeparator { id: control diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 4da0ecc6e0..711fac2ddb 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.Page { id: control diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 5e6ca24520..8ccd7de3ab 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.PageIndicator { id: control diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index 988e225aae..055a8d236d 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Pane { id: control diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 1b576385c0..cb5b62ece7 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Popup { id: control diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index 2848f0371f..dd4fae0e36 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.ProgressBar { id: control diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index dadcc84f32..664cb19ecd 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.RadioButton { id: control diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index c977d33209..f9737fa5d9 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.RadioDelegate { id: control diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index f05601a7e0..d1d22115aa 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.RangeSlider { id: control diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index 13d0f9dbe4..79f4a24985 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/RoundButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.RoundButton { id: control diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index fda643462e..55de0d13d1 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.ScrollBar { id: control diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 19f23ad2d4..bc81c630ee 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.ScrollIndicator { id: control diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index ac7a0c420d..2a36673434 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.Slider { id: control diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index 23c86bc3d5..4f69dd2512 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.SpinBox { id: control diff --git a/src/imports/controls/material/SplitView.qml b/src/imports/controls/material/SplitView.qml index 5544e833e9..e6e3ed3b1b 100644 --- a/src/imports/controls/material/SplitView.qml +++ b/src/imports/controls/material/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Templates 2.13 as T -import QtQuick.Controls 2.13 -import QtQuick.Controls.impl 2.13 -import QtQuick.Controls.Material 2.13 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material T.SplitView { id: control diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml index dd5d6ce657..4c3e6749ac 100644 --- a/src/imports/controls/material/StackView.qml +++ b/src/imports/controls/material/StackView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.StackView { id: control diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index d06799be02..16ef8ea28f 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.SwipeDelegate { id: control diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml index a84f16c5b0..cd4da229c2 100644 --- a/src/imports/controls/material/SwipeView.qml +++ b/src/imports/controls/material/SwipeView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.SwipeView { id: control diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index fd0db9256c..a43e87309b 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl +import QtQuick.Templates as T T.Switch { id: control diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index 834a3dfa85..dd1c4e8daa 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.SwitchDelegate { id: control diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 98c9132ae5..9e9585f31b 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.TabBar { id: control diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 5245652c23..eacc95b818 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.TabButton { id: control diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index 249b64017c..b15294379a 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.TextArea { id: control diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index ed42b295d4..2c123c9184 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.TextField { id: control diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 5b887598eb..a1aa82bda5 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.ToolBar { id: control diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 69c424414e..dc27157fd4 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.ToolButton { id: control diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml index 9436765733..4bce553d1e 100644 --- a/src/imports/controls/material/ToolSeparator.qml +++ b/src/imports/controls/material/ToolSeparator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.ToolSeparator { id: control diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index 83afe4b1f1..033e48a3fa 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Material T.ToolTip { id: control diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 973b4a68ec..81e350442e 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.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.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Material T.Tumbler { id: control diff --git a/src/imports/controls/material/VerticalHeaderView.qml b/src/imports/controls/material/VerticalHeaderView.qml index 5fc5aebeab..1a38b30ad1 100644 --- a/src/imports/controls/material/VerticalHeaderView.qml +++ b/src/imports/controls/material/VerticalHeaderView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Material 2.15 -import QtQuick.Controls.Material.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl T.VerticalHeaderView { id: control diff --git a/src/imports/controls/material/impl/BoxShadow.qml b/src/imports/controls/material/impl/BoxShadow.qml index 5a746c0f9b..ea09570e7a 100644 --- a/src/imports/controls/material/impl/BoxShadow.qml +++ b/src/imports/controls/material/impl/BoxShadow.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl /* A implementation of CSS's box-shadow, used by ElevationEffect for a Material Design diff --git a/src/imports/controls/material/impl/CheckIndicator.qml b/src/imports/controls/material/impl/CheckIndicator.qml index ecaa673dca..b6593fab8a 100644 --- a/src/imports/controls/material/impl/CheckIndicator.qml +++ b/src/imports/controls/material/impl/CheckIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl Rectangle { id: indicatorItem diff --git a/src/imports/controls/material/impl/CursorDelegate.qml b/src/imports/controls/material/impl/CursorDelegate.qml index fe2d25c675..a913ab849d 100644 --- a/src/imports/controls/material/impl/CursorDelegate.qml +++ b/src/imports/controls/material/impl/CursorDelegate.qml @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls.Material Rectangle { id: cursor diff --git a/src/imports/controls/material/impl/ElevationEffect.qml b/src/imports/controls/material/impl/ElevationEffect.qml index 73a2a238f9..8a4e98e320 100644 --- a/src/imports/controls/material/impl/ElevationEffect.qml +++ b/src/imports/controls/material/impl/ElevationEffect.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl /* An effect for standard Material Design elevation shadows. Useful for using as \c layer.effect. diff --git a/src/imports/controls/material/impl/RadioIndicator.qml b/src/imports/controls/material/impl/RadioIndicator.qml index e2c551848d..68681c44fb 100644 --- a/src/imports/controls/material/impl/RadioIndicator.qml +++ b/src/imports/controls/material/impl/RadioIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl Rectangle { id: indicator diff --git a/src/imports/controls/material/impl/RectangularGlow.qml b/src/imports/controls/material/impl/RectangularGlow.qml index 7e09c1a5ba..b2337afc0b 100644 --- a/src/imports/controls/material/impl/RectangularGlow.qml +++ b/src/imports/controls/material/impl/RectangularGlow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick /* A cross-graphics API implementation of QtGraphicalEffects' RectangularGlow. diff --git a/src/imports/controls/material/impl/SliderHandle.qml b/src/imports/controls/material/impl/SliderHandle.qml index c9078bc8a9..60fd7aedf9 100644 --- a/src/imports/controls/material/impl/SliderHandle.qml +++ b/src/imports/controls/material/impl/SliderHandle.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl Item { id: root diff --git a/src/imports/controls/material/impl/SwitchIndicator.qml b/src/imports/controls/material/impl/SwitchIndicator.qml index 3034e771ac..ae1709b6e1 100644 --- a/src/imports/controls/material/impl/SwitchIndicator.qml +++ b/src/imports/controls/material/impl/SwitchIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Controls.Material.impl Item { id: indicator diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index 80cda477f5..2ec9c56566 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.ApplicationWindow { id: window diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index 2ad21b4691..0bd3ca038a 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.BusyIndicator { id: control diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 657b283532..2f88fe60ec 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.Button { id: control diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index 9494f4d2a7..ff35d37268 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.CheckBox { id: control diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index b544c42e0e..13de8c57d1 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.CheckDelegate { id: control diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index eb7fb09d65..1568d488aa 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.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.Controls.Universal 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ComboBox { id: control diff --git a/src/imports/controls/universal/DelayButton.qml b/src/imports/controls/universal/DelayButton.qml index 2a3a3b3a02..5840fa8649 100644 --- a/src/imports/controls/universal/DelayButton.qml +++ b/src/imports/controls/universal/DelayButton.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.DelayButton { id: control diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index 0d8fcba090..cd9e615edb 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Dial { id: control diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index 6151d0908b..5bec0992b2 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Universal T.Dialog { id: control diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 0458c39dab..1b1148e3df 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Universal T.DialogButtonBox { id: control diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 7ec1d7f88a..19f78f1e4b 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Drawer { id: control diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index 8bb4484996..780ba7348b 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Frame { id: control diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index dc156dd798..5104b710ca 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.GroupBox { id: control diff --git a/src/imports/controls/universal/HorizontalHeaderView.qml b/src/imports/controls/universal/HorizontalHeaderView.qml index 47daa8ce90..30bbbaaf21 100644 --- a/src/imports/controls/universal/HorizontalHeaderView.qml +++ b/src/imports/controls/universal/HorizontalHeaderView.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Universal 2.15 -import QtQuick.Controls.Universal.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.HorizontalHeaderView { id: control diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index ed98540597..694a896f41 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.ItemDelegate { id: control diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml index c66435c376..9460c997eb 100644 --- a/src/imports/controls/universal/Label.qml +++ b/src/imports/controls/universal/Label.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Label { id: control diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 4814d00655..080ea4824c 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Window T.Menu { id: control diff --git a/src/imports/controls/universal/MenuBar.qml b/src/imports/controls/universal/MenuBar.qml index 2317f50581..f09083aa34 100644 --- a/src/imports/controls/universal/MenuBar.qml +++ b/src/imports/controls/universal/MenuBar.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.MenuBar { id: control diff --git a/src/imports/controls/universal/MenuBarItem.qml b/src/imports/controls/universal/MenuBarItem.qml index 30f1fc57f7..eddc80908d 100644 --- a/src/imports/controls/universal/MenuBarItem.qml +++ b/src/imports/controls/universal/MenuBarItem.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.MenuBarItem { id: control diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 872f1ebab7..cf6d12c9f6 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.MenuItem { id: control diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/imports/controls/universal/MenuSeparator.qml index 72f9f6f7f2..be6fad4580 100644 --- a/src/imports/controls/universal/MenuSeparator.qml +++ b/src/imports/controls/universal/MenuSeparator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.MenuSeparator { id: control diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index 347d6d9a82..8946e7adbf 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Page { id: control diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index 3dcc84ab4a..2adb85c65c 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.PageIndicator { id: control diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index 63a5ecec45..257f9cafd0 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Pane { id: control diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index e39134e12f..5e972ea993 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Popup { id: control diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index ce79bd5470..4f8cc87428 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.ProgressBar { id: control diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index a50cdf9bcc..abd386ce9d 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.RadioButton { id: control diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 9fc910f345..e4656af94b 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.RadioDelegate { id: control diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index f2e4d71e9f..5bdc4d8f6d 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.RangeSlider { id: control diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 2eedf96eae..f9538f9926 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.RoundButton { id: control diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 8b8e325d95..d101658c8e 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ScrollBar { id: control diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index ab66ee7c97..f66a96587c 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ScrollIndicator { id: control diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 8f427b1ed3..37c77a3546 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Slider { id: control diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 56fdffdf7e..8f2271907d 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.SpinBox { id: control diff --git a/src/imports/controls/universal/SplitView.qml b/src/imports/controls/universal/SplitView.qml index a4ed22ddc0..e05d7235d5 100644 --- a/src/imports/controls/universal/SplitView.qml +++ b/src/imports/controls/universal/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Templates 2.13 as T -import QtQuick.Controls 2.13 -import QtQuick.Controls.impl 2.13 -import QtQuick.Controls.Universal 2.13 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.SplitView { id: control diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index 5a3f7751ea..41611dd36b 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.StackView { id: control diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 066049a789..10460bb858 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.SwipeDelegate { id: control diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 284b122913..33ee4abb96 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.Switch { id: control diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 56ba849436..7983580893 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.SwitchDelegate { id: control diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index c7d27cbd21..9b98c10e78 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.TabBar { id: control diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 66e3d72556..a68162c786 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.TabButton { id: control diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 03ad4a89ea..5c4a5748e9 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.TextArea { id: control diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index ba5bf685f8..7f940983f9 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.TextField { id: control diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index 5a385e8e44..0266056f13 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ToolBar { id: control diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index f36dac2286..adde3dd016 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.ToolButton { id: control diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index ee8e6e1cbd..cd9be32d8f 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ToolSeparator { id: control diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 431cdf7c18..bf931a4c84 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ToolTip { id: control diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index ebbc746de1..5dbe6d939f 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls +import QtQuick.Controls.impl T.Tumbler { id: control diff --git a/src/imports/controls/universal/VerticalHeaderView.qml b/src/imports/controls/universal/VerticalHeaderView.qml index 04408d68a3..47eb8c9530 100644 --- a/src/imports/controls/universal/VerticalHeaderView.qml +++ b/src/imports/controls/universal/VerticalHeaderView.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Universal 2.15 -import QtQuick.Controls.Universal.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.VerticalHeaderView { id: control diff --git a/src/imports/controls/universal/impl/CheckIndicator.qml b/src/imports/controls/universal/impl/CheckIndicator.qml index 7e8d932733..5e56ca8873 100644 --- a/src/imports/controls/universal/impl/CheckIndicator.qml +++ b/src/imports/controls/universal/impl/CheckIndicator.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.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal Rectangle { id: indicator diff --git a/src/imports/controls/universal/impl/RadioIndicator.qml b/src/imports/controls/universal/impl/RadioIndicator.qml index 1a32decbbe..3cf1bf3728 100644 --- a/src/imports/controls/universal/impl/RadioIndicator.qml +++ b/src/imports/controls/universal/impl/RadioIndicator.qml @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls.Universal Rectangle { id: indicator diff --git a/src/imports/controls/universal/impl/SwitchIndicator.qml b/src/imports/controls/universal/impl/SwitchIndicator.qml index 10f39515bd..aa4554192c 100644 --- a/src/imports/controls/universal/impl/SwitchIndicator.qml +++ b/src/imports/controls/universal/impl/SwitchIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal Item { id: indicator diff --git a/tests/auto/accessibility/data/defaults/abstractbutton.qml b/tests/auto/accessibility/data/defaults/abstractbutton.qml index b092217607..29d6b3c0a0 100644 --- a/tests/auto/accessibility/data/defaults/abstractbutton.qml +++ b/tests/auto/accessibility/data/defaults/abstractbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls AbstractButton { text: "AbstractButton" diff --git a/tests/auto/accessibility/data/defaults/busyindicator.qml b/tests/auto/accessibility/data/defaults/busyindicator.qml index e1c33765e5..baaa9ba80b 100644 --- a/tests/auto/accessibility/data/defaults/busyindicator.qml +++ b/tests/auto/accessibility/data/defaults/busyindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls BusyIndicator { } diff --git a/tests/auto/accessibility/data/defaults/button.qml b/tests/auto/accessibility/data/defaults/button.qml index 600c05daee..0359b3ac15 100644 --- a/tests/auto/accessibility/data/defaults/button.qml +++ b/tests/auto/accessibility/data/defaults/button.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Button { text: "Button" diff --git a/tests/auto/accessibility/data/defaults/checkbox.qml b/tests/auto/accessibility/data/defaults/checkbox.qml index f86a9a271a..c912be5791 100644 --- a/tests/auto/accessibility/data/defaults/checkbox.qml +++ b/tests/auto/accessibility/data/defaults/checkbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls CheckBox { text: "CheckBox" diff --git a/tests/auto/accessibility/data/defaults/checkdelegate.qml b/tests/auto/accessibility/data/defaults/checkdelegate.qml index 2750052f05..df62bc89d5 100644 --- a/tests/auto/accessibility/data/defaults/checkdelegate.qml +++ b/tests/auto/accessibility/data/defaults/checkdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls CheckDelegate { text: "CheckDelegate" diff --git a/tests/auto/accessibility/data/defaults/combobox.qml b/tests/auto/accessibility/data/defaults/combobox.qml index ec4e87efd0..bfeac723da 100644 --- a/tests/auto/accessibility/data/defaults/combobox.qml +++ b/tests/auto/accessibility/data/defaults/combobox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ComboBox { model: ["ComboBox"] diff --git a/tests/auto/accessibility/data/defaults/container.qml b/tests/auto/accessibility/data/defaults/container.qml index b8d57eead3..7d29fec426 100644 --- a/tests/auto/accessibility/data/defaults/container.qml +++ b/tests/auto/accessibility/data/defaults/container.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Container { } diff --git a/tests/auto/accessibility/data/defaults/control.qml b/tests/auto/accessibility/data/defaults/control.qml index dac5f935cb..280cfd2962 100644 --- a/tests/auto/accessibility/data/defaults/control.qml +++ b/tests/auto/accessibility/data/defaults/control.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { } diff --git a/tests/auto/accessibility/data/defaults/dial.qml b/tests/auto/accessibility/data/defaults/dial.qml index 9a47154849..d7e700b5df 100644 --- a/tests/auto/accessibility/data/defaults/dial.qml +++ b/tests/auto/accessibility/data/defaults/dial.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Dial { } diff --git a/tests/auto/accessibility/data/defaults/dialog.qml b/tests/auto/accessibility/data/defaults/dialog.qml index 20317a31f3..d88fd36d8e 100644 --- a/tests/auto/accessibility/data/defaults/dialog.qml +++ b/tests/auto/accessibility/data/defaults/dialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Dialog { title: "Dialog" diff --git a/tests/auto/accessibility/data/defaults/drawer.qml b/tests/auto/accessibility/data/defaults/drawer.qml index 9b0db5facc..60a35171b2 100644 --- a/tests/auto/accessibility/data/defaults/drawer.qml +++ b/tests/auto/accessibility/data/defaults/drawer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Drawer { } diff --git a/tests/auto/accessibility/data/defaults/frame.qml b/tests/auto/accessibility/data/defaults/frame.qml index 02e45a7842..b70ccb556c 100644 --- a/tests/auto/accessibility/data/defaults/frame.qml +++ b/tests/auto/accessibility/data/defaults/frame.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Frame { } diff --git a/tests/auto/accessibility/data/defaults/groupbox.qml b/tests/auto/accessibility/data/defaults/groupbox.qml index 0fa8cff53b..24f3a294b8 100644 --- a/tests/auto/accessibility/data/defaults/groupbox.qml +++ b/tests/auto/accessibility/data/defaults/groupbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls GroupBox { title: "GroupBox" diff --git a/tests/auto/accessibility/data/defaults/itemdelegate.qml b/tests/auto/accessibility/data/defaults/itemdelegate.qml index 5283164840..5ec95fe07e 100644 --- a/tests/auto/accessibility/data/defaults/itemdelegate.qml +++ b/tests/auto/accessibility/data/defaults/itemdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ItemDelegate { text: "ItemDelegate" diff --git a/tests/auto/accessibility/data/defaults/label.qml b/tests/auto/accessibility/data/defaults/label.qml index 6d7466bc46..5f6a98cd74 100644 --- a/tests/auto/accessibility/data/defaults/label.qml +++ b/tests/auto/accessibility/data/defaults/label.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Label { text: "Label" diff --git a/tests/auto/accessibility/data/defaults/menu.qml b/tests/auto/accessibility/data/defaults/menu.qml index 126914d1cb..07fef72849 100644 --- a/tests/auto/accessibility/data/defaults/menu.qml +++ b/tests/auto/accessibility/data/defaults/menu.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Menu { } diff --git a/tests/auto/accessibility/data/defaults/menuitem.qml b/tests/auto/accessibility/data/defaults/menuitem.qml index 97fd478fb9..194fa988c8 100644 --- a/tests/auto/accessibility/data/defaults/menuitem.qml +++ b/tests/auto/accessibility/data/defaults/menuitem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MenuItem { text: "MenuItem" diff --git a/tests/auto/accessibility/data/defaults/page.qml b/tests/auto/accessibility/data/defaults/page.qml index 8403687853..cd1f78e170 100644 --- a/tests/auto/accessibility/data/defaults/page.qml +++ b/tests/auto/accessibility/data/defaults/page.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Page { title: "Page" diff --git a/tests/auto/accessibility/data/defaults/pageindicator.qml b/tests/auto/accessibility/data/defaults/pageindicator.qml index 3018416797..d64d565706 100644 --- a/tests/auto/accessibility/data/defaults/pageindicator.qml +++ b/tests/auto/accessibility/data/defaults/pageindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls PageIndicator { } diff --git a/tests/auto/accessibility/data/defaults/pane.qml b/tests/auto/accessibility/data/defaults/pane.qml index bde4fad5ee..765c98a394 100644 --- a/tests/auto/accessibility/data/defaults/pane.qml +++ b/tests/auto/accessibility/data/defaults/pane.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Pane { } diff --git a/tests/auto/accessibility/data/defaults/popup.qml b/tests/auto/accessibility/data/defaults/popup.qml index 907d0c5520..c599bd4c0b 100644 --- a/tests/auto/accessibility/data/defaults/popup.qml +++ b/tests/auto/accessibility/data/defaults/popup.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Popup { } diff --git a/tests/auto/accessibility/data/defaults/progressbar.qml b/tests/auto/accessibility/data/defaults/progressbar.qml index 74b2cb840a..b3e287c33c 100644 --- a/tests/auto/accessibility/data/defaults/progressbar.qml +++ b/tests/auto/accessibility/data/defaults/progressbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ProgressBar { from: 0 diff --git a/tests/auto/accessibility/data/defaults/radiobutton.qml b/tests/auto/accessibility/data/defaults/radiobutton.qml index 1b046d3eb8..d796b37e17 100644 --- a/tests/auto/accessibility/data/defaults/radiobutton.qml +++ b/tests/auto/accessibility/data/defaults/radiobutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RadioButton { text: "RadioButton" diff --git a/tests/auto/accessibility/data/defaults/radiodelegate.qml b/tests/auto/accessibility/data/defaults/radiodelegate.qml index f2bec8bc12..d002b98532 100644 --- a/tests/auto/accessibility/data/defaults/radiodelegate.qml +++ b/tests/auto/accessibility/data/defaults/radiodelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RadioDelegate { text: "RadioDelegate" diff --git a/tests/auto/accessibility/data/defaults/rangeslider.qml b/tests/auto/accessibility/data/defaults/rangeslider.qml index 95bff37791..7bd364c443 100644 --- a/tests/auto/accessibility/data/defaults/rangeslider.qml +++ b/tests/auto/accessibility/data/defaults/rangeslider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RangeSlider { from: 0 diff --git a/tests/auto/accessibility/data/defaults/roundbutton.qml b/tests/auto/accessibility/data/defaults/roundbutton.qml index 20f0ed9a17..6c78c0a47d 100644 --- a/tests/auto/accessibility/data/defaults/roundbutton.qml +++ b/tests/auto/accessibility/data/defaults/roundbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RoundButton { text: "RoundButton" diff --git a/tests/auto/accessibility/data/defaults/scrollbar.qml b/tests/auto/accessibility/data/defaults/scrollbar.qml index 1e7cf1553e..c36b1534b1 100644 --- a/tests/auto/accessibility/data/defaults/scrollbar.qml +++ b/tests/auto/accessibility/data/defaults/scrollbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollBar { } diff --git a/tests/auto/accessibility/data/defaults/scrollindicator.qml b/tests/auto/accessibility/data/defaults/scrollindicator.qml index 24ef9271ed..5b2f44b674 100644 --- a/tests/auto/accessibility/data/defaults/scrollindicator.qml +++ b/tests/auto/accessibility/data/defaults/scrollindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollIndicator { } diff --git a/tests/auto/accessibility/data/defaults/slider.qml b/tests/auto/accessibility/data/defaults/slider.qml index 0d1db79cb6..fd60a19844 100644 --- a/tests/auto/accessibility/data/defaults/slider.qml +++ b/tests/auto/accessibility/data/defaults/slider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Slider { from: 0 diff --git a/tests/auto/accessibility/data/defaults/spinbox.qml b/tests/auto/accessibility/data/defaults/spinbox.qml index 3da1f86840..159e1f4676 100644 --- a/tests/auto/accessibility/data/defaults/spinbox.qml +++ b/tests/auto/accessibility/data/defaults/spinbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SpinBox { from: 0 diff --git a/tests/auto/accessibility/data/defaults/stackview.qml b/tests/auto/accessibility/data/defaults/stackview.qml index 48cb384e3a..bd540b91a0 100644 --- a/tests/auto/accessibility/data/defaults/stackview.qml +++ b/tests/auto/accessibility/data/defaults/stackview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls StackView { } diff --git a/tests/auto/accessibility/data/defaults/swipedelegate.qml b/tests/auto/accessibility/data/defaults/swipedelegate.qml index d6f503c498..d3724d4dc2 100644 --- a/tests/auto/accessibility/data/defaults/swipedelegate.qml +++ b/tests/auto/accessibility/data/defaults/swipedelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwipeDelegate { text: "SwipeDelegate" diff --git a/tests/auto/accessibility/data/defaults/swipeview.qml b/tests/auto/accessibility/data/defaults/swipeview.qml index efb185e6cb..9eb8221666 100644 --- a/tests/auto/accessibility/data/defaults/swipeview.qml +++ b/tests/auto/accessibility/data/defaults/swipeview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwipeView { } diff --git a/tests/auto/accessibility/data/defaults/switch.qml b/tests/auto/accessibility/data/defaults/switch.qml index b9c8a572b4..00213086aa 100644 --- a/tests/auto/accessibility/data/defaults/switch.qml +++ b/tests/auto/accessibility/data/defaults/switch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Switch { text: "Switch" diff --git a/tests/auto/accessibility/data/defaults/switchdelegate.qml b/tests/auto/accessibility/data/defaults/switchdelegate.qml index d0d9599cff..9f71ed6848 100644 --- a/tests/auto/accessibility/data/defaults/switchdelegate.qml +++ b/tests/auto/accessibility/data/defaults/switchdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwitchDelegate { text: "SwitchDelegate" diff --git a/tests/auto/accessibility/data/defaults/tabbar.qml b/tests/auto/accessibility/data/defaults/tabbar.qml index d65b1305a8..423bfea903 100644 --- a/tests/auto/accessibility/data/defaults/tabbar.qml +++ b/tests/auto/accessibility/data/defaults/tabbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TabBar { } diff --git a/tests/auto/accessibility/data/defaults/tabbutton.qml b/tests/auto/accessibility/data/defaults/tabbutton.qml index 72277a9ff8..ab9ea8ae2c 100644 --- a/tests/auto/accessibility/data/defaults/tabbutton.qml +++ b/tests/auto/accessibility/data/defaults/tabbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TabButton { text: "TabButton" diff --git a/tests/auto/accessibility/data/defaults/textarea.qml b/tests/auto/accessibility/data/defaults/textarea.qml index c861cda430..9a1f31d029 100644 --- a/tests/auto/accessibility/data/defaults/textarea.qml +++ b/tests/auto/accessibility/data/defaults/textarea.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextArea { text: "TextArea" diff --git a/tests/auto/accessibility/data/defaults/textfield.qml b/tests/auto/accessibility/data/defaults/textfield.qml index 222a122396..42a16bae78 100644 --- a/tests/auto/accessibility/data/defaults/textfield.qml +++ b/tests/auto/accessibility/data/defaults/textfield.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextField { text: "TextField" diff --git a/tests/auto/accessibility/data/defaults/toolbar.qml b/tests/auto/accessibility/data/defaults/toolbar.qml index f8cbe3110a..01b93d7d91 100644 --- a/tests/auto/accessibility/data/defaults/toolbar.qml +++ b/tests/auto/accessibility/data/defaults/toolbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolBar { } diff --git a/tests/auto/accessibility/data/defaults/toolbutton.qml b/tests/auto/accessibility/data/defaults/toolbutton.qml index 84d67cfa91..40e1152edc 100644 --- a/tests/auto/accessibility/data/defaults/toolbutton.qml +++ b/tests/auto/accessibility/data/defaults/toolbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolButton { text: "ToolButton" diff --git a/tests/auto/accessibility/data/defaults/tooltip.qml b/tests/auto/accessibility/data/defaults/tooltip.qml index a6f7718ded..f1c3cebee5 100644 --- a/tests/auto/accessibility/data/defaults/tooltip.qml +++ b/tests/auto/accessibility/data/defaults/tooltip.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolTip { text: "ToolTip" diff --git a/tests/auto/accessibility/data/defaults/tumbler.qml b/tests/auto/accessibility/data/defaults/tumbler.qml index fda5c2bdcc..e3db175bd2 100644 --- a/tests/auto/accessibility/data/defaults/tumbler.qml +++ b/tests/auto/accessibility/data/defaults/tumbler.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Tumbler { } diff --git a/tests/auto/accessibility/data/override/abstractbutton.qml b/tests/auto/accessibility/data/override/abstractbutton.qml index 6734432943..ac8efe2601 100644 --- a/tests/auto/accessibility/data/override/abstractbutton.qml +++ b/tests/auto/accessibility/data/override/abstractbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls AbstractButton { text: "AbstractButton" diff --git a/tests/auto/accessibility/data/override/busyindicator.qml b/tests/auto/accessibility/data/override/busyindicator.qml index cc2afbc58c..439788d121 100644 --- a/tests/auto/accessibility/data/override/busyindicator.qml +++ b/tests/auto/accessibility/data/override/busyindicator.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls BusyIndicator { Accessible.name: "BusyIndicatorOverride" diff --git a/tests/auto/accessibility/data/override/button.qml b/tests/auto/accessibility/data/override/button.qml index 8e1bdb5fb6..578af86c78 100644 --- a/tests/auto/accessibility/data/override/button.qml +++ b/tests/auto/accessibility/data/override/button.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Button { text: "Button" diff --git a/tests/auto/accessibility/data/override/checkbox.qml b/tests/auto/accessibility/data/override/checkbox.qml index ec532d6563..5df735091e 100644 --- a/tests/auto/accessibility/data/override/checkbox.qml +++ b/tests/auto/accessibility/data/override/checkbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls CheckBox { text: "CheckBox" diff --git a/tests/auto/accessibility/data/override/checkdelegate.qml b/tests/auto/accessibility/data/override/checkdelegate.qml index 94bb0ee0b2..43f65d5083 100644 --- a/tests/auto/accessibility/data/override/checkdelegate.qml +++ b/tests/auto/accessibility/data/override/checkdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls CheckDelegate { text: "CheckDelegate" diff --git a/tests/auto/accessibility/data/override/combobox.qml b/tests/auto/accessibility/data/override/combobox.qml index dc087212ab..fa6ed3b4bf 100644 --- a/tests/auto/accessibility/data/override/combobox.qml +++ b/tests/auto/accessibility/data/override/combobox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ComboBox { model: ["ComboBox"] diff --git a/tests/auto/accessibility/data/override/container.qml b/tests/auto/accessibility/data/override/container.qml index 987b83363e..4e73f341d6 100644 --- a/tests/auto/accessibility/data/override/container.qml +++ b/tests/auto/accessibility/data/override/container.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Container { Accessible.name: "ContainerOverride" diff --git a/tests/auto/accessibility/data/override/control.qml b/tests/auto/accessibility/data/override/control.qml index 72f92c3d47..9c2be4617f 100644 --- a/tests/auto/accessibility/data/override/control.qml +++ b/tests/auto/accessibility/data/override/control.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { Accessible.name: "ControlOverride" diff --git a/tests/auto/accessibility/data/override/dial.qml b/tests/auto/accessibility/data/override/dial.qml index 558b31eaa5..8dbf0e3764 100644 --- a/tests/auto/accessibility/data/override/dial.qml +++ b/tests/auto/accessibility/data/override/dial.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Dial { Accessible.name: "DialOverride" diff --git a/tests/auto/accessibility/data/override/dialog.qml b/tests/auto/accessibility/data/override/dialog.qml index 30843ffdd0..d1f3197196 100644 --- a/tests/auto/accessibility/data/override/dialog.qml +++ b/tests/auto/accessibility/data/override/dialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Dialog { title: "Dialog" diff --git a/tests/auto/accessibility/data/override/drawer.qml b/tests/auto/accessibility/data/override/drawer.qml index 9867d27d9f..02e973e2cc 100644 --- a/tests/auto/accessibility/data/override/drawer.qml +++ b/tests/auto/accessibility/data/override/drawer.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Drawer { Accessible.name: "DrawerOverride" diff --git a/tests/auto/accessibility/data/override/frame.qml b/tests/auto/accessibility/data/override/frame.qml index 0e99e8c3f8..55086b35c0 100644 --- a/tests/auto/accessibility/data/override/frame.qml +++ b/tests/auto/accessibility/data/override/frame.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Frame { Accessible.name: "FrameOverride" diff --git a/tests/auto/accessibility/data/override/groupbox.qml b/tests/auto/accessibility/data/override/groupbox.qml index ab58d30bf3..d09d0845c9 100644 --- a/tests/auto/accessibility/data/override/groupbox.qml +++ b/tests/auto/accessibility/data/override/groupbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls GroupBox { title: "GroupBox" diff --git a/tests/auto/accessibility/data/override/itemdelegate.qml b/tests/auto/accessibility/data/override/itemdelegate.qml index 4f25efd3e7..2f32cb7514 100644 --- a/tests/auto/accessibility/data/override/itemdelegate.qml +++ b/tests/auto/accessibility/data/override/itemdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ItemDelegate { text: "ItemDelegate" diff --git a/tests/auto/accessibility/data/override/label.qml b/tests/auto/accessibility/data/override/label.qml index 235c0661fc..5c1310f875 100644 --- a/tests/auto/accessibility/data/override/label.qml +++ b/tests/auto/accessibility/data/override/label.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Label { text: "Label" diff --git a/tests/auto/accessibility/data/override/menu.qml b/tests/auto/accessibility/data/override/menu.qml index 15628ea534..57a1b3d61f 100644 --- a/tests/auto/accessibility/data/override/menu.qml +++ b/tests/auto/accessibility/data/override/menu.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Menu { Accessible.name: "MenuOverride" diff --git a/tests/auto/accessibility/data/override/menuitem.qml b/tests/auto/accessibility/data/override/menuitem.qml index 89bdaf9a8b..e1c064f3b5 100644 --- a/tests/auto/accessibility/data/override/menuitem.qml +++ b/tests/auto/accessibility/data/override/menuitem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MenuItem { text: "MenuItem" diff --git a/tests/auto/accessibility/data/override/page.qml b/tests/auto/accessibility/data/override/page.qml index 0d275d8448..b3b87e8ab6 100644 --- a/tests/auto/accessibility/data/override/page.qml +++ b/tests/auto/accessibility/data/override/page.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Page { title: "Page" diff --git a/tests/auto/accessibility/data/override/pageindicator.qml b/tests/auto/accessibility/data/override/pageindicator.qml index 4af84edacb..f366464df7 100644 --- a/tests/auto/accessibility/data/override/pageindicator.qml +++ b/tests/auto/accessibility/data/override/pageindicator.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls PageIndicator { Accessible.name: "PageIndicatorOverride" diff --git a/tests/auto/accessibility/data/override/pane.qml b/tests/auto/accessibility/data/override/pane.qml index b2f27db209..7b57e9a9f5 100644 --- a/tests/auto/accessibility/data/override/pane.qml +++ b/tests/auto/accessibility/data/override/pane.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Pane { Accessible.name: "PaneOverride" diff --git a/tests/auto/accessibility/data/override/popup.qml b/tests/auto/accessibility/data/override/popup.qml index e1126e2f75..9d8d58550a 100644 --- a/tests/auto/accessibility/data/override/popup.qml +++ b/tests/auto/accessibility/data/override/popup.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Popup { Accessible.name: "PopupOverride" diff --git a/tests/auto/accessibility/data/override/progressbar.qml b/tests/auto/accessibility/data/override/progressbar.qml index bba0998a20..58bd2ae1bd 100644 --- a/tests/auto/accessibility/data/override/progressbar.qml +++ b/tests/auto/accessibility/data/override/progressbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ProgressBar { from: 0 diff --git a/tests/auto/accessibility/data/override/radiobutton.qml b/tests/auto/accessibility/data/override/radiobutton.qml index 89ad797d61..3c555256b8 100644 --- a/tests/auto/accessibility/data/override/radiobutton.qml +++ b/tests/auto/accessibility/data/override/radiobutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RadioButton { text: "RadioButton" diff --git a/tests/auto/accessibility/data/override/radiodelegate.qml b/tests/auto/accessibility/data/override/radiodelegate.qml index 1e6bee91d5..883f963c5c 100644 --- a/tests/auto/accessibility/data/override/radiodelegate.qml +++ b/tests/auto/accessibility/data/override/radiodelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RadioDelegate { text: "RadioDelegate" diff --git a/tests/auto/accessibility/data/override/rangeslider.qml b/tests/auto/accessibility/data/override/rangeslider.qml index 8758a19f62..675c34aad1 100644 --- a/tests/auto/accessibility/data/override/rangeslider.qml +++ b/tests/auto/accessibility/data/override/rangeslider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RangeSlider { from: 0 diff --git a/tests/auto/accessibility/data/override/roundbutton.qml b/tests/auto/accessibility/data/override/roundbutton.qml index c338afd1bc..a793ee2833 100644 --- a/tests/auto/accessibility/data/override/roundbutton.qml +++ b/tests/auto/accessibility/data/override/roundbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls RoundButton { text: "RoundButton" diff --git a/tests/auto/accessibility/data/override/scrollbar.qml b/tests/auto/accessibility/data/override/scrollbar.qml index 4849994fdb..6b3e613c42 100644 --- a/tests/auto/accessibility/data/override/scrollbar.qml +++ b/tests/auto/accessibility/data/override/scrollbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollBar { Accessible.name: "ScrollBarOverride" diff --git a/tests/auto/accessibility/data/override/scrollindicator.qml b/tests/auto/accessibility/data/override/scrollindicator.qml index 2e85d8dbdf..5cc1e5d4b8 100644 --- a/tests/auto/accessibility/data/override/scrollindicator.qml +++ b/tests/auto/accessibility/data/override/scrollindicator.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ScrollIndicator { Accessible.name: "ScrollIndicatorOverride" diff --git a/tests/auto/accessibility/data/override/slider.qml b/tests/auto/accessibility/data/override/slider.qml index 1fde4977dc..9239f8db99 100644 --- a/tests/auto/accessibility/data/override/slider.qml +++ b/tests/auto/accessibility/data/override/slider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Slider { from: 0 diff --git a/tests/auto/accessibility/data/override/spinbox.qml b/tests/auto/accessibility/data/override/spinbox.qml index 51c883b12c..327f2a6d4a 100644 --- a/tests/auto/accessibility/data/override/spinbox.qml +++ b/tests/auto/accessibility/data/override/spinbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SpinBox { from: 0 diff --git a/tests/auto/accessibility/data/override/stackview.qml b/tests/auto/accessibility/data/override/stackview.qml index dfc3e92532..dd3b8342f7 100644 --- a/tests/auto/accessibility/data/override/stackview.qml +++ b/tests/auto/accessibility/data/override/stackview.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls StackView { Accessible.name: "StackViewOverride" diff --git a/tests/auto/accessibility/data/override/swipedelegate.qml b/tests/auto/accessibility/data/override/swipedelegate.qml index 9e3f00a93a..bc97fc93bc 100644 --- a/tests/auto/accessibility/data/override/swipedelegate.qml +++ b/tests/auto/accessibility/data/override/swipedelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwipeDelegate { text: "SwipeDelegate" diff --git a/tests/auto/accessibility/data/override/swipeview.qml b/tests/auto/accessibility/data/override/swipeview.qml index 9b3734b261..809b536210 100644 --- a/tests/auto/accessibility/data/override/swipeview.qml +++ b/tests/auto/accessibility/data/override/swipeview.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwipeView { Accessible.name: "SwipeViewOverride" diff --git a/tests/auto/accessibility/data/override/switch.qml b/tests/auto/accessibility/data/override/switch.qml index 9162a374de..18e3eb70ce 100644 --- a/tests/auto/accessibility/data/override/switch.qml +++ b/tests/auto/accessibility/data/override/switch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Switch { text: "Switch" diff --git a/tests/auto/accessibility/data/override/switchdelegate.qml b/tests/auto/accessibility/data/override/switchdelegate.qml index f1a99c69ee..0c66f9e9e9 100644 --- a/tests/auto/accessibility/data/override/switchdelegate.qml +++ b/tests/auto/accessibility/data/override/switchdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls SwitchDelegate { text: "SwitchDelegate" diff --git a/tests/auto/accessibility/data/override/tabbar.qml b/tests/auto/accessibility/data/override/tabbar.qml index 9e00d0177b..a959f68cae 100644 --- a/tests/auto/accessibility/data/override/tabbar.qml +++ b/tests/auto/accessibility/data/override/tabbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TabBar { Accessible.name: "TabBarOverride" diff --git a/tests/auto/accessibility/data/override/tabbutton.qml b/tests/auto/accessibility/data/override/tabbutton.qml index 2b9f83d1c7..1530a2d1bc 100644 --- a/tests/auto/accessibility/data/override/tabbutton.qml +++ b/tests/auto/accessibility/data/override/tabbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TabButton { text: "TabButton" diff --git a/tests/auto/accessibility/data/override/textarea.qml b/tests/auto/accessibility/data/override/textarea.qml index 00ebdb596b..2b1422252f 100644 --- a/tests/auto/accessibility/data/override/textarea.qml +++ b/tests/auto/accessibility/data/override/textarea.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextArea { text: "TextArea" diff --git a/tests/auto/accessibility/data/override/textfield.qml b/tests/auto/accessibility/data/override/textfield.qml index 6f5bb46963..42098b6640 100644 --- a/tests/auto/accessibility/data/override/textfield.qml +++ b/tests/auto/accessibility/data/override/textfield.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls TextField { text: "TextField" diff --git a/tests/auto/accessibility/data/override/toolbar.qml b/tests/auto/accessibility/data/override/toolbar.qml index 170c8ce59c..97406f8ca5 100644 --- a/tests/auto/accessibility/data/override/toolbar.qml +++ b/tests/auto/accessibility/data/override/toolbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolBar { Accessible.name: "ToolBarOverride" diff --git a/tests/auto/accessibility/data/override/toolbutton.qml b/tests/auto/accessibility/data/override/toolbutton.qml index 12b634e736..5ecb427baf 100644 --- a/tests/auto/accessibility/data/override/toolbutton.qml +++ b/tests/auto/accessibility/data/override/toolbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolButton { text: "ToolButton" diff --git a/tests/auto/accessibility/data/override/tooltip.qml b/tests/auto/accessibility/data/override/tooltip.qml index 92ff83968a..1a4c3a994f 100644 --- a/tests/auto/accessibility/data/override/tooltip.qml +++ b/tests/auto/accessibility/data/override/tooltip.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ToolTip { text: "ToolTip" diff --git a/tests/auto/accessibility/data/override/tumbler.qml b/tests/auto/accessibility/data/override/tumbler.qml index ac1221d7f2..947f66cd70 100644 --- a/tests/auto/accessibility/data/override/tumbler.qml +++ b/tests/auto/accessibility/data/override/tumbler.qml @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Tumbler { Accessible.name: "TumblerOverride" diff --git a/tests/auto/controls/data/SignalSequenceSpy.qml b/tests/auto/controls/data/SignalSequenceSpy.qml index 531a7f6893..40718c0910 100644 --- a/tests/auto/controls/data/SignalSequenceSpy.qml +++ b/tests/auto/controls/data/SignalSequenceSpy.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick QtObject { property QtObject target: null diff --git a/tests/auto/controls/data/TestItem.qml b/tests/auto/controls/data/TestItem.qml index 6bd42bacbe..df81269ce1 100644 --- a/tests/auto/controls/data/TestItem.qml +++ b/tests/auto/controls/data/TestItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick Item { id: item diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml index 01ff2c035a..c11b504b75 100644 --- a/tests/auto/controls/data/TumblerDatePicker.qml +++ b/tests/auto/controls/data/TumblerDatePicker.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Row { id: datePicker diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/controls/data/TumblerListView.qml index 33504f33d4..a581c4327d 100644 --- a/tests/auto/controls/data/TumblerListView.qml +++ b/tests/auto/controls/data/TumblerListView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ListView { implicitWidth: 60 diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/controls/data/TumblerPathView.qml index ec0d73ef57..0f9be0e929 100644 --- a/tests/auto/controls/data/TumblerPathView.qml +++ b/tests/auto/controls/data/TumblerPathView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls PathView { id: pathView diff --git a/tests/auto/controls/data/splitview/fillItemInMiddle.qml b/tests/auto/controls/data/splitview/fillItemInMiddle.qml index 174b6a2a76..0acac9eb22 100644 --- a/tests/auto/controls/data/splitview/fillItemInMiddle.qml +++ b/tests/auto/controls/data/splitview/fillItemInMiddle.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls SplitView { anchors.fill: parent diff --git a/tests/auto/controls/data/splitview/fillItemOnLeft.qml b/tests/auto/controls/data/splitview/fillItemOnLeft.qml index dee68eacda..6f9c6e0b67 100644 --- a/tests/auto/controls/data/splitview/fillItemOnLeft.qml +++ b/tests/auto/controls/data/splitview/fillItemOnLeft.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls SplitView { anchors.fill: parent diff --git a/tests/auto/controls/data/splitview/fillItemOnTop.qml b/tests/auto/controls/data/splitview/fillItemOnTop.qml index 2fc6f4d05e..2955aa61eb 100644 --- a/tests/auto/controls/data/splitview/fillItemOnTop.qml +++ b/tests/auto/controls/data/splitview/fillItemOnTop.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls SplitView { anchors.fill: parent diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml index da5642cc24..bb1dfac2d3 100644 --- a/tests/auto/controls/data/tst_abstractbutton.qml +++ b/tests/auto/controls/data/tst_abstractbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml index 0e41b7f368..946382eee0 100644 --- a/tests/auto/controls/data/tst_action.qml +++ b/tests/auto/controls/data/tst_action.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Templates as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_actiongroup.qml b/tests/auto/controls/data/tst_actiongroup.qml index 6c8ea5c42e..e4ea5679da 100644 --- a/tests/auto/controls/data/tst_actiongroup.qml +++ b/tests/auto/controls/data/tst_actiongroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index 7801cdab9b..9353c33828 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index 57d92e7d27..f27e5bcb99 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml index 1abb979538..138c0e2441 100644 --- a/tests/auto/controls/data/tst_buttongroup.qml +++ b/tests/auto/controls/data/tst_buttongroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 1f00294fee..81c3d6ca94 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml index 971d3514d0..e51377870a 100644 --- a/tests/auto/controls/data/tst_checkdelegate.qml +++ b/tests/auto/controls/data/tst_checkdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 79ffa176d7..4755c92b4d 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtTest 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Window +import QtTest +import QtQuick.Controls TestCase { id: testCase @@ -215,9 +215,9 @@ TestCase { var control = createTemporaryObject(emptyBox, testCase, {textRole: "text"}) verify(control) - var obj1 = Qt.createQmlObject("import QtQml 2.0; QtObject { property string text: 'one' }", control) - var obj2 = Qt.createQmlObject("import QtQml 2.0; QtObject { property string text: 'two' }", control) - var obj3 = Qt.createQmlObject("import QtQml 2.0; QtObject { property string text: 'three' }", control) + var obj1 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'one' }", control) + var obj2 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'two' }", control) + var obj3 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'three' }", control) control.model = [obj1, obj2, obj3] diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml index c04a3402ef..be2b9a12ba 100644 --- a/tests/auto/controls/data/tst_container.qml +++ b/tests/auto/controls/data/tst_container.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Templates as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 3c416546f8..1bbbe42ab0 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Templates as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml index e965b5ef71..731caf8675 100644 --- a/tests/auto/controls/data/tst_delaybutton.qml +++ b/tests/auto/controls/data/tst_delaybutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index 26f30c33bd..70645f8ddd 100644 --- a/tests/auto/controls/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml index 79053c1374..53d27fd35b 100644 --- a/tests/auto/controls/data/tst_dialog.qml +++ b/tests/auto/controls/data/tst_dialog.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Templates as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml index a651713a26..16a5fe5e5a 100644 --- a/tests/auto/controls/data/tst_dialogbuttonbox.qml +++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml index a5236b71f7..95c691441f 100644 --- a/tests/auto/controls/data/tst_frame.qml +++ b/tests/auto/controls/data/tst_frame.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index a4f1b5f32d..ed7148978a 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml index f74a8a4257..6a4b29b459 100644 --- a/tests/auto/controls/data/tst_itemdelegate.qml +++ b/tests/auto/controls/data/tst_itemdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index 8384e93270..d6efb1373a 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml index a34335345d..be84ae90ec 100644 --- a/tests/auto/controls/data/tst_menuitem.qml +++ b/tests/auto/controls/data/tst_menuitem.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index 252c6ebf5e..ae78a12563 100644 --- a/tests/auto/controls/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml index 0f68b5d81a..765c52a77a 100644 --- a/tests/auto/controls/data/tst_pageindicator.qml +++ b/tests/auto/controls/data/tst_pageindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml index 4006474bf1..d44d7424a6 100644 --- a/tests/auto/controls/data/tst_pane.qml +++ b/tests/auto/controls/data/tst_pane.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 11de3c83e6..2c94e87b39 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Templates as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index 748405510f..1bb66bb7e3 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index c16f615ca5..42ef9a1547 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml index 882591659d..9a4e28120a 100644 --- a/tests/auto/controls/data/tst_radiodelegate.qml +++ b/tests/auto/controls/data/tst_radiodelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml index 24f8a20755..55fedd1c57 100644 --- a/tests/auto/controls/data/tst_rangeslider.qml +++ b/tests/auto/controls/data/tst_rangeslider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml index b2a2813af3..c683d4579a 100644 --- a/tests/auto/controls/data/tst_roundbutton.qml +++ b/tests/auto/controls/data/tst_roundbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 9d21fa8b27..29b04c537b 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index c23bf3e5f8..5f6006d40e 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 87c3950968..d8c210a42e 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 280138c5e0..9f1234761a 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 40277875ce..5898ff5278 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Window TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index d78ef95a7f..ac6d1a4d53 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 -import QtQuick.Window 2.13 -import QtTest 1.13 -import Qt.labs.settings 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Window +import QtTest +import Qt.labs.settings TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index 767ec8181e..a3df827ab0 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase @@ -406,7 +406,7 @@ TestCase { // unsupported type ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":69:9: QML StackView: push: QtObject is not supported. Must be Item or Component.") - control.push(Qt.createQmlObject('import QtQml 2.0; QtObject { }', control)) + control.push(Qt.createQmlObject('import QtQml; QtObject { }', control)) // push(item) var item1 = component.createObject(control, {objectName:"1"}) @@ -506,7 +506,7 @@ TestCase { // unsupported type ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":69:9: QML StackView: replace: QtObject is not supported. Must be Item or Component.") - compare(control.replace(Qt.createQmlObject('import QtQml 2.0; QtObject { }', control)), null) + compare(control.replace(Qt.createQmlObject('import QtQml; QtObject { }', control)), null) // replace(item) var item1 = component.createObject(control, {objectName:"1"}) diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml index a260077468..9827306628 100644 --- a/tests/auto/controls/data/tst_swipedelegate.qml +++ b/tests/auto/controls/data/tst_swipedelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index 4182611737..68b91c3555 100644 --- a/tests/auto/controls/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index b3fab41cac..876af1ba22 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml index 890c89b879..4cf90bb60c 100644 --- a/tests/auto/controls/data/tst_switchdelegate.qml +++ b/tests/auto/controls/data/tst_switchdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml index ce42632faf..3659a0abab 100644 --- a/tests/auto/controls/data/tst_tabbar.qml +++ b/tests/auto/controls/data/tst_tabbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml index 2ebbd8b3e0..c399c0143b 100644 --- a/tests/auto/controls/data/tst_tabbutton.qml +++ b/tests/auto/controls/data/tst_tabbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index e9e1e2e2b5..653e7ad5b2 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 2ee1db4177..f1ac17c921 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Layouts TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index 09c3a83085..b35a927d3e 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index c533c80162..ca044a8972 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolseparator.qml b/tests/auto/controls/data/tst_toolseparator.qml index d3581b96b6..41c161dd4b 100644 --- a/tests/auto/controls/data/tst_toolseparator.qml +++ b/tests/auto/controls/data/tst_toolseparator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml index 4b4bf4fa47..6ca172633f 100644 --- a/tests/auto/controls/data/tst_tooltip.qml +++ b/tests/auto/controls/data/tst_tooltip.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 5b3ef6e30f..c103aefc16 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtTest +import QtQuick.Controls TestCase { id: testCase @@ -383,7 +383,7 @@ TestCase { verify(tumbler); var mouseArea = createTemporaryQmlObject( - "import QtQuick 2.2; TextInput { activeFocusOnTab: true; width: 50; height: 50 }", testCase, ""); + "import QtQuick; TextInput { activeFocusOnTab: true; width: 50; height: 50 }", testCase, ""); tumbler.forceActiveFocus(); verify(tumbler.activeFocus); diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/default/dependencies.qml index 7ffafb84fd..f7d87422b5 100644 --- a/tests/auto/controls/default/dependencies.qml +++ b/tests/auto/controls/default/dependencies.qml @@ -1,5 +1,5 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtTest +import QtQuick +import QtQuick.Controls TestCase { } diff --git a/tests/auto/controls/fusion/dependencies.qml b/tests/auto/controls/fusion/dependencies.qml index 2da1b2bbfb..f2e40e6059 100644 --- a/tests/auto/controls/fusion/dependencies.qml +++ b/tests/auto/controls/fusion/dependencies.qml @@ -1,6 +1,6 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Fusion 2.12 +import QtTest +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Fusion TestCase { } diff --git a/tests/auto/controls/imagine/dependencies.qml b/tests/auto/controls/imagine/dependencies.qml index e681aa4fb1..9a31141bff 100644 --- a/tests/auto/controls/imagine/dependencies.qml +++ b/tests/auto/controls/imagine/dependencies.qml @@ -1,6 +1,6 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 +import QtTest +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Imagine TestCase { } diff --git a/tests/auto/controls/material/dependencies.qml b/tests/auto/controls/material/dependencies.qml index f926944e72..8bcf03013c 100644 --- a/tests/auto/controls/material/dependencies.qml +++ b/tests/auto/controls/material/dependencies.qml @@ -1,6 +1,6 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtTest +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material TestCase { } diff --git a/tests/auto/controls/universal/dependencies.qml b/tests/auto/controls/universal/dependencies.qml index a4a0d0a010..8ba71c8302 100644 --- a/tests/auto/controls/universal/dependencies.qml +++ b/tests/auto/controls/universal/dependencies.qml @@ -1,6 +1,6 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtTest +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Universal TestCase { } diff --git a/tests/auto/cursor/data/buttons.qml b/tests/auto/cursor/data/buttons.qml index 2107a8f3b7..eb7e27cfa4 100644 --- a/tests/auto/cursor/data/buttons.qml +++ b/tests/auto/cursor/data/buttons.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MouseArea { width: column.width diff --git a/tests/auto/cursor/data/containers.qml b/tests/auto/cursor/data/containers.qml index c9dc09d94f..0e72297111 100644 --- a/tests/auto/cursor/data/containers.qml +++ b/tests/auto/cursor/data/containers.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MouseArea { width: column.width diff --git a/tests/auto/cursor/data/editable.qml b/tests/auto/cursor/data/editable.qml index 305d7d46a5..04bf4b7cb0 100644 --- a/tests/auto/cursor/data/editable.qml +++ b/tests/auto/cursor/data/editable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MouseArea { width: column.width diff --git a/tests/auto/cursor/data/pageindicator.qml b/tests/auto/cursor/data/pageindicator.qml index 228f010d63..f71fbf7563 100644 --- a/tests/auto/cursor/data/pageindicator.qml +++ b/tests/auto/cursor/data/pageindicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MouseArea { width: 200 diff --git a/tests/auto/cursor/data/scrollbar.qml b/tests/auto/cursor/data/scrollbar.qml index 50b785c644..997abd4b65 100644 --- a/tests/auto/cursor/data/scrollbar.qml +++ b/tests/auto/cursor/data/scrollbar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/cursor/data/sliders.qml b/tests/auto/cursor/data/sliders.qml index e3ac2cb1e6..687450ec05 100644 --- a/tests/auto/cursor/data/sliders.qml +++ b/tests/auto/cursor/data/sliders.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MouseArea { width: column.width diff --git a/tests/auto/customization/data/styles/empty/AbstractButton.qml b/tests/auto/customization/data/styles/empty/AbstractButton.qml index 56aaaa0447..b30d4a5628 100644 --- a/tests/auto/customization/data/styles/empty/AbstractButton.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ApplicationWindow.qml b/tests/auto/customization/data/styles/empty/ApplicationWindow.qml index 820b67ae9b..6a1f1b098b 100644 --- a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/BusyIndicator.qml b/tests/auto/customization/data/styles/empty/BusyIndicator.qml index 2d212ed276..388de3af36 100644 --- a/tests/auto/customization/data/styles/empty/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Button.qml b/tests/auto/customization/data/styles/empty/Button.qml index 54daa5860d..20426d2ede 100644 --- a/tests/auto/customization/data/styles/empty/Button.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/CheckBox.qml b/tests/auto/customization/data/styles/empty/CheckBox.qml index 64799ca5fa..3d8b5a8e09 100644 --- a/tests/auto/customization/data/styles/empty/CheckBox.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/CheckDelegate.qml b/tests/auto/customization/data/styles/empty/CheckDelegate.qml index b7ea827d7e..a0547ec418 100644 --- a/tests/auto/customization/data/styles/empty/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ComboBox.qml b/tests/auto/customization/data/styles/empty/ComboBox.qml index 2c5cb26615..84cf6e35e4 100644 --- a/tests/auto/customization/data/styles/empty/ComboBox.qml +++ b/tests/auto/customization/data/styles/empty/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/empty/Container.qml b/tests/auto/customization/data/styles/empty/Container.qml index 1d376cce30..7519d7bd18 100644 --- a/tests/auto/customization/data/styles/empty/Container.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Control.qml b/tests/auto/customization/data/styles/empty/Control.qml index c7db674a5d..55a456c764 100644 --- a/tests/auto/customization/data/styles/empty/Control.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/DelayButton.qml b/tests/auto/customization/data/styles/empty/DelayButton.qml index e1cd7dde77..ce34f25f28 100644 --- a/tests/auto/customization/data/styles/empty/DelayButton.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Dial.qml b/tests/auto/customization/data/styles/empty/Dial.qml index 94af0a3e41..de83e56400 100644 --- a/tests/auto/customization/data/styles/empty/Dial.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Dialog.qml b/tests/auto/customization/data/styles/empty/Dialog.qml index 72f95f0abf..8b056a8833 100644 --- a/tests/auto/customization/data/styles/empty/Dialog.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/DialogButtonBox.qml b/tests/auto/customization/data/styles/empty/DialogButtonBox.qml index 1f47e83f8a..5ce5f504e1 100644 --- a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Drawer.qml b/tests/auto/customization/data/styles/empty/Drawer.qml index a550d5b7a8..b4da57c000 100644 --- a/tests/auto/customization/data/styles/empty/Drawer.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Frame.qml b/tests/auto/customization/data/styles/empty/Frame.qml index 9047035ce2..00f4d79c7a 100644 --- a/tests/auto/customization/data/styles/empty/Frame.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/GroupBox.qml b/tests/auto/customization/data/styles/empty/GroupBox.qml index 8628cb0d1c..900770cdba 100644 --- a/tests/auto/customization/data/styles/empty/GroupBox.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ItemDelegate.qml b/tests/auto/customization/data/styles/empty/ItemDelegate.qml index 721e4b376f..19de468d8a 100644 --- a/tests/auto/customization/data/styles/empty/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Label.qml b/tests/auto/customization/data/styles/empty/Label.qml index a0be5acf56..bfc4a83966 100644 --- a/tests/auto/customization/data/styles/empty/Label.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Menu.qml b/tests/auto/customization/data/styles/empty/Menu.qml index ec7cd9fdf0..27b8a01431 100644 --- a/tests/auto/customization/data/styles/empty/Menu.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/MenuBar.qml b/tests/auto/customization/data/styles/empty/MenuBar.qml index 6ee7350dc8..24f7c6edf4 100644 --- a/tests/auto/customization/data/styles/empty/MenuBar.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/MenuBarItem.qml b/tests/auto/customization/data/styles/empty/MenuBarItem.qml index 710c12089d..d66e899a49 100644 --- a/tests/auto/customization/data/styles/empty/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/MenuItem.qml b/tests/auto/customization/data/styles/empty/MenuItem.qml index 206c2e8969..11f38a1b06 100644 --- a/tests/auto/customization/data/styles/empty/MenuItem.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/MenuSeparator.qml b/tests/auto/customization/data/styles/empty/MenuSeparator.qml index 73b3ec4183..effd32c0ed 100644 --- a/tests/auto/customization/data/styles/empty/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Page.qml b/tests/auto/customization/data/styles/empty/Page.qml index ce77d17f0e..353fb9cc65 100644 --- a/tests/auto/customization/data/styles/empty/Page.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/PageIndicator.qml b/tests/auto/customization/data/styles/empty/PageIndicator.qml index c71e690869..98976ae255 100644 --- a/tests/auto/customization/data/styles/empty/PageIndicator.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Pane.qml b/tests/auto/customization/data/styles/empty/Pane.qml index a710e9a2a6..2429e2c6c1 100644 --- a/tests/auto/customization/data/styles/empty/Pane.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Popup.qml b/tests/auto/customization/data/styles/empty/Popup.qml index f2c19ed30b..fdcb49ac8f 100644 --- a/tests/auto/customization/data/styles/empty/Popup.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ProgressBar.qml b/tests/auto/customization/data/styles/empty/ProgressBar.qml index 0ffdb0157f..a2afa03bc4 100644 --- a/tests/auto/customization/data/styles/empty/ProgressBar.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/RadioButton.qml b/tests/auto/customization/data/styles/empty/RadioButton.qml index 1221e6676e..8776629230 100644 --- a/tests/auto/customization/data/styles/empty/RadioButton.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/RadioDelegate.qml b/tests/auto/customization/data/styles/empty/RadioDelegate.qml index b7889e347b..bbb711c7ed 100644 --- a/tests/auto/customization/data/styles/empty/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/RangeSlider.qml b/tests/auto/customization/data/styles/empty/RangeSlider.qml index d737e4bf15..0043b40775 100644 --- a/tests/auto/customization/data/styles/empty/RangeSlider.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/RoundButton.qml b/tests/auto/customization/data/styles/empty/RoundButton.qml index 010639002a..5b06801db8 100644 --- a/tests/auto/customization/data/styles/empty/RoundButton.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ScrollBar.qml b/tests/auto/customization/data/styles/empty/ScrollBar.qml index bc727d7b9c..80a6782e34 100644 --- a/tests/auto/customization/data/styles/empty/ScrollBar.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ScrollIndicator.qml b/tests/auto/customization/data/styles/empty/ScrollIndicator.qml index 3e11e721a1..56c73cb8f4 100644 --- a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ScrollView.qml b/tests/auto/customization/data/styles/empty/ScrollView.qml index 74a9fec2b4..198936c2b5 100644 --- a/tests/auto/customization/data/styles/empty/ScrollView.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Slider.qml b/tests/auto/customization/data/styles/empty/Slider.qml index d8fe7aee61..6cfa3e919b 100644 --- a/tests/auto/customization/data/styles/empty/Slider.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/SpinBox.qml b/tests/auto/customization/data/styles/empty/SpinBox.qml index 4e84e55a99..9e334ecf35 100644 --- a/tests/auto/customization/data/styles/empty/SpinBox.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/StackView.qml b/tests/auto/customization/data/styles/empty/StackView.qml index 7722f8a7a3..0a55abf812 100644 --- a/tests/auto/customization/data/styles/empty/StackView.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/SwipeDelegate.qml b/tests/auto/customization/data/styles/empty/SwipeDelegate.qml index f27802f422..d05f1e9c5c 100644 --- a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/SwipeView.qml b/tests/auto/customization/data/styles/empty/SwipeView.qml index 61de72b38d..51b411aab9 100644 --- a/tests/auto/customization/data/styles/empty/SwipeView.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Switch.qml b/tests/auto/customization/data/styles/empty/Switch.qml index 3908d3f3e9..da00b0e872 100644 --- a/tests/auto/customization/data/styles/empty/Switch.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/SwitchDelegate.qml b/tests/auto/customization/data/styles/empty/SwitchDelegate.qml index e581baa0ea..fe0a9f5222 100644 --- a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/TabBar.qml b/tests/auto/customization/data/styles/empty/TabBar.qml index caedefe915..0f38b66077 100644 --- a/tests/auto/customization/data/styles/empty/TabBar.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/TabButton.qml b/tests/auto/customization/data/styles/empty/TabButton.qml index e677741148..6ee896366b 100644 --- a/tests/auto/customization/data/styles/empty/TabButton.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/TextArea.qml b/tests/auto/customization/data/styles/empty/TextArea.qml index 7d49af200c..e2ee786690 100644 --- a/tests/auto/customization/data/styles/empty/TextArea.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/TextField.qml b/tests/auto/customization/data/styles/empty/TextField.qml index 0a593cbebf..3fcf63d528 100644 --- a/tests/auto/customization/data/styles/empty/TextField.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ToolBar.qml b/tests/auto/customization/data/styles/empty/ToolBar.qml index 5f92326725..6696336d8f 100644 --- a/tests/auto/customization/data/styles/empty/ToolBar.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ToolButton.qml b/tests/auto/customization/data/styles/empty/ToolButton.qml index 9f209c557f..8d4ef1b58a 100644 --- a/tests/auto/customization/data/styles/empty/ToolButton.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ToolSeparator.qml b/tests/auto/customization/data/styles/empty/ToolSeparator.qml index bc81e3e7a0..63985f7fdf 100644 --- a/tests/auto/customization/data/styles/empty/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/ToolTip.qml b/tests/auto/customization/data/styles/empty/ToolTip.qml index 0bc8e3c654..a1aff94132 100644 --- a/tests/auto/customization/data/styles/empty/ToolTip.qml +++ b/tests/auto/customization/data/styles/empty/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/empty/Tumbler.qml b/tests/auto/customization/data/styles/empty/Tumbler.qml index 984362f4a1..c8b3bfebb7 100644 --- a/tests/auto/customization/data/styles/empty/Tumbler.qml +++ b/tests/auto/customization/data/styles/empty/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 diff --git a/tests/auto/customization/data/styles/identified/AbstractButton.qml b/tests/auto/customization/data/styles/identified/AbstractButton.qml index cd2b5bdcdf..1c5bd31823 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 b77eebfc4c..dc3f0db12c 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 dc4c14b7a4..2deab67904 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 dca3b9d0ce..dc80508047 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 8f1f9b2531..13f98af9b9 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 cfba67d35e..b0d8a8d2f7 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 873d1c2ad5..ff117ce812 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 8170e9377f..a282528d45 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 0eb28c2141..90229e4788 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 fc7f67c954..90f980eaec 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 423c64e293..9260972c95 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 58d0120e8b..6392be7d7b 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 0bf56268f7..11c596a1b0 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 82d09bd40f..6b340f2adb 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 e84e18b141..830ac584d0 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 ed56f89bae..fffd44e8f6 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 92801c53c9..b04d2f59e8 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 d19da13571..95d1f19180 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 5a9ac617cc..662392546b 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 d846e3c940..f815b73fac 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 94fdef8902..abf3be5db0 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 34f12ccaa2..3a174ecfa1 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 14154e2f00..7ecb176b8c 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 945f2ac7f0..b24162476f 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 ef0ab44f64..2370a334bf 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 849c79071b..0dbf4b1c97 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 65de416c06..b6381170c1 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 2488862428..dc7d7658ef 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 3a0c4e44fa..2b4a0b626c 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 3eda240850..75cda63d60 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 18118dbefb..fab56fcdc9 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 fc6bc95abc..ec075db314 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 f9a4445d24..418f290884 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 0f15aa2d2b..b427b757d7 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 0855a5afc8..7f4e2c4079 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 23afb67eb6..88c5b22fce 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 7871c975ea..0c058269a5 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 20459d990a..1bc5bf50f0 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 e60780f59b..dadb54a5ea 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 0e5a19f60c..aa256d9908 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 f7e22f1f82..be10b52006 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 bda30715ff..7205c973ee 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 3589f505b2..5d360cb1cf 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 cc24fdfead..bc065b222d 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 c7ef25454e..5667124028 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 670fa9f706..1fef7ab523 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 950f0c537d..2061949cd2 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 792de9e509..253391a8be 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 a44fb331c6..b8cf9daa1a 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 5ddf8920c5..1ef95c9936 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 ae123f0812..3bfdafc428 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 diff --git a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml b/tests/auto/customization/data/styles/incomplete/AbstractButton.qml index ee78f032fb..7e3710509b 100644 --- a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ApplicationWindow.qml b/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml index 45abc542af..8fbdd1a4b6 100644 --- a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/BusyIndicator.qml b/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml index e9a78add89..b046163e2d 100644 --- a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Button.qml b/tests/auto/customization/data/styles/incomplete/Button.qml index 52f1e2f2b4..7daa248c07 100644 --- a/tests/auto/customization/data/styles/incomplete/Button.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/CheckBox.qml b/tests/auto/customization/data/styles/incomplete/CheckBox.qml index c599ca9332..50bfa058cc 100644 --- a/tests/auto/customization/data/styles/incomplete/CheckBox.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/CheckDelegate.qml b/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml index 673dbbd953..13c0e4729f 100644 --- a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ComboBox.qml b/tests/auto/customization/data/styles/incomplete/ComboBox.qml index ef595e4fb2..b0ff62578b 100644 --- a/tests/auto/customization/data/styles/incomplete/ComboBox.qml +++ b/tests/auto/customization/data/styles/incomplete/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Container.qml b/tests/auto/customization/data/styles/incomplete/Container.qml index 9b18ae4901..0ad81beaa3 100644 --- a/tests/auto/customization/data/styles/incomplete/Container.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Control.qml b/tests/auto/customization/data/styles/incomplete/Control.qml index ccec0bf077..6f07f5da9c 100644 --- a/tests/auto/customization/data/styles/incomplete/Control.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/DelayButton.qml b/tests/auto/customization/data/styles/incomplete/DelayButton.qml index bb21db2671..b6ab635bfd 100644 --- a/tests/auto/customization/data/styles/incomplete/DelayButton.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Dial.qml b/tests/auto/customization/data/styles/incomplete/Dial.qml index e9de09744c..66600c63c2 100644 --- a/tests/auto/customization/data/styles/incomplete/Dial.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Dialog.qml b/tests/auto/customization/data/styles/incomplete/Dialog.qml index 9f8ad1fa28..d8ab999e2e 100644 --- a/tests/auto/customization/data/styles/incomplete/Dialog.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/DialogButtonBox.qml b/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml index 7dfaadf56a..d7f954befe 100644 --- a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Drawer.qml b/tests/auto/customization/data/styles/incomplete/Drawer.qml index 684221e5db..5dadbd7793 100644 --- a/tests/auto/customization/data/styles/incomplete/Drawer.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Frame.qml b/tests/auto/customization/data/styles/incomplete/Frame.qml index 9f409cfddf..e447b5c2df 100644 --- a/tests/auto/customization/data/styles/incomplete/Frame.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/GroupBox.qml b/tests/auto/customization/data/styles/incomplete/GroupBox.qml index 4c5b258e6c..3597f1587d 100644 --- a/tests/auto/customization/data/styles/incomplete/GroupBox.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ItemDelegate.qml b/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml index 39063eb358..79334dcbd8 100644 --- a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Label.qml b/tests/auto/customization/data/styles/incomplete/Label.qml index 3a953004b8..e60ea00c4d 100644 --- a/tests/auto/customization/data/styles/incomplete/Label.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Menu.qml b/tests/auto/customization/data/styles/incomplete/Menu.qml index ca03cfe438..220d0038b9 100644 --- a/tests/auto/customization/data/styles/incomplete/Menu.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/MenuBar.qml b/tests/auto/customization/data/styles/incomplete/MenuBar.qml index bc98d4c8c4..b782eb4d09 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuBar.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/MenuBarItem.qml b/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml index 6b1dbc2e77..a979ecb7fa 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/MenuItem.qml b/tests/auto/customization/data/styles/incomplete/MenuItem.qml index 40539eaf53..b14f9089a6 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuItem.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/MenuSeparator.qml b/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml index eb799f31b8..ba6d27ecea 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Page.qml b/tests/auto/customization/data/styles/incomplete/Page.qml index 22964846c4..dbd29521ac 100644 --- a/tests/auto/customization/data/styles/incomplete/Page.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/PageIndicator.qml b/tests/auto/customization/data/styles/incomplete/PageIndicator.qml index 87cd363744..b18363407d 100644 --- a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Pane.qml b/tests/auto/customization/data/styles/incomplete/Pane.qml index f4c968879e..ecd7cbdf21 100644 --- a/tests/auto/customization/data/styles/incomplete/Pane.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Popup.qml b/tests/auto/customization/data/styles/incomplete/Popup.qml index fbba7f507c..a3d7d8d5dc 100644 --- a/tests/auto/customization/data/styles/incomplete/Popup.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ProgressBar.qml b/tests/auto/customization/data/styles/incomplete/ProgressBar.qml index 0186fa4eb6..293fe25481 100644 --- a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/RadioButton.qml b/tests/auto/customization/data/styles/incomplete/RadioButton.qml index fcd31ca6f1..f17729f791 100644 --- a/tests/auto/customization/data/styles/incomplete/RadioButton.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/RadioDelegate.qml b/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml index b64c0cabe1..8dd08aea84 100644 --- a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/RangeSlider.qml b/tests/auto/customization/data/styles/incomplete/RangeSlider.qml index c0faec20be..3a6ba580df 100644 --- a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/RoundButton.qml b/tests/auto/customization/data/styles/incomplete/RoundButton.qml index ddb24e3d13..d51ef732f3 100644 --- a/tests/auto/customization/data/styles/incomplete/RoundButton.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ScrollBar.qml b/tests/auto/customization/data/styles/incomplete/ScrollBar.qml index a79c4daaee..906a9847f8 100644 --- a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ScrollIndicator.qml b/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml index 2401fbe5fa..b34d40970d 100644 --- a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ScrollView.qml b/tests/auto/customization/data/styles/incomplete/ScrollView.qml index 736ea7b112..a120e05f97 100644 --- a/tests/auto/customization/data/styles/incomplete/ScrollView.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Slider.qml b/tests/auto/customization/data/styles/incomplete/Slider.qml index b4ede96fc9..02b06d92e4 100644 --- a/tests/auto/customization/data/styles/incomplete/Slider.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/SpinBox.qml b/tests/auto/customization/data/styles/incomplete/SpinBox.qml index 6303ab06c9..9ec62e016e 100644 --- a/tests/auto/customization/data/styles/incomplete/SpinBox.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/StackView.qml b/tests/auto/customization/data/styles/incomplete/StackView.qml index b163a594d9..4108e16678 100644 --- a/tests/auto/customization/data/styles/incomplete/StackView.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/SwipeDelegate.qml b/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml index a64b0fae76..0da62d0fd9 100644 --- a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/SwipeView.qml b/tests/auto/customization/data/styles/incomplete/SwipeView.qml index 078910633c..434f900361 100644 --- a/tests/auto/customization/data/styles/incomplete/SwipeView.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Switch.qml b/tests/auto/customization/data/styles/incomplete/Switch.qml index 53e4114915..9f24763fa6 100644 --- a/tests/auto/customization/data/styles/incomplete/Switch.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/SwitchDelegate.qml b/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml index c9be903f74..a33809c7df 100644 --- a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/TabBar.qml b/tests/auto/customization/data/styles/incomplete/TabBar.qml index 1a55af4d3a..68e4f62700 100644 --- a/tests/auto/customization/data/styles/incomplete/TabBar.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/TabButton.qml b/tests/auto/customization/data/styles/incomplete/TabButton.qml index e2e88a9964..9ab619a934 100644 --- a/tests/auto/customization/data/styles/incomplete/TabButton.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/TextArea.qml b/tests/auto/customization/data/styles/incomplete/TextArea.qml index cf56e5a049..42f3d2fdeb 100644 --- a/tests/auto/customization/data/styles/incomplete/TextArea.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/TextField.qml b/tests/auto/customization/data/styles/incomplete/TextField.qml index 66f8372b4f..001d86b1c5 100644 --- a/tests/auto/customization/data/styles/incomplete/TextField.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ToolBar.qml b/tests/auto/customization/data/styles/incomplete/ToolBar.qml index a665bd25df..de0bdb392d 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolBar.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ToolButton.qml b/tests/auto/customization/data/styles/incomplete/ToolButton.qml index 3fa5124686..12b55b15a2 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolButton.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ToolSeparator.qml b/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml index 17b26d7c31..aa413dd093 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/ToolTip.qml b/tests/auto/customization/data/styles/incomplete/ToolTip.qml index 7aee36489c..d2104f9eeb 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolTip.qml +++ b/tests/auto/customization/data/styles/incomplete/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/incomplete/Tumbler.qml b/tests/auto/customization/data/styles/incomplete/Tumbler.qml index cda24bc2b0..996af0d2cd 100644 --- a/tests/auto/customization/data/styles/incomplete/Tumbler.qml +++ b/tests/auto/customization/data/styles/incomplete/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 diff --git a/tests/auto/customization/data/styles/override/AbstractButton.qml b/tests/auto/customization/data/styles/override/AbstractButton.qml index 398b51b7c6..e8bf0b90f5 100644 --- a/tests/auto/customization/data/styles/override/AbstractButton.qml +++ b/tests/auto/customization/data/styles/override/AbstractButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.AbstractButton { diff --git a/tests/auto/customization/data/styles/override/ApplicationWindow.qml b/tests/auto/customization/data/styles/override/ApplicationWindow.qml index 7a760574da..43b94010e6 100644 --- a/tests/auto/customization/data/styles/override/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/override/ApplicationWindow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ApplicationWindow { diff --git a/tests/auto/customization/data/styles/override/BusyIndicator.qml b/tests/auto/customization/data/styles/override/BusyIndicator.qml index 2b70548fb5..12418ff720 100644 --- a/tests/auto/customization/data/styles/override/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/override/BusyIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.BusyIndicator { diff --git a/tests/auto/customization/data/styles/override/Button.qml b/tests/auto/customization/data/styles/override/Button.qml index 35f260c3ac..692c2fda2e 100644 --- a/tests/auto/customization/data/styles/override/Button.qml +++ b/tests/auto/customization/data/styles/override/Button.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Button { diff --git a/tests/auto/customization/data/styles/override/CheckBox.qml b/tests/auto/customization/data/styles/override/CheckBox.qml index 857b86ea13..9830931b16 100644 --- a/tests/auto/customization/data/styles/override/CheckBox.qml +++ b/tests/auto/customization/data/styles/override/CheckBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.CheckBox { diff --git a/tests/auto/customization/data/styles/override/CheckDelegate.qml b/tests/auto/customization/data/styles/override/CheckDelegate.qml index 17e0ed4876..77cdf23d28 100644 --- a/tests/auto/customization/data/styles/override/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/override/CheckDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.CheckDelegate { diff --git a/tests/auto/customization/data/styles/override/ComboBox.qml b/tests/auto/customization/data/styles/override/ComboBox.qml index a41e467442..c3276dccdf 100644 --- a/tests/auto/customization/data/styles/override/ComboBox.qml +++ b/tests/auto/customization/data/styles/override/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import "../simple" as Simple Simple.ComboBox { diff --git a/tests/auto/customization/data/styles/override/Container.qml b/tests/auto/customization/data/styles/override/Container.qml index d4d6c1894a..b732aefa7a 100644 --- a/tests/auto/customization/data/styles/override/Container.qml +++ b/tests/auto/customization/data/styles/override/Container.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Container { diff --git a/tests/auto/customization/data/styles/override/Control.qml b/tests/auto/customization/data/styles/override/Control.qml index fc6acb8f37..b4fefcf57b 100644 --- a/tests/auto/customization/data/styles/override/Control.qml +++ b/tests/auto/customization/data/styles/override/Control.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Control { diff --git a/tests/auto/customization/data/styles/override/DelayButton.qml b/tests/auto/customization/data/styles/override/DelayButton.qml index 69fcf49d98..5ee03d57eb 100644 --- a/tests/auto/customization/data/styles/override/DelayButton.qml +++ b/tests/auto/customization/data/styles/override/DelayButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.DelayButton { diff --git a/tests/auto/customization/data/styles/override/Dial.qml b/tests/auto/customization/data/styles/override/Dial.qml index 484f8c3f34..d452a58f31 100644 --- a/tests/auto/customization/data/styles/override/Dial.qml +++ b/tests/auto/customization/data/styles/override/Dial.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Dial { diff --git a/tests/auto/customization/data/styles/override/Dialog.qml b/tests/auto/customization/data/styles/override/Dialog.qml index 81798a39dc..29e3d26d33 100644 --- a/tests/auto/customization/data/styles/override/Dialog.qml +++ b/tests/auto/customization/data/styles/override/Dialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Dialog { diff --git a/tests/auto/customization/data/styles/override/DialogButtonBox.qml b/tests/auto/customization/data/styles/override/DialogButtonBox.qml index 5ab315d491..c79b9f815b 100644 --- a/tests/auto/customization/data/styles/override/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/override/DialogButtonBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.DialogButtonBox { diff --git a/tests/auto/customization/data/styles/override/Drawer.qml b/tests/auto/customization/data/styles/override/Drawer.qml index 943522e7d6..65aa625c00 100644 --- a/tests/auto/customization/data/styles/override/Drawer.qml +++ b/tests/auto/customization/data/styles/override/Drawer.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Drawer { diff --git a/tests/auto/customization/data/styles/override/Frame.qml b/tests/auto/customization/data/styles/override/Frame.qml index b3b589b56d..b31b70aa95 100644 --- a/tests/auto/customization/data/styles/override/Frame.qml +++ b/tests/auto/customization/data/styles/override/Frame.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Frame { diff --git a/tests/auto/customization/data/styles/override/GroupBox.qml b/tests/auto/customization/data/styles/override/GroupBox.qml index 570bc63e04..0d0bfbd9aa 100644 --- a/tests/auto/customization/data/styles/override/GroupBox.qml +++ b/tests/auto/customization/data/styles/override/GroupBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.GroupBox { diff --git a/tests/auto/customization/data/styles/override/ItemDelegate.qml b/tests/auto/customization/data/styles/override/ItemDelegate.qml index 6b2fd92806..4a087c75aa 100644 --- a/tests/auto/customization/data/styles/override/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/override/ItemDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ItemDelegate { diff --git a/tests/auto/customization/data/styles/override/Label.qml b/tests/auto/customization/data/styles/override/Label.qml index 249a9e9974..883cff743d 100644 --- a/tests/auto/customization/data/styles/override/Label.qml +++ b/tests/auto/customization/data/styles/override/Label.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Label { diff --git a/tests/auto/customization/data/styles/override/Menu.qml b/tests/auto/customization/data/styles/override/Menu.qml index 4e10c480a8..f551fae8fe 100644 --- a/tests/auto/customization/data/styles/override/Menu.qml +++ b/tests/auto/customization/data/styles/override/Menu.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Menu { diff --git a/tests/auto/customization/data/styles/override/MenuBar.qml b/tests/auto/customization/data/styles/override/MenuBar.qml index baeef20919..b7f54cfbac 100644 --- a/tests/auto/customization/data/styles/override/MenuBar.qml +++ b/tests/auto/customization/data/styles/override/MenuBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.MenuBar { diff --git a/tests/auto/customization/data/styles/override/MenuBarItem.qml b/tests/auto/customization/data/styles/override/MenuBarItem.qml index a76ca190ac..513b59ce87 100644 --- a/tests/auto/customization/data/styles/override/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/override/MenuBarItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.MenuBarItem { diff --git a/tests/auto/customization/data/styles/override/MenuItem.qml b/tests/auto/customization/data/styles/override/MenuItem.qml index ee10e1bab3..7f7f569a0e 100644 --- a/tests/auto/customization/data/styles/override/MenuItem.qml +++ b/tests/auto/customization/data/styles/override/MenuItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.MenuItem { diff --git a/tests/auto/customization/data/styles/override/MenuSeparator.qml b/tests/auto/customization/data/styles/override/MenuSeparator.qml index c60cedea13..57a2db1517 100644 --- a/tests/auto/customization/data/styles/override/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/override/MenuSeparator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.MenuSeparator { diff --git a/tests/auto/customization/data/styles/override/Page.qml b/tests/auto/customization/data/styles/override/Page.qml index 9f85d9e970..c51d1e7313 100644 --- a/tests/auto/customization/data/styles/override/Page.qml +++ b/tests/auto/customization/data/styles/override/Page.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Page { diff --git a/tests/auto/customization/data/styles/override/PageIndicator.qml b/tests/auto/customization/data/styles/override/PageIndicator.qml index 1d1e20ed90..3d58299e1b 100644 --- a/tests/auto/customization/data/styles/override/PageIndicator.qml +++ b/tests/auto/customization/data/styles/override/PageIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.PageIndicator { diff --git a/tests/auto/customization/data/styles/override/Pane.qml b/tests/auto/customization/data/styles/override/Pane.qml index fb56cc07ee..70a2944179 100644 --- a/tests/auto/customization/data/styles/override/Pane.qml +++ b/tests/auto/customization/data/styles/override/Pane.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Pane { diff --git a/tests/auto/customization/data/styles/override/Popup.qml b/tests/auto/customization/data/styles/override/Popup.qml index 54e8a4f724..a63879bd26 100644 --- a/tests/auto/customization/data/styles/override/Popup.qml +++ b/tests/auto/customization/data/styles/override/Popup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Popup { diff --git a/tests/auto/customization/data/styles/override/ProgressBar.qml b/tests/auto/customization/data/styles/override/ProgressBar.qml index ce0623f200..2a9e636ada 100644 --- a/tests/auto/customization/data/styles/override/ProgressBar.qml +++ b/tests/auto/customization/data/styles/override/ProgressBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ProgressBar { diff --git a/tests/auto/customization/data/styles/override/RadioButton.qml b/tests/auto/customization/data/styles/override/RadioButton.qml index c435b3d928..5bd5c721d0 100644 --- a/tests/auto/customization/data/styles/override/RadioButton.qml +++ b/tests/auto/customization/data/styles/override/RadioButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.RadioButton { diff --git a/tests/auto/customization/data/styles/override/RadioDelegate.qml b/tests/auto/customization/data/styles/override/RadioDelegate.qml index 2659800edd..7fbe3833f1 100644 --- a/tests/auto/customization/data/styles/override/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/override/RadioDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.RadioDelegate { diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/customization/data/styles/override/RangeSlider.qml index 7c8cdbbc20..0f4cda9999 100644 --- a/tests/auto/customization/data/styles/override/RangeSlider.qml +++ b/tests/auto/customization/data/styles/override/RangeSlider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.RangeSlider { diff --git a/tests/auto/customization/data/styles/override/RoundButton.qml b/tests/auto/customization/data/styles/override/RoundButton.qml index 233d0c3099..1a0b0e05e8 100644 --- a/tests/auto/customization/data/styles/override/RoundButton.qml +++ b/tests/auto/customization/data/styles/override/RoundButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.RoundButton { diff --git a/tests/auto/customization/data/styles/override/ScrollBar.qml b/tests/auto/customization/data/styles/override/ScrollBar.qml index 69fc08f61b..fc551710e2 100644 --- a/tests/auto/customization/data/styles/override/ScrollBar.qml +++ b/tests/auto/customization/data/styles/override/ScrollBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ScrollBar { diff --git a/tests/auto/customization/data/styles/override/ScrollIndicator.qml b/tests/auto/customization/data/styles/override/ScrollIndicator.qml index 15a44e7ac0..06497abb6e 100644 --- a/tests/auto/customization/data/styles/override/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/override/ScrollIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ScrollIndicator { diff --git a/tests/auto/customization/data/styles/override/ScrollView.qml b/tests/auto/customization/data/styles/override/ScrollView.qml index a8041961a7..bc02c26583 100644 --- a/tests/auto/customization/data/styles/override/ScrollView.qml +++ b/tests/auto/customization/data/styles/override/ScrollView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ScrollView { diff --git a/tests/auto/customization/data/styles/override/Slider.qml b/tests/auto/customization/data/styles/override/Slider.qml index 252752fd5c..052c523be3 100644 --- a/tests/auto/customization/data/styles/override/Slider.qml +++ b/tests/auto/customization/data/styles/override/Slider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Slider { diff --git a/tests/auto/customization/data/styles/override/SpinBox.qml b/tests/auto/customization/data/styles/override/SpinBox.qml index 041ba6a0c1..d074ec6372 100644 --- a/tests/auto/customization/data/styles/override/SpinBox.qml +++ b/tests/auto/customization/data/styles/override/SpinBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.SpinBox { diff --git a/tests/auto/customization/data/styles/override/StackView.qml b/tests/auto/customization/data/styles/override/StackView.qml index aa35fd625a..bc33d64bae 100644 --- a/tests/auto/customization/data/styles/override/StackView.qml +++ b/tests/auto/customization/data/styles/override/StackView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.StackView { diff --git a/tests/auto/customization/data/styles/override/SwipeDelegate.qml b/tests/auto/customization/data/styles/override/SwipeDelegate.qml index 634f1e699f..bb38737036 100644 --- a/tests/auto/customization/data/styles/override/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/override/SwipeDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.SwipeDelegate { diff --git a/tests/auto/customization/data/styles/override/SwipeView.qml b/tests/auto/customization/data/styles/override/SwipeView.qml index ffea0df8d3..63646a0bbf 100644 --- a/tests/auto/customization/data/styles/override/SwipeView.qml +++ b/tests/auto/customization/data/styles/override/SwipeView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.SwipeView { diff --git a/tests/auto/customization/data/styles/override/Switch.qml b/tests/auto/customization/data/styles/override/Switch.qml index 0006b00d21..57a3f8049f 100644 --- a/tests/auto/customization/data/styles/override/Switch.qml +++ b/tests/auto/customization/data/styles/override/Switch.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Switch { diff --git a/tests/auto/customization/data/styles/override/SwitchDelegate.qml b/tests/auto/customization/data/styles/override/SwitchDelegate.qml index 6a9e318c6e..6b9986d8f6 100644 --- a/tests/auto/customization/data/styles/override/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/override/SwitchDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.SwitchDelegate { diff --git a/tests/auto/customization/data/styles/override/TabBar.qml b/tests/auto/customization/data/styles/override/TabBar.qml index 11c009e63b..b3e03bddad 100644 --- a/tests/auto/customization/data/styles/override/TabBar.qml +++ b/tests/auto/customization/data/styles/override/TabBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.TabBar { diff --git a/tests/auto/customization/data/styles/override/TabButton.qml b/tests/auto/customization/data/styles/override/TabButton.qml index 967e6ab5c2..f2852f684f 100644 --- a/tests/auto/customization/data/styles/override/TabButton.qml +++ b/tests/auto/customization/data/styles/override/TabButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.TabButton { diff --git a/tests/auto/customization/data/styles/override/TextArea.qml b/tests/auto/customization/data/styles/override/TextArea.qml index 5a1b1fe958..ad4a3c7b11 100644 --- a/tests/auto/customization/data/styles/override/TextArea.qml +++ b/tests/auto/customization/data/styles/override/TextArea.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.TextArea { diff --git a/tests/auto/customization/data/styles/override/TextField.qml b/tests/auto/customization/data/styles/override/TextField.qml index 2c37d9ae3b..39bb695e34 100644 --- a/tests/auto/customization/data/styles/override/TextField.qml +++ b/tests/auto/customization/data/styles/override/TextField.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.TextField { diff --git a/tests/auto/customization/data/styles/override/ToolBar.qml b/tests/auto/customization/data/styles/override/ToolBar.qml index 51346893f7..8af7238ee3 100644 --- a/tests/auto/customization/data/styles/override/ToolBar.qml +++ b/tests/auto/customization/data/styles/override/ToolBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ToolBar { diff --git a/tests/auto/customization/data/styles/override/ToolButton.qml b/tests/auto/customization/data/styles/override/ToolButton.qml index 67bbcf6459..a9e285fb5c 100644 --- a/tests/auto/customization/data/styles/override/ToolButton.qml +++ b/tests/auto/customization/data/styles/override/ToolButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ToolButton { diff --git a/tests/auto/customization/data/styles/override/ToolSeparator.qml b/tests/auto/customization/data/styles/override/ToolSeparator.qml index 70704e6b1d..5c6b408d8a 100644 --- a/tests/auto/customization/data/styles/override/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/override/ToolSeparator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ToolSeparator { diff --git a/tests/auto/customization/data/styles/override/ToolTip.qml b/tests/auto/customization/data/styles/override/ToolTip.qml index 4be4dc43de..642d618400 100644 --- a/tests/auto/customization/data/styles/override/ToolTip.qml +++ b/tests/auto/customization/data/styles/override/ToolTip.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.ToolTip { diff --git a/tests/auto/customization/data/styles/override/Tumbler.qml b/tests/auto/customization/data/styles/override/Tumbler.qml index f3d5627311..72d68f8a31 100644 --- a/tests/auto/customization/data/styles/override/Tumbler.qml +++ b/tests/auto/customization/data/styles/override/Tumbler.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "../simple" as Simple Simple.Tumbler { diff --git a/tests/auto/customization/data/styles/simple/AbstractButton.qml b/tests/auto/customization/data/styles/simple/AbstractButton.qml index 2daaea4827..f8eaef0c25 100644 --- a/tests/auto/customization/data/styles/simple/AbstractButton.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ApplicationWindow.qml b/tests/auto/customization/data/styles/simple/ApplicationWindow.qml index 6cf6440d38..ec39193b43 100644 --- a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/BusyIndicator.qml b/tests/auto/customization/data/styles/simple/BusyIndicator.qml index f859a09b42..1dcebb9b7a 100644 --- a/tests/auto/customization/data/styles/simple/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Button.qml b/tests/auto/customization/data/styles/simple/Button.qml index 66240ba21c..993c585bd9 100644 --- a/tests/auto/customization/data/styles/simple/Button.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/CheckBox.qml b/tests/auto/customization/data/styles/simple/CheckBox.qml index 931228b0c2..f4a95f0feb 100644 --- a/tests/auto/customization/data/styles/simple/CheckBox.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/CheckDelegate.qml b/tests/auto/customization/data/styles/simple/CheckDelegate.qml index cc1cdd7ac7..563db32945 100644 --- a/tests/auto/customization/data/styles/simple/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ComboBox.qml b/tests/auto/customization/data/styles/simple/ComboBox.qml index 658f5d77ad..ed8613891b 100644 --- a/tests/auto/customization/data/styles/simple/ComboBox.qml +++ b/tests/auto/customization/data/styles/simple/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/simple/Container.qml b/tests/auto/customization/data/styles/simple/Container.qml index cfa32324d3..4a15009647 100644 --- a/tests/auto/customization/data/styles/simple/Container.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Control.qml b/tests/auto/customization/data/styles/simple/Control.qml index d8ba3c81a3..e083f8acb1 100644 --- a/tests/auto/customization/data/styles/simple/Control.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/DelayButton.qml b/tests/auto/customization/data/styles/simple/DelayButton.qml index d48abf9c46..8f33c40156 100644 --- a/tests/auto/customization/data/styles/simple/DelayButton.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Dial.qml b/tests/auto/customization/data/styles/simple/Dial.qml index 26f1f86a05..c1a9b50ba0 100644 --- a/tests/auto/customization/data/styles/simple/Dial.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Dialog.qml b/tests/auto/customization/data/styles/simple/Dialog.qml index 020ff66bd5..787acca9b3 100644 --- a/tests/auto/customization/data/styles/simple/Dialog.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/DialogButtonBox.qml b/tests/auto/customization/data/styles/simple/DialogButtonBox.qml index 6514647ea7..d7da32e0ad 100644 --- a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Drawer.qml b/tests/auto/customization/data/styles/simple/Drawer.qml index ac75cbdff6..8239b1afca 100644 --- a/tests/auto/customization/data/styles/simple/Drawer.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Frame.qml b/tests/auto/customization/data/styles/simple/Frame.qml index 11a8e0fce9..cbeb3c5dc5 100644 --- a/tests/auto/customization/data/styles/simple/Frame.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/GroupBox.qml b/tests/auto/customization/data/styles/simple/GroupBox.qml index 309950ead3..14dc33414d 100644 --- a/tests/auto/customization/data/styles/simple/GroupBox.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ItemDelegate.qml b/tests/auto/customization/data/styles/simple/ItemDelegate.qml index 9eb3c9c8ef..a22ec3aa39 100644 --- a/tests/auto/customization/data/styles/simple/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Label.qml b/tests/auto/customization/data/styles/simple/Label.qml index d7afddbb26..80b34723c7 100644 --- a/tests/auto/customization/data/styles/simple/Label.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Menu.qml b/tests/auto/customization/data/styles/simple/Menu.qml index 3c2d487cc3..7538bd5b7e 100644 --- a/tests/auto/customization/data/styles/simple/Menu.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/MenuBar.qml b/tests/auto/customization/data/styles/simple/MenuBar.qml index 1e64a3ac36..a38c876e9a 100644 --- a/tests/auto/customization/data/styles/simple/MenuBar.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/MenuBarItem.qml b/tests/auto/customization/data/styles/simple/MenuBarItem.qml index 1454ceaafc..de9dc92911 100644 --- a/tests/auto/customization/data/styles/simple/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/MenuItem.qml b/tests/auto/customization/data/styles/simple/MenuItem.qml index 59ac34717e..28d5998b22 100644 --- a/tests/auto/customization/data/styles/simple/MenuItem.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/MenuSeparator.qml b/tests/auto/customization/data/styles/simple/MenuSeparator.qml index 413b412f05..3df17b5825 100644 --- a/tests/auto/customization/data/styles/simple/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Page.qml b/tests/auto/customization/data/styles/simple/Page.qml index 950bbdc0c6..51ec606363 100644 --- a/tests/auto/customization/data/styles/simple/Page.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/PageIndicator.qml b/tests/auto/customization/data/styles/simple/PageIndicator.qml index 7ec5c57aca..d508687f1c 100644 --- a/tests/auto/customization/data/styles/simple/PageIndicator.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Pane.qml b/tests/auto/customization/data/styles/simple/Pane.qml index 86fb079fae..3b9e12b8c3 100644 --- a/tests/auto/customization/data/styles/simple/Pane.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Popup.qml b/tests/auto/customization/data/styles/simple/Popup.qml index 41b90be059..8b62fcade0 100644 --- a/tests/auto/customization/data/styles/simple/Popup.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ProgressBar.qml b/tests/auto/customization/data/styles/simple/ProgressBar.qml index 81c0f1468d..3f04e6b22a 100644 --- a/tests/auto/customization/data/styles/simple/ProgressBar.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/RadioButton.qml b/tests/auto/customization/data/styles/simple/RadioButton.qml index c9910756bb..7ca5973bc3 100644 --- a/tests/auto/customization/data/styles/simple/RadioButton.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/RadioDelegate.qml b/tests/auto/customization/data/styles/simple/RadioDelegate.qml index c59fa336a1..bc96ad47aa 100644 --- a/tests/auto/customization/data/styles/simple/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/RangeSlider.qml b/tests/auto/customization/data/styles/simple/RangeSlider.qml index d16c4bcf9c..202688c48b 100644 --- a/tests/auto/customization/data/styles/simple/RangeSlider.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/RoundButton.qml b/tests/auto/customization/data/styles/simple/RoundButton.qml index c5609e3417..3547239f39 100644 --- a/tests/auto/customization/data/styles/simple/RoundButton.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ScrollBar.qml b/tests/auto/customization/data/styles/simple/ScrollBar.qml index 01f3f78e7c..25bc3e09ec 100644 --- a/tests/auto/customization/data/styles/simple/ScrollBar.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ScrollIndicator.qml b/tests/auto/customization/data/styles/simple/ScrollIndicator.qml index 4b802ed7fa..a901671bba 100644 --- a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ScrollView.qml b/tests/auto/customization/data/styles/simple/ScrollView.qml index fe78228536..56334d841d 100644 --- a/tests/auto/customization/data/styles/simple/ScrollView.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Slider.qml b/tests/auto/customization/data/styles/simple/Slider.qml index 109709b237..d5417404f0 100644 --- a/tests/auto/customization/data/styles/simple/Slider.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/SpinBox.qml b/tests/auto/customization/data/styles/simple/SpinBox.qml index 9db98875ab..0facffad59 100644 --- a/tests/auto/customization/data/styles/simple/SpinBox.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/StackView.qml b/tests/auto/customization/data/styles/simple/StackView.qml index f143927543..e16b9938bc 100644 --- a/tests/auto/customization/data/styles/simple/StackView.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/SwipeDelegate.qml b/tests/auto/customization/data/styles/simple/SwipeDelegate.qml index 27701a9267..fec9f120fa 100644 --- a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/SwipeView.qml b/tests/auto/customization/data/styles/simple/SwipeView.qml index abdde942cf..cf154b6b97 100644 --- a/tests/auto/customization/data/styles/simple/SwipeView.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Switch.qml b/tests/auto/customization/data/styles/simple/Switch.qml index 8d008ffbd5..9e9613084a 100644 --- a/tests/auto/customization/data/styles/simple/Switch.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/SwitchDelegate.qml b/tests/auto/customization/data/styles/simple/SwitchDelegate.qml index cdc91314ac..f7eb1d5c37 100644 --- a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/TabBar.qml b/tests/auto/customization/data/styles/simple/TabBar.qml index 5055346e67..6b0f2b6327 100644 --- a/tests/auto/customization/data/styles/simple/TabBar.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/TabButton.qml b/tests/auto/customization/data/styles/simple/TabButton.qml index d6b676478f..4c8a30ba81 100644 --- a/tests/auto/customization/data/styles/simple/TabButton.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/TextArea.qml b/tests/auto/customization/data/styles/simple/TextArea.qml index 10c326a6b5..7e906433fe 100644 --- a/tests/auto/customization/data/styles/simple/TextArea.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/TextField.qml b/tests/auto/customization/data/styles/simple/TextField.qml index 09c12a6071..71a685349b 100644 --- a/tests/auto/customization/data/styles/simple/TextField.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ToolBar.qml b/tests/auto/customization/data/styles/simple/ToolBar.qml index 9b23b67c01..30bba195e4 100644 --- a/tests/auto/customization/data/styles/simple/ToolBar.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ToolButton.qml b/tests/auto/customization/data/styles/simple/ToolButton.qml index 13ccb576ef..229b75368a 100644 --- a/tests/auto/customization/data/styles/simple/ToolButton.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ToolSeparator.qml b/tests/auto/customization/data/styles/simple/ToolSeparator.qml index ef172f741c..8ee00bc36c 100644 --- a/tests/auto/customization/data/styles/simple/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/ToolTip.qml b/tests/auto/customization/data/styles/simple/ToolTip.qml index 27a61c1791..0299adf181 100644 --- a/tests/auto/customization/data/styles/simple/ToolTip.qml +++ b/tests/auto/customization/data/styles/simple/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/simple/Tumbler.qml b/tests/auto/customization/data/styles/simple/Tumbler.qml index 58c8554105..34f423c7eb 100644 --- a/tests/auto/customization/data/styles/simple/Tumbler.qml +++ b/tests/auto/customization/data/styles/simple/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 diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp index 498a9e6099..6cb3d82cb6 100644 --- a/tests/auto/customization/tst_customization.cpp +++ b/tests/auto/customization/tst_customization.cpp @@ -256,7 +256,7 @@ void tst_customization::reset() QObject* tst_customization::createControl(const QString &name, const QString &qml, QString *error) { QQmlComponent component(engine); - component.setData("import QtQuick 2.10; import QtQuick.Window 2.2; import QtQuick.Controls 2.3; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl()); + component.setData("import QtQuick; import QtQuick.Window; import QtQuick.Controls; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl()); QObject *obj = component.create(); if (!obj) *error = component.errorString(); @@ -483,7 +483,7 @@ void tst_customization::comboPopup() { // test that ComboBox::popup is created when accessed QQmlComponent component(engine); - component.setData("import QtQuick.Controls 2.2; ComboBox { }", QUrl()); + component.setData("import QtQuick.Controls; ComboBox { }", QUrl()); QScopedPointer<QQuickItem> comboBox(qobject_cast<QQuickItem *>(component.create())); QVERIFY(comboBox); @@ -505,7 +505,7 @@ void tst_customization::comboPopup() QVERIFY(QTest::qWaitForWindowActive(&window)); QQmlComponent component(engine); - component.setData("import QtQuick.Controls 2.2; ComboBox { }", QUrl()); + component.setData("import QtQuick.Controls; ComboBox { }", QUrl()); QScopedPointer<QQuickItem> comboBox(qobject_cast<QQuickItem *>(component.create())); QVERIFY(comboBox); @@ -521,7 +521,7 @@ void tst_customization::comboPopup() { // test that ComboBox::popup is completed upon component completion (if appropriate) QQmlComponent component(engine); - component.setData("import QtQuick 2.9; import QtQuick.Controls 2.2; ComboBox { id: control; contentItem: Item { visible: !control.popup.visible } popup: Popup { property bool wasCompleted: false; Component.onCompleted: wasCompleted = true } }", QUrl()); + component.setData("import QtQuick; import QtQuick.Controls; ComboBox { id: control; contentItem: Item { visible: !control.popup.visible } popup: Popup { property bool wasCompleted: false; Component.onCompleted: wasCompleted = true } }", QUrl()); QScopedPointer<QQuickItem> comboBox(qobject_cast<QQuickItem *>(component.create())); QVERIFY(comboBox); diff --git a/tests/auto/focus/data/activeFocusOnTab.qml b/tests/auto/focus/data/activeFocusOnTab.qml index 21bea5e863..6b57f39b1e 100644 --- a/tests/auto/focus/data/activeFocusOnTab.qml +++ b/tests/auto/focus/data/activeFocusOnTab.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { id: main diff --git a/tests/auto/focus/data/keyNavigation.qml b/tests/auto/focus/data/keyNavigation.qml index 6e949d1d9e..7ac8e014cd 100644 --- a/tests/auto/focus/data/keyNavigation.qml +++ b/tests/auto/focus/data/keyNavigation.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { id: main diff --git a/tests/auto/focus/data/visualFocus.qml b/tests/auto/focus/data/visualFocus.qml index 3f3e8fb6bb..2f516be767 100644 --- a/tests/auto/focus/data/visualFocus.qml +++ b/tests/auto/focus/data/visualFocus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Column { width: 400 diff --git a/tests/auto/font/data/font-appwindow-custom.qml b/tests/auto/font/data/font-appwindow-custom.qml index 20101bfa00..9f82079e05 100644 --- a/tests/auto/font/data/font-appwindow-custom.qml +++ b/tests/auto/font/data/font-appwindow-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { font.capitalization: Font.AllUppercase diff --git a/tests/auto/font/data/font-appwindow-default.qml b/tests/auto/font/data/font-appwindow-default.qml index bc75cbb29c..9f2c34fe17 100644 --- a/tests/auto/font/data/font-appwindow-default.qml +++ b/tests/auto/font/data/font-appwindow-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { } diff --git a/tests/auto/font/data/font-control-custom.qml b/tests/auto/font/data/font-control-custom.qml index 3f198746ee..8fcfc68612 100644 --- a/tests/auto/font/data/font-control-custom.qml +++ b/tests/auto/font/data/font-control-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { font.capitalization: Font.AllUppercase diff --git a/tests/auto/font/data/font-control-default.qml b/tests/auto/font/data/font-control-default.qml index e7e78036f9..48afa021cd 100644 --- a/tests/auto/font/data/font-control-default.qml +++ b/tests/auto/font/data/font-control-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { } diff --git a/tests/auto/font/data/font-popup-custom.qml b/tests/auto/font/data/font-popup-custom.qml index 3d9eb4a2ac..e3983bf518 100644 --- a/tests/auto/font/data/font-popup-custom.qml +++ b/tests/auto/font/data/font-popup-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Popup { font.capitalization: Font.AllUppercase diff --git a/tests/auto/font/data/font-popup-default.qml b/tests/auto/font/data/font-popup-default.qml index a9bde41322..77676baccf 100644 --- a/tests/auto/font/data/font-popup-default.qml +++ b/tests/auto/font/data/font-popup-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Popup { } diff --git a/tests/auto/font/data/inheritance-childcontrol.qml b/tests/auto/font/data/inheritance-childcontrol.qml index 4ddab64cac..896354dfb0 100644 --- a/tests/auto/font/data/inheritance-childcontrol.qml +++ b/tests/auto/font/data/inheritance-childcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-childpopup.qml b/tests/auto/font/data/inheritance-childpopup.qml index 6868949b88..7896a558e9 100644 --- a/tests/auto/font/data/inheritance-childpopup.qml +++ b/tests/auto/font/data/inheritance-childpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-control.qml b/tests/auto/font/data/inheritance-control.qml index 68f7371cc0..eb534180a8 100644 --- a/tests/auto/font/data/inheritance-control.qml +++ b/tests/auto/font/data/inheritance-control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml index 1f7c56d17b..0a4e5bc664 100644 --- a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml +++ b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/font/data/inheritance-dynamicchildpopup.qml index a32d34ec2e..0e799d47f0 100644 --- a/tests/auto/font/data/inheritance-dynamicchildpopup.qml +++ b/tests/auto/font/data/inheritance-dynamicchildpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamiccontrol.qml b/tests/auto/font/data/inheritance-dynamiccontrol.qml index d200e39712..058d5b8b95 100644 --- a/tests/auto/font/data/inheritance-dynamiccontrol.qml +++ b/tests/auto/font/data/inheritance-dynamiccontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicpopup.qml b/tests/auto/font/data/inheritance-dynamicpopup.qml index a084cc1ba1..429669c7b2 100644 --- a/tests/auto/font/data/inheritance-dynamicpopup.qml +++ b/tests/auto/font/data/inheritance-dynamicpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-popup.qml b/tests/auto/font/data/inheritance-popup.qml index e114287fc2..cd2aebb55a 100644 --- a/tests/auto/font/data/inheritance-popup.qml +++ b/tests/auto/font/data/inheritance-popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/font/data/listview.qml b/tests/auto/font/data/listview.qml index 048567e53d..7c37258519 100644 --- a/tests/auto/font/data/listview.qml +++ b/tests/auto/font/data/listview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/bindings.qml b/tests/auto/palette/data/bindings.qml index f87b657269..5f156c96f1 100644 --- a/tests/auto/palette/data/bindings.qml +++ b/tests/auto/palette/data/bindings.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 6.0 -import QtQuick.Window 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.13 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-childcontrol.qml b/tests/auto/palette/data/inheritance-childcontrol.qml index 4ddab64cac..896354dfb0 100644 --- a/tests/auto/palette/data/inheritance-childcontrol.qml +++ b/tests/auto/palette/data/inheritance-childcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-childpopup.qml b/tests/auto/palette/data/inheritance-childpopup.qml index 6868949b88..7896a558e9 100644 --- a/tests/auto/palette/data/inheritance-childpopup.qml +++ b/tests/auto/palette/data/inheritance-childpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-control.qml b/tests/auto/palette/data/inheritance-control.qml index 68f7371cc0..eb534180a8 100644 --- a/tests/auto/palette/data/inheritance-control.qml +++ b/tests/auto/palette/data/inheritance-control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml index 1f7c56d17b..0a4e5bc664 100644 --- a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml +++ b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml index a32d34ec2e..0e799d47f0 100644 --- a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml +++ b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/palette/data/inheritance-dynamiccontrol.qml index d200e39712..058d5b8b95 100644 --- a/tests/auto/palette/data/inheritance-dynamiccontrol.qml +++ b/tests/auto/palette/data/inheritance-dynamiccontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicpopup.qml b/tests/auto/palette/data/inheritance-dynamicpopup.qml index a084cc1ba1..429669c7b2 100644 --- a/tests/auto/palette/data/inheritance-dynamicpopup.qml +++ b/tests/auto/palette/data/inheritance-dynamicpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-popup.qml b/tests/auto/palette/data/inheritance-popup.qml index e114287fc2..cd2aebb55a 100644 --- a/tests/auto/palette/data/inheritance-popup.qml +++ b/tests/auto/palette/data/inheritance-popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/listview.qml b/tests/auto/palette/data/listview.qml index a19f6d260f..eee6531f99 100644 --- a/tests/auto/palette/data/listview.qml +++ b/tests/auto/palette/data/listview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/palette/data/palette-appwindow-custom.qml b/tests/auto/palette/data/palette-appwindow-custom.qml index a59fb42c66..f5f75ae74d 100644 --- a/tests/auto/palette/data/palette-appwindow-custom.qml +++ b/tests/auto/palette/data/palette-appwindow-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { palette.alternateBase: "aqua" diff --git a/tests/auto/palette/data/palette-appwindow-default.qml b/tests/auto/palette/data/palette-appwindow-default.qml index bc75cbb29c..9f2c34fe17 100644 --- a/tests/auto/palette/data/palette-appwindow-default.qml +++ b/tests/auto/palette/data/palette-appwindow-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { } diff --git a/tests/auto/palette/data/palette-control-custom.qml b/tests/auto/palette/data/palette-control-custom.qml index fb4b9282de..6915404dd5 100644 --- a/tests/auto/palette/data/palette-control-custom.qml +++ b/tests/auto/palette/data/palette-control-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { palette.alternateBase: "aqua" diff --git a/tests/auto/palette/data/palette-control-default.qml b/tests/auto/palette/data/palette-control-default.qml index e7e78036f9..48afa021cd 100644 --- a/tests/auto/palette/data/palette-control-default.qml +++ b/tests/auto/palette/data/palette-control-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { } diff --git a/tests/auto/palette/data/palette-popup-custom.qml b/tests/auto/palette/data/palette-popup-custom.qml index ffecfea2af..47f52d173c 100644 --- a/tests/auto/palette/data/palette-popup-custom.qml +++ b/tests/auto/palette/data/palette-popup-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Popup { palette.alternateBase: "aqua" diff --git a/tests/auto/palette/data/palette-popup-default.qml b/tests/auto/palette/data/palette-popup-default.qml index a9bde41322..77676baccf 100644 --- a/tests/auto/palette/data/palette-popup-default.qml +++ b/tests/auto/palette/data/palette-popup-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Popup { } diff --git a/tests/auto/palette/data/set-palette.qml b/tests/auto/palette/data/set-palette.qml index f9f067e09b..2d0fe194ce 100644 --- a/tests/auto/palette/data/set-palette.qml +++ b/tests/auto/palette/data/set-palette.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 6.0 -import QtQuick.Controls 2.14 +import QtQuick +import QtQuick.Controls Control { palette { diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/platform/data/tst_colordialog.qml index 98122c25b6..12055a5ad6 100644 --- a/tests/auto/platform/data/tst_colordialog.qml +++ b/tests/auto/platform/data/tst_colordialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/platform/data/tst_filedialog.qml index 775e24d3c8..5a63dd2390 100644 --- a/tests/auto/platform/data/tst_filedialog.qml +++ b/tests/auto/platform/data/tst_filedialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/platform/data/tst_folderdialog.qml index 5f44b99506..37881c1aef 100644 --- a/tests/auto/platform/data/tst_folderdialog.qml +++ b/tests/auto/platform/data/tst_folderdialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/platform/data/tst_fontdialog.qml index 8166964f28..edb62e5226 100644 --- a/tests/auto/platform/data/tst_fontdialog.qml +++ b/tests/auto/platform/data/tst_fontdialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml index bb37c17b79..7e38922255 100644 --- a/tests/auto/platform/data/tst_menu.qml +++ b/tests/auto/platform/data/tst_menu.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/platform/data/tst_menubar.qml index 199c5010c7..0dd9eb91d6 100644 --- a/tests/auto/platform/data/tst_menubar.qml +++ b/tests/auto/platform/data/tst_menubar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml index 316af97d0a..0120832d05 100644 --- a/tests/auto/platform/data/tst_menuitem.qml +++ b/tests/auto/platform/data/tst_menuitem.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.1 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_menuitemgroup.qml b/tests/auto/platform/data/tst_menuitemgroup.qml index c65150cab1..117f79ce1a 100644 --- a/tests/auto/platform/data/tst_menuitemgroup.qml +++ b/tests/auto/platform/data/tst_menuitemgroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/platform/data/tst_menuseparator.qml index 29c48f6b33..52bb349fd3 100644 --- a/tests/auto/platform/data/tst_menuseparator.qml +++ b/tests/auto/platform/data/tst_menuseparator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml index d5f2e21f09..23a5c821b2 100644 --- a/tests/auto/platform/data/tst_messagedialog.qml +++ b/tests/auto/platform/data/tst_messagedialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/platform/data/tst_standardpaths.qml index 35f0d23bf8..841731be93 100644 --- a/tests/auto/platform/data/tst_standardpaths.qml +++ b/tests/auto/platform/data/tst_standardpaths.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.0 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml index d7a635516f..09f1026175 100644 --- a/tests/auto/platform/data/tst_systemtrayicon.qml +++ b/tests/auto/platform/data/tst_systemtrayicon.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import Qt.labs.platform 1.1 +import QtQuick +import QtTest +import Qt.labs.platform TestCase { id: testCase diff --git a/tests/auto/pressandhold/data/dependencies.qml b/tests/auto/pressandhold/data/dependencies.qml index dac5f935cb..280cfd2962 100644 --- a/tests/auto/pressandhold/data/dependencies.qml +++ b/tests/auto/pressandhold/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { } diff --git a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml index 743ae16d34..ef69499025 100644 --- a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml +++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml index 45b3d1e30b..07d783acee 100644 --- a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml +++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml index fdb349ce45..d241d995f2 100644 --- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml +++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { property alias childControl: childControl diff --git a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml index a9412fd6fe..738022e9e8 100644 --- a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml index d3218998e0..bf8f61b756 100644 --- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml +++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtGraphicalEffects ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml index 5dff2b6c71..4651c2fc78 100644 --- a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml +++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { visible: true diff --git a/tests/auto/qquickapplicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml index d29ed0f986..082e2409cf 100644 --- a/tests/auto/qquickapplicationwindow/data/fill.qml +++ b/tests/auto/qquickapplicationwindow/data/fill.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml index 313bbb5fb5..ca8da3c23b 100644 --- a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml +++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml index 8bde4bf1bc..f0abbb9a1e 100644 --- a/tests/auto/qquickapplicationwindow/data/font.qml +++ b/tests/auto/qquickapplicationwindow/data/font.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/qquickapplicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml index dc8404430d..6d4f37946e 100644 --- a/tests/auto/qquickapplicationwindow/data/layout.qml +++ b/tests/auto/qquickapplicationwindow/data/layout.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml index 5efb948f29..243ce44089 100644 --- a/tests/auto/qquickapplicationwindow/data/locale.qml +++ b/tests/auto/qquickapplicationwindow/data/locale.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/qquickapplicationwindow/data/opacity.qml b/tests/auto/qquickapplicationwindow/data/opacity.qml index cd96930768..d32725223e 100644 --- a/tests/auto/qquickapplicationwindow/data/opacity.qml +++ b/tests/auto/qquickapplicationwindow/data/opacity.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickcolor/data/tst_color.qml b/tests/auto/qquickcolor/data/tst_color.qml index e3083514a8..cdd07e1481 100644 --- a/tests/auto/qquickcolor/data/tst_color.qml +++ b/tests/auto/qquickcolor/data/tst_color.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtTest +import QtQuick.Controls +import QtQuick.Controls.impl TestCase { id: testCase diff --git a/tests/auto/qquickcontrol/data/flickable.qml b/tests/auto/qquickcontrol/data/flickable.qml index f3a1c381d8..0ac723207e 100644 --- a/tests/auto/qquickcontrol/data/flickable.qml +++ b/tests/auto/qquickcontrol/data/flickable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.14 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml index 8e1047b515..a7c70e049b 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml index 3de0680543..8b8efb4846 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml index 5042f44f84..449fbadb24 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml index 01b8ff77f0..3f2ed11897 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml index 7354b6b9ad..6d2951f740 100644 --- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml +++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml index 09d4302947..b3f98d9e58 100644 --- a/tests/auto/qquickdrawer/data/flickable.qml +++ b/tests/auto/qquickdrawer/data/flickable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml index 1f9bbcbb36..bd1b84aa5b 100644 --- a/tests/auto/qquickdrawer/data/grabber.qml +++ b/tests/auto/qquickdrawer/data/grabber.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml index af84cf9b23..dfd64ab1bd 100644 --- a/tests/auto/qquickdrawer/data/header.qml +++ b/tests/auto/qquickdrawer/data/header.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml index 57135e5ffd..03b69c4e63 100644 --- a/tests/auto/qquickdrawer/data/multiTouch.qml +++ b/tests/auto/qquickdrawer/data/multiTouch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml index d629e3d06e..d4d5fbd60d 100644 --- a/tests/auto/qquickdrawer/data/multiple.qml +++ b/tests/auto/qquickdrawer/data/multiple.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml index 841e0b778a..e3211fab9f 100644 --- a/tests/auto/qquickdrawer/data/reposition.qml +++ b/tests/auto/qquickdrawer/data/reposition.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/qquickdrawer/data/slider.qml index 391a79f079..b3db5a7b5b 100644 --- a/tests/auto/qquickdrawer/data/slider.qml +++ b/tests/auto/qquickdrawer/data/slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml index 02b5a10f23..d2aaf48601 100644 --- a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml +++ b/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml index 975d50db35..02247dd030 100644 --- a/tests/auto/qquickdrawer/data/window-button.qml +++ b/tests/auto/qquickdrawer/data/window-button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml index 8360d7ceb1..e0b016cc1c 100644 --- a/tests/auto/qquickdrawer/data/window-hover.qml +++ b/tests/auto/qquickdrawer/data/window-hover.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml index f313f368e5..e9c2eb422c 100644 --- a/tests/auto/qquickdrawer/data/window-wheel.qml +++ b/tests/auto/qquickdrawer/data/window-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { id: window diff --git a/tests/auto/qquickdrawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml index 578d3e9fd6..4bd9c9d29c 100644 --- a/tests/auto/qquickdrawer/data/window.qml +++ b/tests/auto/qquickdrawer/data/window.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickheaderview/data/ListModel.qml b/tests/auto/qquickheaderview/data/ListModel.qml index 59021458f8..b8160a46dd 100644 --- a/tests/auto/qquickheaderview/data/ListModel.qml +++ b/tests/auto/qquickheaderview/data/ListModel.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import TestTableModel 0.1 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import TestTableModel Window { objectName: "window" diff --git a/tests/auto/qquickheaderview/data/Window.qml b/tests/auto/qquickheaderview/data/Window.qml index 3811904e4d..9bf9963c69 100644 --- a/tests/auto/qquickheaderview/data/Window.qml +++ b/tests/auto/qquickheaderview/data/Window.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import TestTableModel 0.1 -import TestTableModelWithHeader 0.1 -import HeaderDataProxyModel 0.1 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import TestTableModel +import TestTableModelWithHeader +import HeaderDataProxyModel Window { objectName: "window" diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/qquickiconimage/data/alignment.qml index 4e5ac6e7a5..e6861520b9 100644 --- a/tests/auto/qquickiconimage/data/alignment.qml +++ b/tests/auto/qquickiconimage/data/alignment.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/qquickiconimage/data/color.qml index b5d40d70ba..b44b43885c 100644 --- a/tests/auto/qquickiconimage/data/color.qml +++ b/tests/auto/qquickiconimage/data/color.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/qquickiconimage/data/fileSelectors.qml index 4e5ac6e7a5..e6861520b9 100644 --- a/tests/auto/qquickiconimage/data/fileSelectors.qml +++ b/tests/auto/qquickiconimage/data/fileSelectors.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml index cf03ac7e9b..9b18a99e35 100644 --- a/tests/auto/qquickiconimage/data/imageProvider.qml +++ b/tests/auto/qquickiconimage/data/imageProvider.qml @@ -1,7 +1,7 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T IconLabel { icon.color: "transparent" diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml index d0ea13c204..d457d205d5 100644 --- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml index 4e5ac6e7a5..e6861520b9 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml index db6697d034..5e7ebefca4 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/qquickiconimage/data/root.qml index 31ad726582..ed02d2df7a 100644 --- a/tests/auto/qquickiconimage/data/root.qml +++ b/tests/auto/qquickiconimage/data/root.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick Item { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml index 08dcd55ed9..34fc6b339c 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml index 24678f8c64..9f1b629074 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml index 9ac26e224b..4dc3ac7588 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml index 655add7bdb..a54d998aa5 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" diff --git a/tests/auto/qquickiconimage/data/svgNoSizes.qml b/tests/auto/qquickiconimage/data/svgNoSizes.qml index d26528279a..e29c23c5b2 100644 --- a/tests/auto/qquickiconimage/data/svgNoSizes.qml +++ b/tests/auto/qquickiconimage/data/svgNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml index c91577003d..4674e8f14b 100644 --- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/qquickiconimage/data/translucentColors.qml index fd20823554..ad67bfe522 100644 --- a/tests/auto/qquickiconimage/data/translucentColors.qml +++ b/tests/auto/qquickiconimage/data/translucentColors.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl ApplicationWindow { width: 500 diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml index 6600c365b6..5771e1edce 100644 --- a/tests/auto/qquickiconlabel/data/colorChanges.qml +++ b/tests/auto/qquickiconlabel/data/colorChanges.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml index eb36666430..772b89bd7e 100644 --- a/tests/auto/qquickiconlabel/data/iconlabel.qml +++ b/tests/auto/qquickiconlabel/data/iconlabel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml index 627a5b48e9..7921babbb0 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml index 7c2ecb0fd7..20c61706b8 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Item { width: 200 diff --git a/tests/auto/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/qquickimaginestyle/data/tst_imagine.qml index b9078d784d..493ff766ba 100644 --- a/tests/auto/qquickimaginestyle/data/tst_imagine.qml +++ b/tests/auto/qquickimaginestyle/data/tst_imagine.qml @@ -48,13 +48,13 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtTest 1.1 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick +import QtQuick.Window +import QtTest +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl TestCase { id: testCase diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml index 9f2456b8e1..dfb0e770b3 100644 --- a/tests/auto/qquickmaterialstyle/data/tst_material.qml +++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtTest 1.0 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Window +import QtTest +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Material TestCase { id: testCase @@ -606,7 +606,7 @@ TestCase { verify(window) verify(window.pane) - var control = Qt.createQmlObject("import QtQuick.Controls 2.1; " + data.type + " { }", window.pane) + var control = Qt.createQmlObject("import QtQuick.Controls; " + data.type + " { }", window.pane) verify(control) compare(control.font[data.attribute], data.value) diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml index 8e3be02706..1ce4598de6 100644 --- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml index 6998c72293..226c94500f 100644 --- a/tests/auto/qquickmenu/data/actions.qml +++ b/tests/auto/qquickmenu/data/actions.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml index ae59243227..b9d38afd59 100644 --- a/tests/auto/qquickmenu/data/addItem.qml +++ b/tests/auto/qquickmenu/data/addItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml index b9894aed9f..22ab278ed0 100644 --- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml +++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml index 13f14d2dcc..d15c0a8888 100644 --- a/tests/auto/qquickmenu/data/applicationwindow.qml +++ b/tests/auto/qquickmenu/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml index 303e9155bc..b2af27e98e 100644 --- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenu/data/disableWhenTriggered.qml b/tests/auto/qquickmenu/data/disableWhenTriggered.qml index c64916aec8..9de8868f77 100644 --- a/tests/auto/qquickmenu/data/disableWhenTriggered.qml +++ b/tests/auto/qquickmenu/data/disableWhenTriggered.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml index a39c5f4459..496544e925 100644 --- a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml +++ b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/menuItemWidths.qml b/tests/auto/qquickmenu/data/menuItemWidths.qml index 6d2baa3227..e956a29f38 100644 --- a/tests/auto/qquickmenu/data/menuItemWidths.qml +++ b/tests/auto/qquickmenu/data/menuItemWidths.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 600 diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml index ce6bd307ed..d71d99c531 100644 --- a/tests/auto/qquickmenu/data/menuSeparator.qml +++ b/tests/auto/qquickmenu/data/menuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml index 510d240108..6525e59ed4 100644 --- a/tests/auto/qquickmenu/data/mnemonics.qml +++ b/tests/auto/qquickmenu/data/mnemonics.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/order.qml b/tests/auto/qquickmenu/data/order.qml index e03c86d322..f2f18168de 100644 --- a/tests/auto/qquickmenu/data/order.qml +++ b/tests/auto/qquickmenu/data/order.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml index 3272cd6f6c..88c08b46e8 100644 --- a/tests/auto/qquickmenu/data/popup.qml +++ b/tests/auto/qquickmenu/data/popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml index bcc46c08c8..a16a15da80 100644 --- a/tests/auto/qquickmenu/data/pressAndHold.qml +++ b/tests/auto/qquickmenu/data/pressAndHold.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml index 7e930812ff..cfe7585e43 100644 --- a/tests/auto/qquickmenu/data/removeTakeItem.qml +++ b/tests/auto/qquickmenu/data/removeTakeItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml index 40f442819b..50c8adcb32 100644 --- a/tests/auto/qquickmenu/data/repeater.qml +++ b/tests/auto/qquickmenu/data/repeater.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/scrollableWithPadding.qml b/tests/auto/qquickmenu/data/scrollableWithPadding.qml index 86405ccbad..c8e73858fa 100644 --- a/tests/auto/qquickmenu/data/scrollableWithPadding.qml +++ b/tests/auto/qquickmenu/data/scrollableWithPadding.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Controls +import QtQuick.Window Window { title: "Test Window" diff --git a/tests/auto/qquickmenu/data/subMenuDisabled.qml b/tests/auto/qquickmenu/data/subMenuDisabled.qml index 36ca110317..e50ab7abc7 100644 --- a/tests/auto/qquickmenu/data/subMenuDisabled.qml +++ b/tests/auto/qquickmenu/data/subMenuDisabled.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 600 diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml index 4952e7a154..fad59ee6d1 100644 --- a/tests/auto/qquickmenu/data/subMenus.qml +++ b/tests/auto/qquickmenu/data/subMenus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 600 diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml index 0d49524204..7c3a5234fb 100644 --- a/tests/auto/qquickmenu/data/windowScrollable.qml +++ b/tests/auto/qquickmenu/data/windowScrollable.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.11 +import QtQuick +import QtQuick.Controls +import QtQuick.Window Window { title: "Test Window" diff --git a/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml b/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml index 072fa6b1a0..14ee692eda 100644 --- a/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml +++ b/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 300 diff --git a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml index 82321bca96..760151901f 100644 --- a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenubar/data/empty.qml b/tests/auto/qquickmenubar/data/empty.qml index 87a3d73d8d..6cb3c92299 100644 --- a/tests/auto/qquickmenubar/data/empty.qml +++ b/tests/auto/qquickmenubar/data/empty.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls MenuBar { } diff --git a/tests/auto/qquickmenubar/data/menubar.qml b/tests/auto/qquickmenubar/data/menubar.qml index 1ef83a6f53..fcfe6c52ed 100644 --- a/tests/auto/qquickmenubar/data/menubar.qml +++ b/tests/auto/qquickmenubar/data/menubar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml index 4b9ac278f1..410a61f9fe 100644 --- a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml +++ b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml @@ -1,7 +1,7 @@ -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Imagine +import QtQuick.Controls.Imagine.impl NinePatchImage { } diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml index ed9b65e16d..9a76ebea97 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml index d089fbbbd6..6d004b1721 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml index 20bd794101..8a68246853 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml b/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml index 56cf85b638..adf23637ab 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml index 7b68814777..80b22e6d5d 100644 --- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml index de27d7ec33..8d3f7f9592 100644 --- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml index 3ce8a718fb..7a298d9620 100644 --- a/tests/auto/qquickpopup/data/applicationwindow.qml +++ b/tests/auto/qquickpopup/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml b/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml index 076e2230be..aa25863aed 100644 --- a/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml +++ b/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml index 4f18fc1307..71ec4e2b10 100644 --- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml +++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml index b9606eb2ae..b65e4ec0c0 100644 --- a/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml +++ b/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.13 -import QtQuick.Window 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickpopup/data/countChanged.qml b/tests/auto/qquickpopup/data/countChanged.qml index ee5876d7d6..fd59433251 100644 --- a/tests/auto/qquickpopup/data/countChanged.qml +++ b/tests/auto/qquickpopup/data/countChanged.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 640 diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml index 4391f7a0af..e2a6e38e31 100644 --- a/tests/auto/qquickpopup/data/cursor.qml +++ b/tests/auto/qquickpopup/data/cursor.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/dialog.qml b/tests/auto/qquickpopup/data/dialog.qml index ee1b6bde89..75c0e1c689 100644 --- a/tests/auto/qquickpopup/data/dialog.qml +++ b/tests/auto/qquickpopup/data/dialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Item { width: 400 diff --git a/tests/auto/qquickpopup/data/disabledPalette.qml b/tests/auto/qquickpopup/data/disabledPalette.qml index f080f5e8f2..f1608aae11 100644 --- a/tests/auto/qquickpopup/data/disabledPalette.qml +++ b/tests/auto/qquickpopup/data/disabledPalette.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml index 6a6d6d6520..507cc3b587 100644 --- a/tests/auto/qquickpopup/data/grabber.qml +++ b/tests/auto/qquickpopup/data/grabber.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml b/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml index 2e58bb9735..aaed154b9c 100644 --- a/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml +++ b/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml @@ -1,6 +1,6 @@ -import QtQuick 2.13 -import QtQuick.Window 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml index 4ebdfb0c13..03269cd194 100644 --- a/tests/auto/qquickpopup/data/nested.qml +++ b/tests/auto/qquickpopup/data/nested.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml index a1cc9c0ecd..9730a9e14c 100644 --- a/tests/auto/qquickpopup/data/orientation.qml +++ b/tests/auto/qquickpopup/data/orientation.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 600 diff --git a/tests/auto/qquickpopup/data/tabFence.qml b/tests/auto/qquickpopup/data/tabFence.qml index 2cf408e999..ce5b54177c 100644 --- a/tests/auto/qquickpopup/data/tabFence.qml +++ b/tests/auto/qquickpopup/data/tabFence.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml b/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml index 8de14f4c58..33452182fe 100644 --- a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml +++ b/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Window 2.13 -import QtQuick.Controls 2.13 -import QtGraphicalEffects 1.13 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtGraphicalEffects Window { width: 640 diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml index 0bf0066045..e0eef30206 100644 --- a/tests/auto/qquickpopup/data/window-hover.qml +++ b/tests/auto/qquickpopup/data/window-hover.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml index 37edee9569..e476a1ebc0 100644 --- a/tests/auto/qquickpopup/data/window-wheel.qml +++ b/tests/auto/qquickpopup/data/window-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { id: window diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/qquickpopup/data/window.qml index 0e15e83833..f6b76b7e14 100644 --- a/tests/auto/qquickpopup/data/window.qml +++ b/tests/auto/qquickpopup/data/window.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 400 diff --git a/tests/auto/qquickstyle/data/dependencies.qml b/tests/auto/qquickstyle/data/dependencies.qml index dac5f935cb..280cfd2962 100644 --- a/tests/auto/qquickstyle/data/dependencies.qml +++ b/tests/auto/qquickstyle/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { } diff --git a/tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml b/tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml index 9faaa8b75b..21226ed2a7 100644 --- a/tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml +++ b/tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml @@ -1,3 +1,3 @@ -import HelperWidgets 2.0 +import HelperWidgets ButtonSection { } diff --git a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml index eaeeadcd87..dcacc01140 100644 --- a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml +++ b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml b/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml index eaeeadcd87..dcacc01140 100644 --- a/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml b/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml index eaeeadcd87..dcacc01140 100644 --- a/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml index eaeeadcd87..dcacc01140 100644 --- a/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml index eaeeadcd87..dcacc01140 100644 --- a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates as T T.Button { } diff --git a/tests/auto/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/qquickuniversalstyle/data/tst_universal.qml index 0926cae39c..356df7311e 100644 --- a/tests/auto/qquickuniversalstyle/data/tst_universal.qml +++ b/tests/auto/qquickuniversalstyle/data/tst_universal.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Window +import QtTest +import QtQuick.Controls +import QtQuick.Controls.Universal TestCase { id: testCase @@ -416,7 +416,7 @@ TestCase { verify(window) verify(window.pane) - var control = Qt.createQmlObject("import QtQuick.Controls 2.1; " + data.type + " { }", window.pane) + var control = Qt.createQmlObject("import QtQuick.Controls; " + data.type + " { }", window.pane) verify(control) compare(control.font[data.attribute], data.value) diff --git a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml index 7abc8b13d9..bb16254a15 100644 --- a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Universal ApplicationWindow { width: 400 diff --git a/tests/auto/revisions/data/dependencies.qml b/tests/auto/revisions/data/dependencies.qml index e276ba595f..bb95421995 100644 --- a/tests/auto/revisions/data/dependencies.qml +++ b/tests/auto/revisions/data/dependencies.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/auto/sanity/data/dependencies.qml b/tests/auto/sanity/data/dependencies.qml index dac5f935cb..280cfd2962 100644 --- a/tests/auto/sanity/data/dependencies.qml +++ b/tests/auto/sanity/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Control { } diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/snippets/data/dependencies.qml index 0fe2dbf07b..8785d0b08e 100644 --- a/tests/auto/snippets/data/dependencies.qml +++ b/tests/auto/snippets/data/dependencies.qml @@ -1,7 +1,7 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/auto/translation/data/comboBox.qml b/tests/auto/translation/data/comboBox.qml index 8bb8ed6f75..cba1cf0c23 100644 --- a/tests/auto/translation/data/comboBox.qml +++ b/tests/auto/translation/data/comboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls ComboBox { objectName: "comboBox" diff --git a/tests/auto/translation/data/dialogButtonBox.qml b/tests/auto/translation/data/dialogButtonBox.qml index 03a3ae0e69..fd8f9548a2 100644 --- a/tests/auto/translation/data/dialogButtonBox.qml +++ b/tests/auto/translation/data/dialogButtonBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls Item { property Dialog dialog: Dialog { diff --git a/tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml b/tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml index 6f046cf161..bf0fb512a7 100644 --- a/tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml +++ b/tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.14 +import QtQuick +import QtQuick.Controls Item { property Dialog dialog: Dialog { diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/creationtime/data/dependencies.qml index 3ae7511ba9..3b8476177f 100644 --- a/tests/benchmarks/creationtime/data/dependencies.qml +++ b/tests/benchmarks/creationtime/data/dependencies.qml @@ -1,8 +1,8 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Fusion +import QtQuick.Controls.Imagine +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml index 3ae7511ba9..3b8476177f 100644 --- a/tests/benchmarks/objectcount/data/dependencies.qml +++ b/tests/benchmarks/objectcount/data/dependencies.qml @@ -1,8 +1,8 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Fusion +import QtQuick.Controls.Imagine +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml index 02074cb09d..87b137fb22 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml index c6e53bcf9a..bc0be40243 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_button.qml b/tests/benchmarks/qmlbench/creation/delegates_button.qml index 5e6cc12f34..9505ebf082 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_button.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_button.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml index 73b1886542..67d9e38236 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml index b4fde74a51..bd7b64cc23 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml index 6519fc776d..f8552b7415 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_container.qml b/tests/benchmarks/qmlbench/creation/delegates_container.qml index eb684a745b..238e95e3df 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_container.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_container.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_control.qml b/tests/benchmarks/qmlbench/creation/delegates_control.qml index da4263dce6..20f09477ce 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_control.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_control.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml index ae8aa0b727..05ec87483e 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/qmlbench/creation/delegates_dial.qml index 6fd33c70c8..de742c7b7e 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dial.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dial.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml index 36b1fbe151..686149f7b0 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml index e5fac0eb6c..f13d65c507 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml index 9c1e74b53a..3f7290a41f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/qmlbench/creation/delegates_frame.qml index 27852898ac..2d3c9a6624 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_frame.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_frame.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml index ccfe2927c6..3696f8476a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml index 8c7f67ddd6..07128da1d2 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_label.qml b/tests/benchmarks/qmlbench/creation/delegates_label.qml index 3c3e76b1f9..788006a48d 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_label.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_label.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/qmlbench/creation/delegates_menu.qml index 1566f40a99..fd8e53b4f9 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menu.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml index 5c70070786..6732bc184c 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml index 59abe33317..8effa17305 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_page.qml b/tests/benchmarks/qmlbench/creation/delegates_page.qml index 9c9124dcfe..f9d06b38af 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_page.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_page.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml index 37eee03711..9b5a691821 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/qmlbench/creation/delegates_pane.qml index e811df930e..a391f69557 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pane.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pane.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/qmlbench/creation/delegates_popup.qml index 9effd9175b..c2cdaab573 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_popup.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_popup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml index 4bb773f24c..d50d9d2681 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml index 3236835f7b..f596e852c1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml index b6ffe174aa..7f5734664a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml index a595bd7a9d..725cab29d8 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml index 572bf5e905..0337a66db8 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml index 2e6fc1fd31..2635240f89 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml index fd9e52e6a5..4e2b90a3b3 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml index 0daa44dddd..b5f155cb1d 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/qmlbench/creation/delegates_slider.qml index 44dac8193d..0ef3b3faf4 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_slider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_slider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml index 90695102b4..9120a92162 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml index e2644aef8e..cb6cee10fc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml index 752dc37b92..5147bbb6d2 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml index 0a9223436f..b263e620a9 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/qmlbench/creation/delegates_switch.qml index 9381342d60..79cc48e3d0 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switch.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switch.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml index f41281fa85..f6f8a7df52 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml index 95bb729167..37f6a46371 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml index dc549a3aaa..27442a7d2c 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml index ab383ad457..88454c0bf1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml index 32f31fe846..eb279724e3 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml index 38e9a59f9a..7dcd85a3fb 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml index e3db91f84b..48cdd352cc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml index f8e7a28345..85e864943c 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml index 4af07b7f3c..da747e2300 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick +import QmlBench +import QtQuick.Controls CreationBenchmark { id: root diff --git a/tests/manual/buttons/ButtonLoader.qml b/tests/manual/buttons/ButtonLoader.qml index 574997e1b3..ecbf637b17 100644 --- a/tests/manual/buttons/ButtonLoader.qml +++ b/tests/manual/buttons/ButtonLoader.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { id: root diff --git a/tests/manual/buttons/buttons.qml b/tests/manual/buttons/buttons.qml index 0848038d3d..26969440de 100644 --- a/tests/manual/buttons/buttons.qml +++ b/tests/manual/buttons/buttons.qml @@ -47,10 +47,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Controls.Universal ApplicationWindow { id: window diff --git a/tests/manual/dialogs/CustomDialog.qml b/tests/manual/dialogs/CustomDialog.qml index 0e86fbb8bc..fb191c9f4e 100644 --- a/tests/manual/dialogs/CustomDialog.qml +++ b/tests/manual/dialogs/CustomDialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 +import QtQuick.Controls Dialog { id: root diff --git a/tests/manual/dialogs/DialogLabel.qml b/tests/manual/dialogs/DialogLabel.qml index c4775aea99..3a1533eb16 100644 --- a/tests/manual/dialogs/DialogLabel.qml +++ b/tests/manual/dialogs/DialogLabel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 +import QtQuick.Controls Label { x: dialog.x + (dialog.width - width) / 2 diff --git a/tests/manual/dialogs/Marker.qml b/tests/manual/dialogs/Marker.qml index 439b50f2e5..cd93d05570 100644 --- a/tests/manual/dialogs/Marker.qml +++ b/tests/manual/dialogs/Marker.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick Rectangle { anchors.fill: parent diff --git a/tests/manual/dialogs/dialogs.qml b/tests/manual/dialogs/dialogs.qml index a3048c34b4..e7c8c2e1cf 100644 --- a/tests/manual/dialogs/dialogs.qml +++ b/tests/manual/dialogs/dialogs.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ApplicationWindow { id: window diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 4182a6548b..8d3464a005 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts ApplicationWindow { visible: true diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml index b0504cd7e4..37dc5c7fd9 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: busyIndicator.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml index c52c039154..dd07926ff1 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml index 6398df509d..4af50d6b2c 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/gifs/data/qtquickcontrols2-button.qml index 6361174fcb..8336855c46 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml index b6f3168298..b0bee6cd54 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml index 1e1348f59e..46cdc073aa 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml index 767f80dcf3..585aea2704 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window Window { id: window diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml index d222b21f99..704a060114 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/gifs/data/qtquickcontrols2-combobox.qml index bd46b54d72..274f2efe61 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-combobox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window Window { width: 140 diff --git a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml index b0feddcb56..8eaa3df24a 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml index 04f167a250..3b9b14668f 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: dial.implicitWidth + 20 diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml index e00139f048..317d81d27b 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: dial.implicitWidth + 20 diff --git a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/gifs/data/qtquickcontrols2-drawer.qml index 690dfdc4f5..32efcba8c4 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-drawer.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Window ApplicationWindow { id: window diff --git a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml index b0188edb22..1ef9e2c0c6 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/gifs/data/qtquickcontrols2-menu.qml index 39403e06d9..80f2c86d51 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-menu.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls // TODO: restore and finish https://codereview.qt-project.org/#/c/123948/ ApplicationWindow { diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml index 6d2c50b266..4679ea03c8 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: progressBar.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml index a8f751ce12..994af450b7 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: progressBar.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml index 1e640ced91..fec7ec9b01 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml index eaa1ff7a3d..a00f320927 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml index b30711b470..c648f9983a 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml index 27b6b28053..cc4d6dc2fa 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml index 573c408b88..e838673a2a 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml index 1cdd1b61c6..be23df3b25 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml index ff7dd78071..26066770e7 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtquickcontrols2-slider.qml index 689e50f202..83f652aa26 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-slider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml index 9c3ad1f11f..7ddd8db803 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml index cf3e8c3c08..88229fce7e 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml index 2c68a3cb5a..59885745c1 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml index afb1f242de..a7435d2ac7 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml index 6025b62b7a..0b18c6a336 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: swipeDelegate.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml index da9d0fb5bc..789fb86f55 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: swipeDelegate.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml index 745432cbda..c78fc6d4f9 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: swipeDelegate.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml index d7d8829a21..9004ff183b 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 300 diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/gifs/data/qtquickcontrols2-switch.qml index 7e98d9dbca..a9497bded5 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-switch.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml index 2a70e48482..1caece5b16 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml index e01c766501..a973cef8c4 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: 300 diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml index 77d17f1101..bfad311e25 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls Window { width: frame.implicitWidth + 10 diff --git a/tests/manual/headerview/main.qml b/tests/manual/headerview/main.qml index ab9c3dc54c..abce1c00e0 100644 --- a/tests/manual/headerview/main.qml +++ b/tests/manual/headerview/main.qml @@ -48,13 +48,13 @@ ** ****************************************************************************/ -import QtQml.Models 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Shapes 1.15 -import QtQuick.Window 2.15 -import Qt.labs.qmlmodels 1.0 -import TestTableModelWithHeader 0.1 +import QtQml.Models +import QtQuick +import QtQuick.Controls +import QtQuick.Shapes +import QtQuick.Window +import Qt.labs.qmlmodels +import TestTableModelWithHeader Window { visible: true diff --git a/tests/manual/screenshots/screenshots.qml b/tests/manual/screenshots/screenshots.qml index 2ab684c114..3496b32bd6 100644 --- a/tests/manual/screenshots/screenshots.qml +++ b/tests/manual/screenshots/screenshots.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import Qt.labs.folderlistmodel 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import Qt.labs.folderlistmodel ApplicationWindow { id: window diff --git a/tests/manual/shared/FontAwesome.qml b/tests/manual/shared/FontAwesome.qml index 9e387594d1..d64176b4a4 100644 --- a/tests/manual/shared/FontAwesome.qml +++ b/tests/manual/shared/FontAwesome.qml @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick pragma Singleton diff --git a/tests/manual/shared/FontAwesomeIcon.qml b/tests/manual/shared/FontAwesomeIcon.qml index f46ed364d7..74e7c5da12 100644 --- a/tests/manual/shared/FontAwesomeIcon.qml +++ b/tests/manual/shared/FontAwesomeIcon.qml @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:/shared" Text { diff --git a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml b/tests/manual/styles-cover-flow/CoverFlowDelegate.qml index 474a189a1e..061ecfa0a8 100644 --- a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml +++ b/tests/manual/styles-cover-flow/CoverFlowDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtGraphicalEffects 1.12 -import QtQuick 2.12 +import QtGraphicalEffects +import QtQuick Item { id: root diff --git a/tests/manual/styles-cover-flow/CoverFlowPath.qml b/tests/manual/styles-cover-flow/CoverFlowPath.qml index 37e7f8943a..0f70e6b890 100644 --- a/tests/manual/styles-cover-flow/CoverFlowPath.qml +++ b/tests/manual/styles-cover-flow/CoverFlowPath.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick Path { // Point 1 diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/styles-cover-flow/styles-cover-flow.qml index 273f0869ae..ec9630cddc 100644 --- a/tests/manual/styles-cover-flow/styles-cover-flow.qml +++ b/tests/manual/styles-cover-flow/styles-cover-flow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Window Window { // Different delegate positions and widths and window background colors diff --git a/tests/manual/styles/styles.qml b/tests/manual/styles/styles.qml index 7c4721d1e3..83bd9b3441 100644 --- a/tests/manual/styles/styles.qml +++ b/tests/manual/styles/styles.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls ApplicationWindow { id: window diff --git a/tests/manual/systemtrayicon/systemtrayicon.qml b/tests/manual/systemtrayicon/systemtrayicon.qml index 03855b44cb..d44bc83b47 100644 --- a/tests/manual/systemtrayicon/systemtrayicon.qml +++ b/tests/manual/systemtrayicon/systemtrayicon.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import Qt.labs.platform 1.0 +import QtQuick +import QtQuick.Controls +import Qt.labs.platform ApplicationWindow { id: window diff --git a/tests/manual/testbench/ColorEditor.qml b/tests/manual/testbench/ColorEditor.qml index 7f472f9b5f..2723f33dfc 100644 --- a/tests/manual/testbench/ColorEditor.qml +++ b/tests/manual/testbench/ColorEditor.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts RowLayout { property alias labelText: label.text diff --git a/tests/manual/testbench/ControlContainer.qml b/tests/manual/testbench/ControlContainer.qml index 095d3822eb..4bd99bd304 100644 --- a/tests/manual/testbench/ControlContainer.qml +++ b/tests/manual/testbench/ControlContainer.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick Item { id: container diff --git a/tests/manual/testbench/ExampleContainer.qml b/tests/manual/testbench/ExampleContainer.qml index 5d2ac7589c..903e52db3e 100644 --- a/tests/manual/testbench/ExampleContainer.qml +++ b/tests/manual/testbench/ExampleContainer.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Frame { id: container diff --git a/tests/manual/testbench/SettingsDialog.qml b/tests/manual/testbench/SettingsDialog.qml index 71b4c342ca..d75f89f172 100644 --- a/tests/manual/testbench/SettingsDialog.qml +++ b/tests/manual/testbench/SettingsDialog.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Imagine +import QtQuick.Layouts -import App 1.0 +import App Dialog { id: settingsDialog diff --git a/tests/manual/testbench/controls/BusyIndicator.qml b/tests/manual/testbench/controls/BusyIndicator.qml index 22b3d98a42..cc0f4518a4 100644 --- a/tests/manual/testbench/controls/BusyIndicator.qml +++ b/tests/manual/testbench/controls/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Button.qml b/tests/manual/testbench/controls/Button.qml index 44ddfee06f..ac57453fed 100644 --- a/tests/manual/testbench/controls/Button.qml +++ b/tests/manual/testbench/controls/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/CheckBox.qml b/tests/manual/testbench/controls/CheckBox.qml index b79d800dab..0598dae833 100644 --- a/tests/manual/testbench/controls/CheckBox.qml +++ b/tests/manual/testbench/controls/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/CheckDelegate.qml b/tests/manual/testbench/controls/CheckDelegate.qml index c8089fabb7..8f546384ff 100644 --- a/tests/manual/testbench/controls/CheckDelegate.qml +++ b/tests/manual/testbench/controls/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ComboBox.qml b/tests/manual/testbench/controls/ComboBox.qml index 335eeb567b..75fb7701b2 100644 --- a/tests/manual/testbench/controls/ComboBox.qml +++ b/tests/manual/testbench/controls/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/DelayButton.qml b/tests/manual/testbench/controls/DelayButton.qml index ae887ef348..c0f6faa29b 100644 --- a/tests/manual/testbench/controls/DelayButton.qml +++ b/tests/manual/testbench/controls/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Dial.qml b/tests/manual/testbench/controls/Dial.qml index 06b91076e3..16c99ec833 100644 --- a/tests/manual/testbench/controls/Dial.qml +++ b/tests/manual/testbench/controls/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Dialog.qml b/tests/manual/testbench/controls/Dialog.qml index 52aa923e1f..0ea9d3be79 100644 --- a/tests/manual/testbench/controls/Dialog.qml +++ b/tests/manual/testbench/controls/Dialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts // TODO QtObject { diff --git a/tests/manual/testbench/controls/Frame.qml b/tests/manual/testbench/controls/Frame.qml index c7b176fb1e..dd88c3b8f3 100644 --- a/tests/manual/testbench/controls/Frame.qml +++ b/tests/manual/testbench/controls/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/GroupBox.qml b/tests/manual/testbench/controls/GroupBox.qml index eda7ad7969..80ced76926 100644 --- a/tests/manual/testbench/controls/GroupBox.qml +++ b/tests/manual/testbench/controls/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ItemDelegate.qml b/tests/manual/testbench/controls/ItemDelegate.qml index 8cf348d4f0..0b887e2f96 100644 --- a/tests/manual/testbench/controls/ItemDelegate.qml +++ b/tests/manual/testbench/controls/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Label.qml b/tests/manual/testbench/controls/Label.qml index 92192e098f..d8155a2016 100644 --- a/tests/manual/testbench/controls/Label.qml +++ b/tests/manual/testbench/controls/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Menu.qml b/tests/manual/testbench/controls/Menu.qml index 3bb5400922..ba15c052d3 100644 --- a/tests/manual/testbench/controls/Menu.qml +++ b/tests/manual/testbench/controls/Menu.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts // TODO QtObject { diff --git a/tests/manual/testbench/controls/MenuBar.qml b/tests/manual/testbench/controls/MenuBar.qml index 77a7da2bfd..f435c9a5ae 100644 --- a/tests/manual/testbench/controls/MenuBar.qml +++ b/tests/manual/testbench/controls/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls // TODO QtObject { diff --git a/tests/manual/testbench/controls/Page.qml b/tests/manual/testbench/controls/Page.qml index add9cc09c3..3d310676c3 100644 --- a/tests/manual/testbench/controls/Page.qml +++ b/tests/manual/testbench/controls/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/PageIndicator.qml b/tests/manual/testbench/controls/PageIndicator.qml index 60094e4da1..5de29ef10b 100644 --- a/tests/manual/testbench/controls/PageIndicator.qml +++ b/tests/manual/testbench/controls/PageIndicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Pane.qml b/tests/manual/testbench/controls/Pane.qml index c8b6c69980..b5329b71da 100644 --- a/tests/manual/testbench/controls/Pane.qml +++ b/tests/manual/testbench/controls/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ProgressBar.qml b/tests/manual/testbench/controls/ProgressBar.qml index 67047178a0..bc2d904589 100644 --- a/tests/manual/testbench/controls/ProgressBar.qml +++ b/tests/manual/testbench/controls/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RadioButton.qml b/tests/manual/testbench/controls/RadioButton.qml index b1fff6dc3b..7ca9bd0a8b 100644 --- a/tests/manual/testbench/controls/RadioButton.qml +++ b/tests/manual/testbench/controls/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RadioDelegate.qml b/tests/manual/testbench/controls/RadioDelegate.qml index e449744c55..ddafd14c69 100644 --- a/tests/manual/testbench/controls/RadioDelegate.qml +++ b/tests/manual/testbench/controls/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RangeSlider.qml b/tests/manual/testbench/controls/RangeSlider.qml index b3d84e5311..71208fb822 100644 --- a/tests/manual/testbench/controls/RangeSlider.qml +++ b/tests/manual/testbench/controls/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RoundButton.qml b/tests/manual/testbench/controls/RoundButton.qml index 5d0661333f..fb2d1d4396 100644 --- a/tests/manual/testbench/controls/RoundButton.qml +++ b/tests/manual/testbench/controls/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ScrollBar.qml b/tests/manual/testbench/controls/ScrollBar.qml index 25c7f4d609..4ed80f750e 100644 --- a/tests/manual/testbench/controls/ScrollBar.qml +++ b/tests/manual/testbench/controls/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ScrollIndicator.qml b/tests/manual/testbench/controls/ScrollIndicator.qml index 2c6fd4a996..d9ee487d08 100644 --- a/tests/manual/testbench/controls/ScrollIndicator.qml +++ b/tests/manual/testbench/controls/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Slider.qml b/tests/manual/testbench/controls/Slider.qml index 831f4778e5..21e751acd7 100644 --- a/tests/manual/testbench/controls/Slider.qml +++ b/tests/manual/testbench/controls/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SpinBox.qml b/tests/manual/testbench/controls/SpinBox.qml index 0fdfb9fe44..22ca6ccefc 100644 --- a/tests/manual/testbench/controls/SpinBox.qml +++ b/tests/manual/testbench/controls/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SplitView.qml b/tests/manual/testbench/controls/SplitView.qml index 94f062216f..f2801def8f 100644 --- a/tests/manual/testbench/controls/SplitView.qml +++ b/tests/manual/testbench/controls/SplitView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SwipeDelegate.qml b/tests/manual/testbench/controls/SwipeDelegate.qml index 141435d866..13d0a4437c 100644 --- a/tests/manual/testbench/controls/SwipeDelegate.qml +++ b/tests/manual/testbench/controls/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Switch.qml b/tests/manual/testbench/controls/Switch.qml index 6df1a0e01a..6e877a4995 100644 --- a/tests/manual/testbench/controls/Switch.qml +++ b/tests/manual/testbench/controls/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SwitchDelegate.qml b/tests/manual/testbench/controls/SwitchDelegate.qml index ac4a322aee..4f60da5537 100644 --- a/tests/manual/testbench/controls/SwitchDelegate.qml +++ b/tests/manual/testbench/controls/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/TabBar.qml b/tests/manual/testbench/controls/TabBar.qml index 7e98eb93bb..a7a1de490a 100644 --- a/tests/manual/testbench/controls/TabBar.qml +++ b/tests/manual/testbench/controls/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls // TODO QtObject { diff --git a/tests/manual/testbench/controls/TextArea.qml b/tests/manual/testbench/controls/TextArea.qml index ae3cf08b3f..dfe28f79f4 100644 --- a/tests/manual/testbench/controls/TextArea.qml +++ b/tests/manual/testbench/controls/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/TextField.qml b/tests/manual/testbench/controls/TextField.qml index b9a5bfb8c0..1eed3a6c4a 100644 --- a/tests/manual/testbench/controls/TextField.qml +++ b/tests/manual/testbench/controls/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ToolBar.qml b/tests/manual/testbench/controls/ToolBar.qml index ec80ebe7ae..3aba337782 100644 --- a/tests/manual/testbench/controls/ToolBar.qml +++ b/tests/manual/testbench/controls/ToolBar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts // TODO QtObject { diff --git a/tests/manual/testbench/controls/ToolTip.qml b/tests/manual/testbench/controls/ToolTip.qml index 3e3a017b84..ddcf92f860 100644 --- a/tests/manual/testbench/controls/ToolTip.qml +++ b/tests/manual/testbench/controls/ToolTip.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Tumbler.qml b/tests/manual/testbench/controls/Tumbler.qml index f10af24e64..a2dbebef27 100644 --- a/tests/manual/testbench/controls/Tumbler.qml +++ b/tests/manual/testbench/controls/Tumbler.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/testbench.qml b/tests/manual/testbench/testbench.qml index 2857e2c566..2cd8fb43ff 100644 --- a/tests/manual/testbench/testbench.qml +++ b/tests/manual/testbench/testbench.qml @@ -48,15 +48,15 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import Qt.labs.folderlistmodel 2.2 -import Qt.labs.settings 1.0 - -import App 1.0 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Imagine +import Qt.labs.folderlistmodel +import Qt.labs.settings + +import App ApplicationWindow { id: window diff --git a/tests/manual/viewinqwidget/main.qml b/tests/manual/viewinqwidget/main.qml index f383f02271..5ac170b320 100644 --- a/tests/manual/viewinqwidget/main.qml +++ b/tests/manual/viewinqwidget/main.qml @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls Item { visible: true |