From d451cab0c8b727fa7f12a169a3d6ee449a3a1902 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 26 Mar 2020 17:01:51 +0100 Subject: Remove all version numbers from QML imports As of Qt 6, the latest version will be used by default. This saves us a lot of effort in terms of version bumps. Task-number: QTBUG-82922 Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928 Reviewed-by: Fabian Kosmale --- tests/manual/buttons/ButtonLoader.qml | 4 ++-- tests/manual/buttons/buttons.qml | 8 ++++---- tests/manual/dialogs/CustomDialog.qml | 2 +- tests/manual/dialogs/DialogLabel.qml | 2 +- tests/manual/dialogs/Marker.qml | 2 +- tests/manual/dialogs/dialogs.qml | 6 +++--- tests/manual/fonts/main.qml | 8 ++++---- .../gifs/data/qtquickcontrols2-busyindicator.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-button-flat.qml | 6 +++--- .../gifs/data/qtquickcontrols2-button-highlighted.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-button.qml | 6 +++--- .../gifs/data/qtquickcontrols2-checkbox-tristate.qml | 8 ++++---- tests/manual/gifs/data/qtquickcontrols2-checkbox.qml | 8 ++++---- .../data/qtquickcontrols2-checkdelegate-tristate.qml | 8 ++++---- .../gifs/data/qtquickcontrols2-checkdelegate.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-combobox.qml | 8 ++++---- .../manual/gifs/data/qtquickcontrols2-delaybutton.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-drawer.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-itemdelegate.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-menu.qml | 4 ++-- .../qtquickcontrols2-progressbar-indeterminate.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-progressbar.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-radiobutton.qml | 8 ++++---- .../gifs/data/qtquickcontrols2-radiodelegate.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-rangeslider.qml | 6 +++--- .../gifs/data/qtquickcontrols2-scrollbar-snap.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml | 6 +++--- .../gifs/data/qtquickcontrols2-scrollindicator.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-slider-snap.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-slider.qml | 6 +++--- .../gifs/data/qtquickcontrols2-stackview-pop.qml | 6 +++--- .../gifs/data/qtquickcontrols2-stackview-push.qml | 6 +++--- .../gifs/data/qtquickcontrols2-stackview-replace.qml | 6 +++--- .../gifs/data/qtquickcontrols2-stackview-unwind.qml | 6 +++--- .../data/qtquickcontrols2-swipedelegate-behind.qml | 6 +++--- ...qtquickcontrols2-swipedelegate-leading-trailing.qml | 6 +++--- .../gifs/data/qtquickcontrols2-swipedelegate.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-swipeview.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-switch.qml | 6 +++--- .../gifs/data/qtquickcontrols2-switchdelegate.qml | 6 +++--- tests/manual/gifs/data/qtquickcontrols2-tabbar.qml | 6 +++--- .../manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml | 6 +++--- tests/manual/headerview/main.qml | 14 +++++++------- tests/manual/screenshots/screenshots.qml | 8 ++++---- tests/manual/shared/FontAwesome.qml | 2 +- tests/manual/shared/FontAwesomeIcon.qml | 2 +- tests/manual/styles-cover-flow/CoverFlowDelegate.qml | 4 ++-- tests/manual/styles-cover-flow/CoverFlowPath.qml | 2 +- tests/manual/styles-cover-flow/styles-cover-flow.qml | 4 ++-- tests/manual/styles/styles.qml | 6 +++--- tests/manual/systemtrayicon/systemtrayicon.qml | 6 +++--- tests/manual/testbench/ColorEditor.qml | 6 +++--- tests/manual/testbench/ControlContainer.qml | 2 +- tests/manual/testbench/ExampleContainer.qml | 6 +++--- tests/manual/testbench/SettingsDialog.qml | 10 +++++----- tests/manual/testbench/controls/BusyIndicator.qml | 4 ++-- tests/manual/testbench/controls/Button.qml | 4 ++-- tests/manual/testbench/controls/CheckBox.qml | 4 ++-- tests/manual/testbench/controls/CheckDelegate.qml | 4 ++-- tests/manual/testbench/controls/ComboBox.qml | 4 ++-- tests/manual/testbench/controls/DelayButton.qml | 4 ++-- tests/manual/testbench/controls/Dial.qml | 4 ++-- tests/manual/testbench/controls/Dialog.qml | 6 +++--- tests/manual/testbench/controls/Frame.qml | 4 ++-- tests/manual/testbench/controls/GroupBox.qml | 4 ++-- tests/manual/testbench/controls/ItemDelegate.qml | 4 ++-- tests/manual/testbench/controls/Label.qml | 4 ++-- tests/manual/testbench/controls/Menu.qml | 6 +++--- tests/manual/testbench/controls/MenuBar.qml | 4 ++-- tests/manual/testbench/controls/Page.qml | 4 ++-- tests/manual/testbench/controls/PageIndicator.qml | 6 +++--- tests/manual/testbench/controls/Pane.qml | 4 ++-- tests/manual/testbench/controls/ProgressBar.qml | 4 ++-- tests/manual/testbench/controls/RadioButton.qml | 4 ++-- tests/manual/testbench/controls/RadioDelegate.qml | 4 ++-- tests/manual/testbench/controls/RangeSlider.qml | 4 ++-- tests/manual/testbench/controls/RoundButton.qml | 4 ++-- tests/manual/testbench/controls/ScrollBar.qml | 4 ++-- tests/manual/testbench/controls/ScrollIndicator.qml | 4 ++-- tests/manual/testbench/controls/Slider.qml | 4 ++-- tests/manual/testbench/controls/SpinBox.qml | 4 ++-- tests/manual/testbench/controls/SplitView.qml | 4 ++-- tests/manual/testbench/controls/SwipeDelegate.qml | 4 ++-- tests/manual/testbench/controls/Switch.qml | 4 ++-- tests/manual/testbench/controls/SwitchDelegate.qml | 4 ++-- tests/manual/testbench/controls/TabBar.qml | 4 ++-- tests/manual/testbench/controls/TextArea.qml | 4 ++-- tests/manual/testbench/controls/TextField.qml | 4 ++-- tests/manual/testbench/controls/ToolBar.qml | 6 +++--- tests/manual/testbench/controls/ToolTip.qml | 6 +++--- tests/manual/testbench/controls/Tumbler.qml | 6 +++--- tests/manual/testbench/testbench.qml | 18 +++++++++--------- tests/manual/viewinqwidget/main.qml | 4 ++-- 95 files changed, 256 insertions(+), 256 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/buttons/ButtonLoader.qml b/tests/manual/buttons/ButtonLoader.qml index 574997e1..ecbf637b 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 0848038d..26969440 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 0e86fbb8..fb191c9f 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 c4775aea..3a1533eb 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 439b50f2..cd93d055 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 a3048c34..e7c8c2e1 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 4182a654..8d3464a0 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 b0504cd7..37dc5c7f 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 c52c0391..dd07926f 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 6398df50..4af50d6b 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 6361174f..8336855c 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 b6f31682..b0bee6cd 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 1e1348f5..46cdc073 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 767f80dc..585aea27 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 d222b21f..704a0601 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 bd46b54d..274f2efe 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 b0feddcb..8eaa3df2 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 04f167a2..3b9b1466 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 e00139f0..317d81d2 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 690dfdc4..32efcba8 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 b0188edb..1ef9e2c0 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 39403e06..80f2c86d 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 6d2c50b2..4679ea03 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 a8f751ce..994af450 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 1e640ced..fec7ec9b 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 eaa1ff7a..a00f3209 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 b30711b4..c648f998 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 27b6b280..cc4d6dc2 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 573c408b..e838673a 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 1cdd1b61..be23df3b 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 ff7dd780..26066770 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 689e50f2..83f652aa 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 9c3ad1f1..7ddd8db8 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 cf3e8c3c..88229fce 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 2c68a3cb..59885745 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 afb1f242..a7435d2a 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 6025b62b..0b18c6a3 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 da9d0fb5..789fb86f 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 745432cb..c78fc6d4 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 d7d8829a..9004ff18 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 7e98d9db..a9497bde 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 2a70e484..1caece5b 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 e01c7665..a973cef8 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 77d17f11..bfad311e 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 ab9c3dc5..abce1c00 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 2ab684c1..3496b32b 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 9e387594..d64176b4 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 f46ed364..74e7c5da 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 474a189a..061ecfa0 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 37e7f894..0f70e6b8 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 273f0869..ec9630cd 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 7c4721d1..83bd9b34 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 03855b44..d44bc83b 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 7f472f9b..2723f33d 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 095d3822..4bd99bd3 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 5d2ac758..903e52db 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 71b4c342..d75f89f1 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 22b3d98a..cc0f4518 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 44ddfee0..ac57453f 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 b79d800d..0598dae8 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 c8089fab..8f546384 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 335eeb56..75fb7701 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 ae887ef3..c0f6faa2 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 06b91076..16c99ec8 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 52aa923e..0ea9d3be 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 c7b176fb..dd88c3b8 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 eda7ad79..80ced769 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 8cf348d4..0b887e2f 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 92192e09..d8155a20 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 3bb54009..ba15c052 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 77a7da2b..f435c9a5 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 add9cc09..3d310676 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 60094e4d..5de29ef1 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 c8b6c699..b5329b71 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 67047178..bc2d9045 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 b1fff6dc..7ca9bd0a 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 e449744c..ddafd14c 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 b3d84e53..71208fb8 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 5d066133..fb2d1d43 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 25c7f4d6..4ed80f75 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 2c6fd4a9..d9ee487d 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 831f4778..21e751ac 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 0fdfb9fe..22ca6cce 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 94f06221..f2801def 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 141435d8..13d0a443 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 6df1a0e0..6e877a49 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 ac4a322a..4f60da55 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 7e98eb93..a7a1de49 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 ae3cf08b..dfe28f79 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 b9a5bfb8..1eed3a6c 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 ec80ebe7..3aba3377 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 3e3a017b..ddcf92f8 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 f10af24e..a2dbebef 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 2857e2c5..2cd8fb43 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 f383f022..5ac170b3 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 -- cgit v1.2.3