From 3c7bfc156797b2f3ef08a8cf620b79da80e4b061 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 23 Oct 2018 15:23:58 +0200 Subject: Tie minor version of all imports to Qt's minor version This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann Reviewed-by: Shawn Rutledge --- tests/auto/accessibility/data/abstractbutton.qml | 4 ++-- tests/auto/accessibility/data/busyindicator.qml | 4 ++-- tests/auto/accessibility/data/button.qml | 4 ++-- tests/auto/accessibility/data/checkbox.qml | 4 ++-- tests/auto/accessibility/data/checkdelegate.qml | 4 ++-- tests/auto/accessibility/data/combobox.qml | 4 ++-- tests/auto/accessibility/data/container.qml | 4 ++-- tests/auto/accessibility/data/control.qml | 4 ++-- tests/auto/accessibility/data/dayofweekrow-2.qml | 2 +- tests/auto/accessibility/data/dayofweekrow.qml | 2 +- tests/auto/accessibility/data/dial.qml | 4 ++-- tests/auto/accessibility/data/dialog.qml | 4 ++-- tests/auto/accessibility/data/drawer.qml | 4 ++-- tests/auto/accessibility/data/frame.qml | 4 ++-- tests/auto/accessibility/data/groupbox.qml | 4 ++-- tests/auto/accessibility/data/itemdelegate.qml | 4 ++-- tests/auto/accessibility/data/label.qml | 4 ++-- tests/auto/accessibility/data/menu.qml | 4 ++-- tests/auto/accessibility/data/menuitem.qml | 4 ++-- tests/auto/accessibility/data/monthgrid-2.qml | 2 +- tests/auto/accessibility/data/monthgrid.qml | 2 +- tests/auto/accessibility/data/page.qml | 4 ++-- tests/auto/accessibility/data/pageindicator.qml | 4 ++-- tests/auto/accessibility/data/pane.qml | 4 ++-- tests/auto/accessibility/data/popup.qml | 4 ++-- tests/auto/accessibility/data/progressbar.qml | 4 ++-- tests/auto/accessibility/data/radiobutton.qml | 4 ++-- tests/auto/accessibility/data/radiodelegate.qml | 4 ++-- tests/auto/accessibility/data/rangeslider.qml | 4 ++-- tests/auto/accessibility/data/roundbutton.qml | 4 ++-- tests/auto/accessibility/data/scrollbar.qml | 4 ++-- tests/auto/accessibility/data/scrollindicator.qml | 4 ++-- tests/auto/accessibility/data/slider.qml | 4 ++-- tests/auto/accessibility/data/spinbox.qml | 4 ++-- tests/auto/accessibility/data/stackview.qml | 4 ++-- tests/auto/accessibility/data/swipedelegate.qml | 4 ++-- tests/auto/accessibility/data/swipeview.qml | 4 ++-- tests/auto/accessibility/data/switch.qml | 4 ++-- tests/auto/accessibility/data/switchdelegate.qml | 4 ++-- tests/auto/accessibility/data/tabbar.qml | 4 ++-- tests/auto/accessibility/data/tabbutton.qml | 4 ++-- tests/auto/accessibility/data/textarea.qml | 4 ++-- tests/auto/accessibility/data/textfield.qml | 4 ++-- tests/auto/accessibility/data/toolbar.qml | 4 ++-- tests/auto/accessibility/data/toolbutton.qml | 4 ++-- tests/auto/accessibility/data/tooltip.qml | 4 ++-- tests/auto/accessibility/data/tumbler.qml | 4 ++-- tests/auto/accessibility/data/weeknumbercolumn-2.qml | 2 +- tests/auto/accessibility/data/weeknumbercolumn.qml | 2 +- tests/auto/calendar/data/tst_calendarmodel.qml | 2 +- tests/auto/calendar/data/tst_dayofweekrow.qml | 2 +- tests/auto/calendar/data/tst_monthgrid.qml | 2 +- tests/auto/calendar/data/tst_weeknumbercolumn.qml | 2 +- tests/auto/controls/data/SignalSequenceSpy.qml | 2 +- tests/auto/controls/data/TestItem.qml | 2 +- tests/auto/controls/data/TumblerDatePicker.qml | 4 ++-- tests/auto/controls/data/TumblerListView.qml | 4 ++-- tests/auto/controls/data/TumblerPathView.qml | 4 ++-- tests/auto/controls/data/tst_abstractbutton.qml | 4 ++-- tests/auto/controls/data/tst_action.qml | 6 +++--- tests/auto/controls/data/tst_actiongroup.qml | 4 ++-- tests/auto/controls/data/tst_busyindicator.qml | 4 ++-- tests/auto/controls/data/tst_button.qml | 4 ++-- tests/auto/controls/data/tst_buttongroup.qml | 4 ++-- tests/auto/controls/data/tst_checkbox.qml | 4 ++-- tests/auto/controls/data/tst_checkdelegate.qml | 4 ++-- tests/auto/controls/data/tst_combobox.qml | 4 ++-- tests/auto/controls/data/tst_container.qml | 6 +++--- tests/auto/controls/data/tst_control.qml | 6 +++--- tests/auto/controls/data/tst_delaybutton.qml | 4 ++-- tests/auto/controls/data/tst_dial.qml | 4 ++-- tests/auto/controls/data/tst_dialog.qml | 6 +++--- tests/auto/controls/data/tst_dialogbuttonbox.qml | 4 ++-- tests/auto/controls/data/tst_frame.qml | 4 ++-- tests/auto/controls/data/tst_groupbox.qml | 4 ++-- tests/auto/controls/data/tst_itemdelegate.qml | 4 ++-- tests/auto/controls/data/tst_label.qml | 4 ++-- tests/auto/controls/data/tst_menuitem.qml | 4 ++-- tests/auto/controls/data/tst_page.qml | 4 ++-- tests/auto/controls/data/tst_pageindicator.qml | 4 ++-- tests/auto/controls/data/tst_pane.qml | 4 ++-- tests/auto/controls/data/tst_popup.qml | 4 ++-- tests/auto/controls/data/tst_progressbar.qml | 4 ++-- tests/auto/controls/data/tst_radiobutton.qml | 4 ++-- tests/auto/controls/data/tst_radiodelegate.qml | 4 ++-- tests/auto/controls/data/tst_rangeslider.qml | 4 ++-- tests/auto/controls/data/tst_roundbutton.qml | 4 ++-- tests/auto/controls/data/tst_scrollbar.qml | 4 ++-- tests/auto/controls/data/tst_scrollindicator.qml | 4 ++-- tests/auto/controls/data/tst_scrollview.qml | 4 ++-- tests/auto/controls/data/tst_slider.qml | 4 ++-- tests/auto/controls/data/tst_spinbox.qml | 6 +++--- tests/auto/controls/data/tst_stackview.qml | 4 ++-- tests/auto/controls/data/tst_swipedelegate.qml | 4 ++-- tests/auto/controls/data/tst_swipeview.qml | 4 ++-- tests/auto/controls/data/tst_switch.qml | 4 ++-- tests/auto/controls/data/tst_switchdelegate.qml | 4 ++-- tests/auto/controls/data/tst_tabbar.qml | 4 ++-- tests/auto/controls/data/tst_tabbutton.qml | 4 ++-- tests/auto/controls/data/tst_textarea.qml | 4 ++-- tests/auto/controls/data/tst_textfield.qml | 4 ++-- tests/auto/controls/data/tst_toolbar.qml | 4 ++-- tests/auto/controls/data/tst_toolbutton.qml | 4 ++-- tests/auto/controls/data/tst_toolseparator.qml | 4 ++-- tests/auto/controls/data/tst_tooltip.qml | 4 ++-- tests/auto/controls/data/tst_tumbler.qml | 4 ++-- tests/auto/controls/default/dependencies.qml | 4 ++-- tests/auto/controls/fusion/dependencies.qml | 6 +++--- tests/auto/controls/imagine/dependencies.qml | 6 +++--- tests/auto/controls/material/dependencies.qml | 6 +++--- tests/auto/controls/universal/dependencies.qml | 6 +++--- tests/auto/cursor/data/buttons.qml | 4 ++-- tests/auto/cursor/data/containers.qml | 4 ++-- tests/auto/cursor/data/editable.qml | 4 ++-- tests/auto/cursor/data/pageindicator.qml | 4 ++-- tests/auto/cursor/data/scrollbar.qml | 4 ++-- tests/auto/cursor/data/sliders.qml | 4 ++-- tests/auto/customization/data/styles/empty/AbstractButton.qml | 4 ++-- .../auto/customization/data/styles/empty/ApplicationWindow.qml | 4 ++-- tests/auto/customization/data/styles/empty/BusyIndicator.qml | 4 ++-- tests/auto/customization/data/styles/empty/Button.qml | 4 ++-- tests/auto/customization/data/styles/empty/CheckBox.qml | 4 ++-- tests/auto/customization/data/styles/empty/CheckDelegate.qml | 4 ++-- tests/auto/customization/data/styles/empty/ComboBox.qml | 4 ++-- tests/auto/customization/data/styles/empty/Container.qml | 4 ++-- tests/auto/customization/data/styles/empty/Control.qml | 4 ++-- tests/auto/customization/data/styles/empty/DelayButton.qml | 4 ++-- tests/auto/customization/data/styles/empty/Dial.qml | 4 ++-- tests/auto/customization/data/styles/empty/Dialog.qml | 4 ++-- tests/auto/customization/data/styles/empty/DialogButtonBox.qml | 4 ++-- tests/auto/customization/data/styles/empty/Drawer.qml | 4 ++-- tests/auto/customization/data/styles/empty/Frame.qml | 4 ++-- tests/auto/customization/data/styles/empty/GroupBox.qml | 4 ++-- tests/auto/customization/data/styles/empty/ItemDelegate.qml | 4 ++-- tests/auto/customization/data/styles/empty/Label.qml | 4 ++-- tests/auto/customization/data/styles/empty/Menu.qml | 4 ++-- tests/auto/customization/data/styles/empty/MenuBar.qml | 4 ++-- tests/auto/customization/data/styles/empty/MenuBarItem.qml | 4 ++-- tests/auto/customization/data/styles/empty/MenuItem.qml | 4 ++-- tests/auto/customization/data/styles/empty/MenuSeparator.qml | 4 ++-- tests/auto/customization/data/styles/empty/Page.qml | 4 ++-- tests/auto/customization/data/styles/empty/PageIndicator.qml | 4 ++-- tests/auto/customization/data/styles/empty/Pane.qml | 4 ++-- tests/auto/customization/data/styles/empty/Popup.qml | 4 ++-- tests/auto/customization/data/styles/empty/ProgressBar.qml | 4 ++-- tests/auto/customization/data/styles/empty/RadioButton.qml | 4 ++-- tests/auto/customization/data/styles/empty/RadioDelegate.qml | 4 ++-- tests/auto/customization/data/styles/empty/RangeSlider.qml | 4 ++-- tests/auto/customization/data/styles/empty/RoundButton.qml | 4 ++-- tests/auto/customization/data/styles/empty/ScrollBar.qml | 4 ++-- tests/auto/customization/data/styles/empty/ScrollIndicator.qml | 4 ++-- tests/auto/customization/data/styles/empty/ScrollView.qml | 4 ++-- tests/auto/customization/data/styles/empty/Slider.qml | 4 ++-- tests/auto/customization/data/styles/empty/SpinBox.qml | 4 ++-- tests/auto/customization/data/styles/empty/StackView.qml | 4 ++-- tests/auto/customization/data/styles/empty/SwipeDelegate.qml | 4 ++-- tests/auto/customization/data/styles/empty/SwipeView.qml | 4 ++-- tests/auto/customization/data/styles/empty/Switch.qml | 4 ++-- tests/auto/customization/data/styles/empty/SwitchDelegate.qml | 4 ++-- tests/auto/customization/data/styles/empty/TabBar.qml | 4 ++-- tests/auto/customization/data/styles/empty/TabButton.qml | 4 ++-- tests/auto/customization/data/styles/empty/TextArea.qml | 4 ++-- tests/auto/customization/data/styles/empty/TextField.qml | 4 ++-- tests/auto/customization/data/styles/empty/ToolBar.qml | 4 ++-- tests/auto/customization/data/styles/empty/ToolButton.qml | 4 ++-- tests/auto/customization/data/styles/empty/ToolSeparator.qml | 4 ++-- tests/auto/customization/data/styles/empty/ToolTip.qml | 4 ++-- tests/auto/customization/data/styles/empty/Tumbler.qml | 4 ++-- .../customization/data/styles/identified/AbstractButton.qml | 4 ++-- .../customization/data/styles/identified/ApplicationWindow.qml | 4 ++-- .../customization/data/styles/identified/BusyIndicator.qml | 4 ++-- tests/auto/customization/data/styles/identified/Button.qml | 4 ++-- tests/auto/customization/data/styles/identified/CheckBox.qml | 4 ++-- .../customization/data/styles/identified/CheckDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/ComboBox.qml | 6 +++--- tests/auto/customization/data/styles/identified/Container.qml | 4 ++-- tests/auto/customization/data/styles/identified/Control.qml | 4 ++-- .../auto/customization/data/styles/identified/DelayButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/Dial.qml | 4 ++-- tests/auto/customization/data/styles/identified/Dialog.qml | 4 ++-- .../customization/data/styles/identified/DialogButtonBox.qml | 4 ++-- tests/auto/customization/data/styles/identified/Drawer.qml | 4 ++-- tests/auto/customization/data/styles/identified/Frame.qml | 4 ++-- tests/auto/customization/data/styles/identified/GroupBox.qml | 4 ++-- .../auto/customization/data/styles/identified/ItemDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/Label.qml | 4 ++-- tests/auto/customization/data/styles/identified/Menu.qml | 4 ++-- tests/auto/customization/data/styles/identified/MenuBar.qml | 4 ++-- .../auto/customization/data/styles/identified/MenuBarItem.qml | 4 ++-- tests/auto/customization/data/styles/identified/MenuItem.qml | 4 ++-- .../customization/data/styles/identified/MenuSeparator.qml | 4 ++-- tests/auto/customization/data/styles/identified/Page.qml | 4 ++-- .../customization/data/styles/identified/PageIndicator.qml | 4 ++-- tests/auto/customization/data/styles/identified/Pane.qml | 4 ++-- tests/auto/customization/data/styles/identified/Popup.qml | 4 ++-- .../auto/customization/data/styles/identified/ProgressBar.qml | 4 ++-- .../auto/customization/data/styles/identified/RadioButton.qml | 4 ++-- .../customization/data/styles/identified/RadioDelegate.qml | 4 ++-- .../auto/customization/data/styles/identified/RangeSlider.qml | 4 ++-- .../auto/customization/data/styles/identified/RoundButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/ScrollBar.qml | 4 ++-- .../customization/data/styles/identified/ScrollIndicator.qml | 4 ++-- tests/auto/customization/data/styles/identified/ScrollView.qml | 4 ++-- tests/auto/customization/data/styles/identified/Slider.qml | 4 ++-- tests/auto/customization/data/styles/identified/SpinBox.qml | 4 ++-- tests/auto/customization/data/styles/identified/StackView.qml | 4 ++-- .../customization/data/styles/identified/SwipeDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/SwipeView.qml | 4 ++-- tests/auto/customization/data/styles/identified/Switch.qml | 4 ++-- .../customization/data/styles/identified/SwitchDelegate.qml | 4 ++-- tests/auto/customization/data/styles/identified/TabBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/TabButton.qml | 4 ++-- tests/auto/customization/data/styles/identified/TextArea.qml | 4 ++-- tests/auto/customization/data/styles/identified/TextField.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolBar.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolButton.qml | 4 ++-- .../customization/data/styles/identified/ToolSeparator.qml | 4 ++-- tests/auto/customization/data/styles/identified/ToolTip.qml | 4 ++-- tests/auto/customization/data/styles/identified/Tumbler.qml | 4 ++-- .../customization/data/styles/incomplete/AbstractButton.qml | 4 ++-- .../customization/data/styles/incomplete/ApplicationWindow.qml | 4 ++-- .../customization/data/styles/incomplete/BusyIndicator.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Button.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/CheckBox.qml | 4 ++-- .../customization/data/styles/incomplete/CheckDelegate.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/ComboBox.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Container.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Control.qml | 4 ++-- .../auto/customization/data/styles/incomplete/DelayButton.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Dial.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Dialog.qml | 4 ++-- .../customization/data/styles/incomplete/DialogButtonBox.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Drawer.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Frame.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/GroupBox.qml | 4 ++-- .../auto/customization/data/styles/incomplete/ItemDelegate.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Label.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Menu.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/MenuBar.qml | 4 ++-- .../auto/customization/data/styles/incomplete/MenuBarItem.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/MenuItem.qml | 4 ++-- .../customization/data/styles/incomplete/MenuSeparator.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Page.qml | 4 ++-- .../customization/data/styles/incomplete/PageIndicator.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Pane.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Popup.qml | 4 ++-- .../auto/customization/data/styles/incomplete/ProgressBar.qml | 4 ++-- .../auto/customization/data/styles/incomplete/RadioButton.qml | 4 ++-- .../customization/data/styles/incomplete/RadioDelegate.qml | 4 ++-- .../auto/customization/data/styles/incomplete/RangeSlider.qml | 4 ++-- .../auto/customization/data/styles/incomplete/RoundButton.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/ScrollBar.qml | 4 ++-- .../customization/data/styles/incomplete/ScrollIndicator.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/ScrollView.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Slider.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/SpinBox.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/StackView.qml | 4 ++-- .../customization/data/styles/incomplete/SwipeDelegate.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/SwipeView.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Switch.qml | 4 ++-- .../customization/data/styles/incomplete/SwitchDelegate.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/TabBar.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/TabButton.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/TextArea.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/TextField.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/ToolBar.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/ToolButton.qml | 4 ++-- .../customization/data/styles/incomplete/ToolSeparator.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/ToolTip.qml | 4 ++-- tests/auto/customization/data/styles/incomplete/Tumbler.qml | 4 ++-- .../auto/customization/data/styles/override/AbstractButton.qml | 2 +- .../customization/data/styles/override/ApplicationWindow.qml | 2 +- .../auto/customization/data/styles/override/BusyIndicator.qml | 2 +- tests/auto/customization/data/styles/override/Button.qml | 2 +- tests/auto/customization/data/styles/override/CheckBox.qml | 2 +- .../auto/customization/data/styles/override/CheckDelegate.qml | 2 +- tests/auto/customization/data/styles/override/ComboBox.qml | 4 ++-- tests/auto/customization/data/styles/override/Container.qml | 2 +- tests/auto/customization/data/styles/override/Control.qml | 2 +- tests/auto/customization/data/styles/override/DelayButton.qml | 2 +- tests/auto/customization/data/styles/override/Dial.qml | 2 +- tests/auto/customization/data/styles/override/Dialog.qml | 2 +- .../customization/data/styles/override/DialogButtonBox.qml | 2 +- tests/auto/customization/data/styles/override/Drawer.qml | 2 +- tests/auto/customization/data/styles/override/Frame.qml | 2 +- tests/auto/customization/data/styles/override/GroupBox.qml | 2 +- tests/auto/customization/data/styles/override/ItemDelegate.qml | 2 +- tests/auto/customization/data/styles/override/Label.qml | 2 +- tests/auto/customization/data/styles/override/Menu.qml | 2 +- tests/auto/customization/data/styles/override/MenuBar.qml | 2 +- tests/auto/customization/data/styles/override/MenuBarItem.qml | 2 +- tests/auto/customization/data/styles/override/MenuItem.qml | 2 +- .../auto/customization/data/styles/override/MenuSeparator.qml | 2 +- tests/auto/customization/data/styles/override/Page.qml | 2 +- .../auto/customization/data/styles/override/PageIndicator.qml | 2 +- tests/auto/customization/data/styles/override/Pane.qml | 2 +- tests/auto/customization/data/styles/override/Popup.qml | 2 +- tests/auto/customization/data/styles/override/ProgressBar.qml | 2 +- tests/auto/customization/data/styles/override/RadioButton.qml | 2 +- .../auto/customization/data/styles/override/RadioDelegate.qml | 2 +- tests/auto/customization/data/styles/override/RangeSlider.qml | 2 +- tests/auto/customization/data/styles/override/RoundButton.qml | 2 +- tests/auto/customization/data/styles/override/ScrollBar.qml | 2 +- .../customization/data/styles/override/ScrollIndicator.qml | 2 +- tests/auto/customization/data/styles/override/ScrollView.qml | 2 +- tests/auto/customization/data/styles/override/Slider.qml | 2 +- tests/auto/customization/data/styles/override/SpinBox.qml | 2 +- tests/auto/customization/data/styles/override/StackView.qml | 2 +- .../auto/customization/data/styles/override/SwipeDelegate.qml | 2 +- tests/auto/customization/data/styles/override/SwipeView.qml | 2 +- tests/auto/customization/data/styles/override/Switch.qml | 2 +- .../auto/customization/data/styles/override/SwitchDelegate.qml | 2 +- tests/auto/customization/data/styles/override/TabBar.qml | 2 +- tests/auto/customization/data/styles/override/TabButton.qml | 2 +- tests/auto/customization/data/styles/override/TextArea.qml | 2 +- tests/auto/customization/data/styles/override/TextField.qml | 2 +- tests/auto/customization/data/styles/override/ToolBar.qml | 2 +- tests/auto/customization/data/styles/override/ToolButton.qml | 2 +- .../auto/customization/data/styles/override/ToolSeparator.qml | 2 +- tests/auto/customization/data/styles/override/ToolTip.qml | 2 +- tests/auto/customization/data/styles/override/Tumbler.qml | 2 +- tests/auto/customization/data/styles/simple/AbstractButton.qml | 4 ++-- .../customization/data/styles/simple/ApplicationWindow.qml | 4 ++-- tests/auto/customization/data/styles/simple/BusyIndicator.qml | 4 ++-- tests/auto/customization/data/styles/simple/Button.qml | 4 ++-- tests/auto/customization/data/styles/simple/CheckBox.qml | 4 ++-- tests/auto/customization/data/styles/simple/CheckDelegate.qml | 4 ++-- tests/auto/customization/data/styles/simple/ComboBox.qml | 4 ++-- tests/auto/customization/data/styles/simple/Container.qml | 4 ++-- tests/auto/customization/data/styles/simple/Control.qml | 4 ++-- tests/auto/customization/data/styles/simple/DelayButton.qml | 4 ++-- tests/auto/customization/data/styles/simple/Dial.qml | 4 ++-- tests/auto/customization/data/styles/simple/Dialog.qml | 4 ++-- .../auto/customization/data/styles/simple/DialogButtonBox.qml | 4 ++-- tests/auto/customization/data/styles/simple/Drawer.qml | 4 ++-- tests/auto/customization/data/styles/simple/Frame.qml | 4 ++-- tests/auto/customization/data/styles/simple/GroupBox.qml | 4 ++-- tests/auto/customization/data/styles/simple/ItemDelegate.qml | 4 ++-- tests/auto/customization/data/styles/simple/Label.qml | 4 ++-- tests/auto/customization/data/styles/simple/Menu.qml | 4 ++-- tests/auto/customization/data/styles/simple/MenuBar.qml | 4 ++-- tests/auto/customization/data/styles/simple/MenuBarItem.qml | 4 ++-- tests/auto/customization/data/styles/simple/MenuItem.qml | 4 ++-- tests/auto/customization/data/styles/simple/MenuSeparator.qml | 4 ++-- tests/auto/customization/data/styles/simple/Page.qml | 4 ++-- tests/auto/customization/data/styles/simple/PageIndicator.qml | 4 ++-- tests/auto/customization/data/styles/simple/Pane.qml | 4 ++-- tests/auto/customization/data/styles/simple/Popup.qml | 4 ++-- tests/auto/customization/data/styles/simple/ProgressBar.qml | 4 ++-- tests/auto/customization/data/styles/simple/RadioButton.qml | 4 ++-- tests/auto/customization/data/styles/simple/RadioDelegate.qml | 4 ++-- tests/auto/customization/data/styles/simple/RangeSlider.qml | 4 ++-- tests/auto/customization/data/styles/simple/RoundButton.qml | 4 ++-- tests/auto/customization/data/styles/simple/ScrollBar.qml | 4 ++-- .../auto/customization/data/styles/simple/ScrollIndicator.qml | 4 ++-- tests/auto/customization/data/styles/simple/ScrollView.qml | 4 ++-- tests/auto/customization/data/styles/simple/Slider.qml | 4 ++-- tests/auto/customization/data/styles/simple/SpinBox.qml | 4 ++-- tests/auto/customization/data/styles/simple/StackView.qml | 4 ++-- tests/auto/customization/data/styles/simple/SwipeDelegate.qml | 4 ++-- tests/auto/customization/data/styles/simple/SwipeView.qml | 4 ++-- tests/auto/customization/data/styles/simple/Switch.qml | 4 ++-- tests/auto/customization/data/styles/simple/SwitchDelegate.qml | 4 ++-- tests/auto/customization/data/styles/simple/TabBar.qml | 4 ++-- tests/auto/customization/data/styles/simple/TabButton.qml | 4 ++-- tests/auto/customization/data/styles/simple/TextArea.qml | 4 ++-- tests/auto/customization/data/styles/simple/TextField.qml | 4 ++-- tests/auto/customization/data/styles/simple/ToolBar.qml | 4 ++-- tests/auto/customization/data/styles/simple/ToolButton.qml | 4 ++-- tests/auto/customization/data/styles/simple/ToolSeparator.qml | 4 ++-- tests/auto/customization/data/styles/simple/ToolTip.qml | 4 ++-- tests/auto/customization/data/styles/simple/Tumbler.qml | 4 ++-- tests/auto/focus/data/activeFocusOnTab.qml | 4 ++-- tests/auto/focus/data/keyNavigation.qml | 4 ++-- tests/auto/focus/data/visualFocus.qml | 4 ++-- tests/auto/font/data/font-appwindow-custom.qml | 4 ++-- tests/auto/font/data/font-appwindow-default.qml | 4 ++-- tests/auto/font/data/font-control-custom.qml | 4 ++-- tests/auto/font/data/font-control-default.qml | 4 ++-- tests/auto/font/data/font-popup-custom.qml | 4 ++-- tests/auto/font/data/font-popup-default.qml | 4 ++-- tests/auto/font/data/inheritance-childcontrol.qml | 4 ++-- tests/auto/font/data/inheritance-childpopup.qml | 4 ++-- tests/auto/font/data/inheritance-control.qml | 4 ++-- tests/auto/font/data/inheritance-dynamicchildcontrol.qml | 4 ++-- tests/auto/font/data/inheritance-dynamicchildpopup.qml | 4 ++-- tests/auto/font/data/inheritance-dynamiccontrol.qml | 4 ++-- tests/auto/font/data/inheritance-dynamicpopup.qml | 4 ++-- tests/auto/font/data/inheritance-popup.qml | 4 ++-- tests/auto/font/data/listview.qml | 4 ++-- tests/auto/palette/data/inheritance-childcontrol.qml | 4 ++-- tests/auto/palette/data/inheritance-childpopup.qml | 4 ++-- tests/auto/palette/data/inheritance-control.qml | 4 ++-- tests/auto/palette/data/inheritance-dynamicchildcontrol.qml | 4 ++-- tests/auto/palette/data/inheritance-dynamicchildpopup.qml | 4 ++-- tests/auto/palette/data/inheritance-dynamiccontrol.qml | 4 ++-- tests/auto/palette/data/inheritance-dynamicpopup.qml | 4 ++-- tests/auto/palette/data/inheritance-popup.qml | 4 ++-- tests/auto/palette/data/listview.qml | 4 ++-- tests/auto/palette/data/palette-appwindow-custom.qml | 4 ++-- tests/auto/palette/data/palette-appwindow-default.qml | 4 ++-- tests/auto/palette/data/palette-control-custom.qml | 4 ++-- tests/auto/palette/data/palette-control-default.qml | 4 ++-- tests/auto/palette/data/palette-popup-custom.qml | 4 ++-- tests/auto/palette/data/palette-popup-default.qml | 4 ++-- tests/auto/platform/data/tst_colordialog.qml | 2 +- tests/auto/platform/data/tst_filedialog.qml | 2 +- tests/auto/platform/data/tst_folderdialog.qml | 2 +- tests/auto/platform/data/tst_fontdialog.qml | 2 +- tests/auto/platform/data/tst_menu.qml | 2 +- tests/auto/platform/data/tst_menubar.qml | 2 +- tests/auto/platform/data/tst_menuitem.qml | 2 +- tests/auto/platform/data/tst_menuitemgroup.qml | 2 +- tests/auto/platform/data/tst_menuseparator.qml | 2 +- tests/auto/platform/data/tst_messagedialog.qml | 2 +- tests/auto/platform/data/tst_standardpaths.qml | 2 +- tests/auto/platform/data/tst_systemtrayicon.qml | 2 +- tests/auto/pressandhold/data/dependencies.qml | 4 ++-- tests/auto/qquickapplicationwindow/data/activeFocusControl.qml | 4 ++-- tests/auto/qquickapplicationwindow/data/activefocusontab.qml | 4 ++-- tests/auto/qquickapplicationwindow/data/attachedProperties.qml | 4 ++-- .../qquickapplicationwindow/data/basicapplicationwindow.qml | 4 ++-- .../qquickapplicationwindow/data/clearfocusondestruction.qml | 8 ++++---- tests/auto/qquickapplicationwindow/data/defaultFocus.qml | 4 ++-- tests/auto/qquickapplicationwindow/data/fill.qml | 4 ++-- .../qquickapplicationwindow/data/focusAfterPopupClosed.qml | 4 ++-- tests/auto/qquickapplicationwindow/data/font.qml | 6 +++--- tests/auto/qquickapplicationwindow/data/layout.qml | 4 ++-- tests/auto/qquickapplicationwindow/data/locale.qml | 6 +++--- tests/auto/qquickcolor/data/tst_color.qml | 6 +++--- tests/auto/qquickdrawer/data/applicationwindow-button.qml | 4 ++-- tests/auto/qquickdrawer/data/applicationwindow-hover.qml | 4 ++-- tests/auto/qquickdrawer/data/applicationwindow-wheel.qml | 4 ++-- tests/auto/qquickdrawer/data/applicationwindow.qml | 4 ++-- tests/auto/qquickdrawer/data/dragOverModalShadow.qml | 4 ++-- tests/auto/qquickdrawer/data/flickable.qml | 4 ++-- tests/auto/qquickdrawer/data/grabber.qml | 4 ++-- tests/auto/qquickdrawer/data/header.qml | 4 ++-- tests/auto/qquickdrawer/data/multiTouch.qml | 4 ++-- tests/auto/qquickdrawer/data/multiple.qml | 4 ++-- tests/auto/qquickdrawer/data/reposition.qml | 4 ++-- tests/auto/qquickdrawer/data/slider.qml | 4 ++-- tests/auto/qquickdrawer/data/window-button.qml | 4 ++-- tests/auto/qquickdrawer/data/window-hover.qml | 4 ++-- tests/auto/qquickdrawer/data/window-wheel.qml | 4 ++-- tests/auto/qquickdrawer/data/window.qml | 4 ++-- tests/auto/qquickiconimage/data/alignment.qml | 6 +++--- tests/auto/qquickiconimage/data/color.qml | 6 +++--- tests/auto/qquickiconimage/data/fileSelectors.qml | 6 +++--- tests/auto/qquickiconimage/data/imageProvider.qml | 8 ++++---- tests/auto/qquickiconimage/data/nameBindingNoSizes.qml | 6 +++--- tests/auto/qquickiconimage/data/nameBindingSourceSize.qml | 6 +++--- .../qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml | 6 +++--- tests/auto/qquickiconimage/data/root.qml | 2 +- tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml | 6 +++--- tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml | 6 +++--- .../data/sourceBindingSourceSizeWidthHeight.qml | 6 +++--- .../auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml | 6 +++--- tests/auto/qquickiconimage/data/svgNoSizes.qml | 6 +++--- tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml | 6 +++--- tests/auto/qquickiconimage/data/translucentColors.qml | 6 +++--- tests/auto/qquickiconlabel/data/colorChanges.qml | 6 +++--- tests/auto/qquickiconlabel/data/iconlabel.qml | 6 +++--- tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml | 6 +++--- tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml | 6 +++--- tests/auto/qquickimaginestyle/data/tst_imagine.qml | 8 ++++---- tests/auto/qquickmaterialstyle/data/tst_material.qml | 8 ++++---- tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml | 6 +++--- tests/auto/qquickmenu/data/actions.qml | 4 ++-- tests/auto/qquickmenu/data/addItem.qml | 4 ++-- tests/auto/qquickmenu/data/applicationWindowScrollable.qml | 4 ++-- tests/auto/qquickmenu/data/applicationwindow.qml | 4 ++-- tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml | 4 ++-- tests/auto/qquickmenu/data/menuSeparator.qml | 4 ++-- tests/auto/qquickmenu/data/mnemonics.qml | 4 ++-- tests/auto/qquickmenu/data/order.qml | 4 ++-- tests/auto/qquickmenu/data/popup.qml | 4 ++-- tests/auto/qquickmenu/data/pressAndHold.qml | 4 ++-- tests/auto/qquickmenu/data/removeTakeItem.qml | 4 ++-- tests/auto/qquickmenu/data/repeater.qml | 4 ++-- tests/auto/qquickmenu/data/subMenus.qml | 4 ++-- tests/auto/qquickmenu/data/windowScrollable.qml | 4 ++-- .../auto/qquickmenubar/data/delegateFromSeparateComponent.qml | 4 ++-- tests/auto/qquickmenubar/data/empty.qml | 4 ++-- tests/auto/qquickmenubar/data/menubar.qml | 4 ++-- tests/auto/qquickninepatchimage/data/ninepatchimage.qml | 8 ++++---- tests/auto/qquickpopup/data/activeFocusOnClose1.qml | 4 ++-- tests/auto/qquickpopup/data/activeFocusOnClose2.qml | 4 ++-- tests/auto/qquickpopup/data/activeFocusOnClose3.qml | 4 ++-- tests/auto/qquickpopup/data/applicationwindow-hover.qml | 4 ++-- tests/auto/qquickpopup/data/applicationwindow-wheel.qml | 4 ++-- tests/auto/qquickpopup/data/applicationwindow.qml | 4 ++-- tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml | 4 ++-- tests/auto/qquickpopup/data/cursor.qml | 4 ++-- tests/auto/qquickpopup/data/grabber.qml | 4 ++-- tests/auto/qquickpopup/data/nested.qml | 4 ++-- tests/auto/qquickpopup/data/orientation.qml | 4 ++-- tests/auto/qquickpopup/data/window-hover.qml | 4 ++-- tests/auto/qquickpopup/data/window-wheel.qml | 4 ++-- tests/auto/qquickpopup/data/window.qml | 4 ++-- tests/auto/qquickstyle/data/dependencies.qml | 4 ++-- tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml | 2 +- tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml | 2 +- tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml | 2 +- tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml | 2 +- tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml | 2 +- tests/auto/qquickstyleselector/ResourceStyle/Button.qml | 2 +- tests/auto/qquickstyleselector/data/Button.qml | 2 +- tests/auto/qquickstyleselector/data/Control.qml | 2 +- tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml | 2 +- tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml | 2 +- tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml | 2 +- tests/auto/qquickstyleselector/data/Label.qml | 2 +- .../qquickstyleselector/data/PlatformStyle/+linux/Button.qml | 2 +- .../qquickstyleselector/data/PlatformStyle/+macos/Button.qml | 2 +- .../qquickstyleselector/data/PlatformStyle/+windows/Button.qml | 2 +- tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml | 2 +- tests/auto/qquickuniversalstyle/data/tst_universal.qml | 6 +++--- tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml | 6 +++--- tests/auto/revisions/data/dependencies.qml | 8 ++++---- tests/auto/sanity/data/dependencies.qml | 4 ++-- tests/auto/snippets/data/dependencies.qml | 10 +++++----- 522 files changed, 1001 insertions(+), 1001 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/accessibility/data/abstractbutton.qml b/tests/auto/accessibility/data/abstractbutton.qml index 368f4582..b0922176 100644 --- a/tests/auto/accessibility/data/abstractbutton.qml +++ b/tests/auto/accessibility/data/abstractbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 AbstractButton { text: "AbstractButton" diff --git a/tests/auto/accessibility/data/busyindicator.qml b/tests/auto/accessibility/data/busyindicator.qml index 5a1cf54a..e1c33765 100644 --- a/tests/auto/accessibility/data/busyindicator.qml +++ b/tests/auto/accessibility/data/busyindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 BusyIndicator { } diff --git a/tests/auto/accessibility/data/button.qml b/tests/auto/accessibility/data/button.qml index ecaba6cc..600c05da 100644 --- a/tests/auto/accessibility/data/button.qml +++ b/tests/auto/accessibility/data/button.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { text: "Button" diff --git a/tests/auto/accessibility/data/checkbox.qml b/tests/auto/accessibility/data/checkbox.qml index cb46c074..f86a9a27 100644 --- a/tests/auto/accessibility/data/checkbox.qml +++ b/tests/auto/accessibility/data/checkbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckBox { text: "CheckBox" diff --git a/tests/auto/accessibility/data/checkdelegate.qml b/tests/auto/accessibility/data/checkdelegate.qml index f911caf0..2750052f 100644 --- a/tests/auto/accessibility/data/checkdelegate.qml +++ b/tests/auto/accessibility/data/checkdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckDelegate { text: "CheckDelegate" diff --git a/tests/auto/accessibility/data/combobox.qml b/tests/auto/accessibility/data/combobox.qml index 52931968..ec4e87ef 100644 --- a/tests/auto/accessibility/data/combobox.qml +++ b/tests/auto/accessibility/data/combobox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ComboBox { model: ["ComboBox"] diff --git a/tests/auto/accessibility/data/container.qml b/tests/auto/accessibility/data/container.qml index 806ebe78..b8d57eea 100644 --- a/tests/auto/accessibility/data/container.qml +++ b/tests/auto/accessibility/data/container.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Container { } diff --git a/tests/auto/accessibility/data/control.qml b/tests/auto/accessibility/data/control.qml index a8fd0613..dac5f935 100644 --- a/tests/auto/accessibility/data/control.qml +++ b/tests/auto/accessibility/data/control.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/accessibility/data/dayofweekrow-2.qml b/tests/auto/accessibility/data/dayofweekrow-2.qml index 265f975a..96c750cb 100644 --- a/tests/auto/accessibility/data/dayofweekrow-2.qml +++ b/tests/auto/accessibility/data/dayofweekrow-2.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 DayOfWeekRow { } diff --git a/tests/auto/accessibility/data/dayofweekrow.qml b/tests/auto/accessibility/data/dayofweekrow.qml index a3ab92dd..a2aa44ec 100644 --- a/tests/auto/accessibility/data/dayofweekrow.qml +++ b/tests/auto/accessibility/data/dayofweekrow.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 DayOfWeekRow { diff --git a/tests/auto/accessibility/data/dial.qml b/tests/auto/accessibility/data/dial.qml index 354ccdbd..9a471548 100644 --- a/tests/auto/accessibility/data/dial.qml +++ b/tests/auto/accessibility/data/dial.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dial { } diff --git a/tests/auto/accessibility/data/dialog.qml b/tests/auto/accessibility/data/dialog.qml index 26e944fd..20317a31 100644 --- a/tests/auto/accessibility/data/dialog.qml +++ b/tests/auto/accessibility/data/dialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dialog { title: "Dialog" diff --git a/tests/auto/accessibility/data/drawer.qml b/tests/auto/accessibility/data/drawer.qml index 12652164..9b0db5fa 100644 --- a/tests/auto/accessibility/data/drawer.qml +++ b/tests/auto/accessibility/data/drawer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Drawer { } diff --git a/tests/auto/accessibility/data/frame.qml b/tests/auto/accessibility/data/frame.qml index 6a2ec40e..02e45a78 100644 --- a/tests/auto/accessibility/data/frame.qml +++ b/tests/auto/accessibility/data/frame.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Frame { } diff --git a/tests/auto/accessibility/data/groupbox.qml b/tests/auto/accessibility/data/groupbox.qml index ebb3cf7d..0fa8cff5 100644 --- a/tests/auto/accessibility/data/groupbox.qml +++ b/tests/auto/accessibility/data/groupbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 GroupBox { title: "GroupBox" diff --git a/tests/auto/accessibility/data/itemdelegate.qml b/tests/auto/accessibility/data/itemdelegate.qml index 91e1d910..52831648 100644 --- a/tests/auto/accessibility/data/itemdelegate.qml +++ b/tests/auto/accessibility/data/itemdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ItemDelegate { text: "ItemDelegate" diff --git a/tests/auto/accessibility/data/label.qml b/tests/auto/accessibility/data/label.qml index e799f8de..6d7466bc 100644 --- a/tests/auto/accessibility/data/label.qml +++ b/tests/auto/accessibility/data/label.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Label { text: "Label" diff --git a/tests/auto/accessibility/data/menu.qml b/tests/auto/accessibility/data/menu.qml index b931644a..126914d1 100644 --- a/tests/auto/accessibility/data/menu.qml +++ b/tests/auto/accessibility/data/menu.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Menu { } diff --git a/tests/auto/accessibility/data/menuitem.qml b/tests/auto/accessibility/data/menuitem.qml index 308c1c2b..97fd478f 100644 --- a/tests/auto/accessibility/data/menuitem.qml +++ b/tests/auto/accessibility/data/menuitem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MenuItem { text: "MenuItem" diff --git a/tests/auto/accessibility/data/monthgrid-2.qml b/tests/auto/accessibility/data/monthgrid-2.qml index 603a208b..6368d090 100644 --- a/tests/auto/accessibility/data/monthgrid-2.qml +++ b/tests/auto/accessibility/data/monthgrid-2.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 MonthGrid { diff --git a/tests/auto/accessibility/data/monthgrid.qml b/tests/auto/accessibility/data/monthgrid.qml index 92a45f0f..03de2499 100644 --- a/tests/auto/accessibility/data/monthgrid.qml +++ b/tests/auto/accessibility/data/monthgrid.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 MonthGrid { diff --git a/tests/auto/accessibility/data/page.qml b/tests/auto/accessibility/data/page.qml index cda7b80b..84036878 100644 --- a/tests/auto/accessibility/data/page.qml +++ b/tests/auto/accessibility/data/page.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Page { title: "Page" diff --git a/tests/auto/accessibility/data/pageindicator.qml b/tests/auto/accessibility/data/pageindicator.qml index a882296e..30184167 100644 --- a/tests/auto/accessibility/data/pageindicator.qml +++ b/tests/auto/accessibility/data/pageindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 PageIndicator { } diff --git a/tests/auto/accessibility/data/pane.qml b/tests/auto/accessibility/data/pane.qml index 24856e26..bde4fad5 100644 --- a/tests/auto/accessibility/data/pane.qml +++ b/tests/auto/accessibility/data/pane.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Pane { } diff --git a/tests/auto/accessibility/data/popup.qml b/tests/auto/accessibility/data/popup.qml index e1d9f8ff..907d0c55 100644 --- a/tests/auto/accessibility/data/popup.qml +++ b/tests/auto/accessibility/data/popup.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { } diff --git a/tests/auto/accessibility/data/progressbar.qml b/tests/auto/accessibility/data/progressbar.qml index c8733d5d..74b2cb84 100644 --- a/tests/auto/accessibility/data/progressbar.qml +++ b/tests/auto/accessibility/data/progressbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ProgressBar { from: 0 diff --git a/tests/auto/accessibility/data/radiobutton.qml b/tests/auto/accessibility/data/radiobutton.qml index 1ca431f5..1b046d3e 100644 --- a/tests/auto/accessibility/data/radiobutton.qml +++ b/tests/auto/accessibility/data/radiobutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioButton { text: "RadioButton" diff --git a/tests/auto/accessibility/data/radiodelegate.qml b/tests/auto/accessibility/data/radiodelegate.qml index 93ccafde..f2bec8bc 100644 --- a/tests/auto/accessibility/data/radiodelegate.qml +++ b/tests/auto/accessibility/data/radiodelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioDelegate { text: "RadioDelegate" diff --git a/tests/auto/accessibility/data/rangeslider.qml b/tests/auto/accessibility/data/rangeslider.qml index 76736fb8..95bff377 100644 --- a/tests/auto/accessibility/data/rangeslider.qml +++ b/tests/auto/accessibility/data/rangeslider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RangeSlider { from: 0 diff --git a/tests/auto/accessibility/data/roundbutton.qml b/tests/auto/accessibility/data/roundbutton.qml index 8edf58de..20f0ed9a 100644 --- a/tests/auto/accessibility/data/roundbutton.qml +++ b/tests/auto/accessibility/data/roundbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RoundButton { text: "RoundButton" diff --git a/tests/auto/accessibility/data/scrollbar.qml b/tests/auto/accessibility/data/scrollbar.qml index 1420ed19..1e7cf155 100644 --- a/tests/auto/accessibility/data/scrollbar.qml +++ b/tests/auto/accessibility/data/scrollbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollBar { } diff --git a/tests/auto/accessibility/data/scrollindicator.qml b/tests/auto/accessibility/data/scrollindicator.qml index 34e429ad..24ef9271 100644 --- a/tests/auto/accessibility/data/scrollindicator.qml +++ b/tests/auto/accessibility/data/scrollindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollIndicator { } diff --git a/tests/auto/accessibility/data/slider.qml b/tests/auto/accessibility/data/slider.qml index 088bd23a..0d1db79c 100644 --- a/tests/auto/accessibility/data/slider.qml +++ b/tests/auto/accessibility/data/slider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Slider { from: 0 diff --git a/tests/auto/accessibility/data/spinbox.qml b/tests/auto/accessibility/data/spinbox.qml index 07e2a54e..3da1f868 100644 --- a/tests/auto/accessibility/data/spinbox.qml +++ b/tests/auto/accessibility/data/spinbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SpinBox { from: 0 diff --git a/tests/auto/accessibility/data/stackview.qml b/tests/auto/accessibility/data/stackview.qml index cf3b76c2..48cb384e 100644 --- a/tests/auto/accessibility/data/stackview.qml +++ b/tests/auto/accessibility/data/stackview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 StackView { } diff --git a/tests/auto/accessibility/data/swipedelegate.qml b/tests/auto/accessibility/data/swipedelegate.qml index a8acb5e0..d6f503c4 100644 --- a/tests/auto/accessibility/data/swipedelegate.qml +++ b/tests/auto/accessibility/data/swipedelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeDelegate { text: "SwipeDelegate" diff --git a/tests/auto/accessibility/data/swipeview.qml b/tests/auto/accessibility/data/swipeview.qml index 018ab772..efb185e6 100644 --- a/tests/auto/accessibility/data/swipeview.qml +++ b/tests/auto/accessibility/data/swipeview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeView { } diff --git a/tests/auto/accessibility/data/switch.qml b/tests/auto/accessibility/data/switch.qml index 0678f113..b9c8a572 100644 --- a/tests/auto/accessibility/data/switch.qml +++ b/tests/auto/accessibility/data/switch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Switch { text: "Switch" diff --git a/tests/auto/accessibility/data/switchdelegate.qml b/tests/auto/accessibility/data/switchdelegate.qml index fba0c321..d0d9599c 100644 --- a/tests/auto/accessibility/data/switchdelegate.qml +++ b/tests/auto/accessibility/data/switchdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwitchDelegate { text: "SwitchDelegate" diff --git a/tests/auto/accessibility/data/tabbar.qml b/tests/auto/accessibility/data/tabbar.qml index 209a094f..d65b1305 100644 --- a/tests/auto/accessibility/data/tabbar.qml +++ b/tests/auto/accessibility/data/tabbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TabBar { } diff --git a/tests/auto/accessibility/data/tabbutton.qml b/tests/auto/accessibility/data/tabbutton.qml index c76e9048..72277a9f 100644 --- a/tests/auto/accessibility/data/tabbutton.qml +++ b/tests/auto/accessibility/data/tabbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TabButton { text: "TabButton" diff --git a/tests/auto/accessibility/data/textarea.qml b/tests/auto/accessibility/data/textarea.qml index 1ffe366f..c861cda4 100644 --- a/tests/auto/accessibility/data/textarea.qml +++ b/tests/auto/accessibility/data/textarea.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextArea { text: "TextArea" diff --git a/tests/auto/accessibility/data/textfield.qml b/tests/auto/accessibility/data/textfield.qml index f87957eb..222a1223 100644 --- a/tests/auto/accessibility/data/textfield.qml +++ b/tests/auto/accessibility/data/textfield.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { text: "TextField" diff --git a/tests/auto/accessibility/data/toolbar.qml b/tests/auto/accessibility/data/toolbar.qml index e1887de4..f8cbe311 100644 --- a/tests/auto/accessibility/data/toolbar.qml +++ b/tests/auto/accessibility/data/toolbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolBar { } diff --git a/tests/auto/accessibility/data/toolbutton.qml b/tests/auto/accessibility/data/toolbutton.qml index e088bb56..84d67cfa 100644 --- a/tests/auto/accessibility/data/toolbutton.qml +++ b/tests/auto/accessibility/data/toolbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolButton { text: "ToolButton" diff --git a/tests/auto/accessibility/data/tooltip.qml b/tests/auto/accessibility/data/tooltip.qml index dcb5b3b9..a6f7718d 100644 --- a/tests/auto/accessibility/data/tooltip.qml +++ b/tests/auto/accessibility/data/tooltip.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolTip { text: "ToolTip" diff --git a/tests/auto/accessibility/data/tumbler.qml b/tests/auto/accessibility/data/tumbler.qml index 11c737d7..fda5c2bd 100644 --- a/tests/auto/accessibility/data/tumbler.qml +++ b/tests/auto/accessibility/data/tumbler.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Tumbler { } diff --git a/tests/auto/accessibility/data/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/weeknumbercolumn-2.qml index 7d682315..2c5b836b 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn-2.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn-2.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 WeekNumberColumn { } diff --git a/tests/auto/accessibility/data/weeknumbercolumn.qml b/tests/auto/accessibility/data/weeknumbercolumn.qml index 6b024872..71d533ef 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 WeekNumberColumn { diff --git a/tests/auto/calendar/data/tst_calendarmodel.qml b/tests/auto/calendar/data/tst_calendarmodel.qml index ea9933f1..ccadd488 100644 --- a/tests/auto/calendar/data/tst_calendarmodel.qml +++ b/tests/auto/calendar/data/tst_calendarmodel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import QtQml 2.2 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_dayofweekrow.qml b/tests/auto/calendar/data/tst_dayofweekrow.qml index a62d3d5f..f6615f78 100644 --- a/tests/auto/calendar/data/tst_dayofweekrow.qml +++ b/tests/auto/calendar/data/tst_dayofweekrow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_monthgrid.qml b/tests/auto/calendar/data/tst_monthgrid.qml index e524f53e..25c8378b 100644 --- a/tests/auto/calendar/data/tst_monthgrid.qml +++ b/tests/auto/calendar/data/tst_monthgrid.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_weeknumbercolumn.qml b/tests/auto/calendar/data/tst_weeknumbercolumn.qml index 29f458ca..f94fed43 100644 --- a/tests/auto/calendar/data/tst_weeknumbercolumn.qml +++ b/tests/auto/calendar/data/tst_weeknumbercolumn.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/controls/data/SignalSequenceSpy.qml b/tests/auto/controls/data/SignalSequenceSpy.qml index d14a5ee6..531a7f68 100644 --- a/tests/auto/controls/data/SignalSequenceSpy.qml +++ b/tests/auto/controls/data/SignalSequenceSpy.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.12 QtObject { property QtObject target: null diff --git a/tests/auto/controls/data/TestItem.qml b/tests/auto/controls/data/TestItem.qml index b7c16004..6bd42bac 100644 --- a/tests/auto/controls/data/TestItem.qml +++ b/tests/auto/controls/data/TestItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.12 Item { id: item diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml index 72e57bed..01ff2c03 100644 --- a/tests/auto/controls/data/TumblerDatePicker.qml +++ b/tests/auto/controls/data/TumblerDatePicker.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Row { id: datePicker diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/controls/data/TumblerListView.qml index 1248bec0..affaa6cd 100644 --- a/tests/auto/controls/data/TumblerListView.qml +++ b/tests/auto/controls/data/TumblerListView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ListView { anchors.fill: parent diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/controls/data/TumblerPathView.qml index 7b7cd5f4..8ea86eae 100644 --- a/tests/auto/controls/data/TumblerPathView.qml +++ b/tests/auto/controls/data/TumblerPathView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 PathView { id: pathView diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml index 1ed5e45d..7bfa17c5 100644 --- a/tests/auto/controls/data/tst_abstractbutton.qml +++ b/tests/auto/controls/data/tst_abstractbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml index 35e65202..ef28c0e5 100644 --- a/tests/auto/controls/data/tst_action.qml +++ b/tests/auto/controls/data/tst_action.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 -import QtQuick.Templates 2.3 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_actiongroup.qml b/tests/auto/controls/data/tst_actiongroup.qml index 700d247a..6c8ea5c4 100644 --- a/tests/auto/controls/data/tst_actiongroup.qml +++ b/tests/auto/controls/data/tst_actiongroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index 3de8c795..7801cdab 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index 2cf399f4..bd4fe80e 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml index 1b7fa4a3..1abb9795 100644 --- a/tests/auto/controls/data/tst_buttongroup.qml +++ b/tests/auto/controls/data/tst_buttongroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 3fb7d15e..1f00294f 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml index 72b45251..0c0565f1 100644 --- a/tests/auto/controls/data/tst_checkdelegate.qml +++ b/tests/auto/controls/data/tst_checkdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 8e8f9c2f..70c4f090 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml index c5e74eeb..134dbb38 100644 --- a/tests/auto/controls/data/tst_container.qml +++ b/tests/auto/controls/data/tst_container.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 5c66bd04..3c416546 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml index 97ae0272..2560177d 100644 --- a/tests/auto/controls/data/tst_delaybutton.qml +++ b/tests/auto/controls/data/tst_delaybutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index a2d32347..cd2f6112 100644 --- a/tests/auto/controls/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml index e2557a04..22546083 100644 --- a/tests/auto/controls/data/tst_dialog.qml +++ b/tests/auto/controls/data/tst_dialog.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml index ed181c5b..43153c94 100644 --- a/tests/auto/controls/data/tst_dialogbuttonbox.qml +++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml index 95838155..a5236b71 100644 --- a/tests/auto/controls/data/tst_frame.qml +++ b/tests/auto/controls/data/tst_frame.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index 446283d8..a4f1b5f3 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml index 4e4ca0c4..1c236361 100644 --- a/tests/auto/controls/data/tst_itemdelegate.qml +++ b/tests/auto/controls/data/tst_itemdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index 8183f088..8384e932 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml index 57286002..27c23ae5 100644 --- a/tests/auto/controls/data/tst_menuitem.qml +++ b/tests/auto/controls/data/tst_menuitem.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index c709c216..252c6ebf 100644 --- a/tests/auto/controls/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml index dc411e45..0f68b5d8 100644 --- a/tests/auto/controls/data/tst_pageindicator.qml +++ b/tests/auto/controls/data/tst_pageindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml index 8976d4f9..4006474b 100644 --- a/tests/auto/controls/data/tst_pane.qml +++ b/tests/auto/controls/data/tst_pane.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 962feae2..27043d1c 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -50,8 +50,8 @@ import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index f3648495..74840551 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 0d18bf01..c16f615c 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml index b1ee00db..ff11fffb 100644 --- a/tests/auto/controls/data/tst_radiodelegate.qml +++ b/tests/auto/controls/data/tst_radiodelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml index 03b34a2a..24f8a207 100644 --- a/tests/auto/controls/data/tst_rangeslider.qml +++ b/tests/auto/controls/data/tst_rangeslider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml index c772c85f..5f4cc5fa 100644 --- a/tests/auto/controls/data/tst_roundbutton.qml +++ b/tests/auto/controls/data/tst_roundbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 90fe9468..0051b785 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index 9435ec3b..c23bf3e5 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 80110b5a..7581b8c6 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 368bc9fd..2b3144a5 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 47c19f40..419478a2 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Window 2.3 +import QtQuick.Controls 2.12 +import QtQuick.Window 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index 3827354b..a9fbf874 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml index 1668dc84..3e2ff460 100644 --- a/tests/auto/controls/data/tst_swipedelegate.qml +++ b/tests/auto/controls/data/tst_swipedelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index 1f92bba4..38af37f7 100644 --- a/tests/auto/controls/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index 079bf820..b3fab41c 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml index 187a61bd..1c96023f 100644 --- a/tests/auto/controls/data/tst_switchdelegate.qml +++ b/tests/auto/controls/data/tst_switchdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml index 58917d84..519b1d53 100644 --- a/tests/auto/controls/data/tst_tabbar.qml +++ b/tests/auto/controls/data/tst_tabbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml index 3cb22ecd..96384769 100644 --- a/tests/auto/controls/data/tst_tabbutton.qml +++ b/tests/auto/controls/data/tst_tabbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 0a50e033..ee40c9b7 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 963046e4..ee2d1a54 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index c0f0845c..09c3a830 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 9e79cb8c..622554c7 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolseparator.qml b/tests/auto/controls/data/tst_toolseparator.qml index d210dc6d..d3581b96 100644 --- a/tests/auto/controls/data/tst_toolseparator.qml +++ b/tests/auto/controls/data/tst_toolseparator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml index 99b6ee14..8a855ce0 100644 --- a/tests/auto/controls/data/tst_tooltip.qml +++ b/tests/auto/controls/data/tst_tooltip.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 18f63ed4..7c2095f8 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/default/dependencies.qml index 61cd0f17..7ffafb84 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.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TestCase { } diff --git a/tests/auto/controls/fusion/dependencies.qml b/tests/auto/controls/fusion/dependencies.qml index 30c32fa5..2da1b2bb 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.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Fusion 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Fusion 2.12 TestCase { } diff --git a/tests/auto/controls/imagine/dependencies.qml b/tests/auto/controls/imagine/dependencies.qml index 3811fec0..e681aa4f 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.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 TestCase { } diff --git a/tests/auto/controls/material/dependencies.qml b/tests/auto/controls/material/dependencies.qml index 5eda844b..f926944e 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.6 -import QtQuick.Controls 2.2 -import QtQuick.Controls.Material 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 TestCase { } diff --git a/tests/auto/controls/universal/dependencies.qml b/tests/auto/controls/universal/dependencies.qml index 67c54871..a4a0d0a0 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.6 -import QtQuick.Controls 2.2 -import QtQuick.Controls.Universal 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 TestCase { } diff --git a/tests/auto/cursor/data/buttons.qml b/tests/auto/cursor/data/buttons.qml index 21226ef5..2107a8f3 100644 --- a/tests/auto/cursor/data/buttons.qml +++ b/tests/auto/cursor/data/buttons.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/containers.qml b/tests/auto/cursor/data/containers.qml index 09fbbc18..c9dc09d9 100644 --- a/tests/auto/cursor/data/containers.qml +++ b/tests/auto/cursor/data/containers.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/editable.qml b/tests/auto/cursor/data/editable.qml index 1956889b..305d7d46 100644 --- a/tests/auto/cursor/data/editable.qml +++ b/tests/auto/cursor/data/editable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/pageindicator.qml b/tests/auto/cursor/data/pageindicator.qml index 1e550a78..228f010d 100644 --- a/tests/auto/cursor/data/pageindicator.qml +++ b/tests/auto/cursor/data/pageindicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: 200 diff --git a/tests/auto/cursor/data/scrollbar.qml b/tests/auto/cursor/data/scrollbar.qml index 01dcd2ae..41fda945 100644 --- a/tests/auto/cursor/data/scrollbar.qml +++ b/tests/auto/cursor/data/scrollbar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/cursor/data/sliders.qml b/tests/auto/cursor/data/sliders.qml index 408e8947..e3ac2cb1 100644 --- a/tests/auto/cursor/data/sliders.qml +++ b/tests/auto/cursor/data/sliders.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 5cff3ce8..56aaaa04 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 e814d2d6..820b67ae 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b56e9fa3..2d212ed2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 865c97f7..54daa586 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f01402bd..64799ca5 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 a807eb23..b7ea827d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5e7e9b14..2c5cb266 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2e596d6a..1d376cce 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 76e67af1..c7db674a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 142d7980..e1cd7dde 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 68a4e035..94af0a3e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 a9729e47..72f95f0a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 24bf95ca..1f47e83f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 3d8939f5..a550d5b7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 08b474a6..9047035c 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 933c995a..8628cb0d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d2ed1630..721e4b37 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 806209d6..a0be5acf 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 acc73d90..ec7cd9fd 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2499c0e7..6ee7350d 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 641d1064..710c1208 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5e4eb48e..206c2e89 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 e3d5bf38..73b3ec41 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 306b7c69..ce77d17f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 56371529..c71e6908 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 e05737b6..a710e9a2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 56013fc5..f2c19ed3 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 66507065..0ffdb015 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 9763227b..1221e667 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6c881794..b7889e34 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c562d853..d737e4bf 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 bae49ab0..01063900 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 005c70e1..bc727d7b 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 13d40d7d..3e11e721 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d67c6541..74a9fec2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ec2bacf8..d8fe7aee 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6e0f032b..4e84e55a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 297152af..7722f8a7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 15bdf3d3..f27802f4 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 73629a00..61de72b3 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 cf991e01..3908d3f3 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2aa1aacb..e581baa0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 16cce091..caedefe9 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 abc7c95a..e6777411 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 12330509..7d49af20 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6e2f86ee..0a593cbe 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f4e7c2ad..5f923267 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 3dc52753..9f209c55 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 4fdfc25e..bc81e3e7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ce8f5d85..0bc8e3c6 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 af91a5c7..984362f4 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f390ae4b..b9656f7a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 9d5973f1..b77eebfc 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 57a21ff9..dc4c14b7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d92a106c..dca3b9d0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f1a77f6f..8f1f9b25 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d5ec11b3..cfba67d3 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 e3ee2a68..873d1c2a 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.9 -import QtQuick.Templates 2.2 as T -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.12 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 eba77a02..8170e937 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2299d88f..0eb28c21 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 9879a261..fc7f67c9 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 50f387d3..423c64e2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 acfc2e1d..58d0120e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 7b1bd04a..0bf56268 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 42e3829e..82d09bd4 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f3875eb7..e84e18b1 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5d77b27a..ed56f89b 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 3ef8396b..92801c53 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d10ee1dd..d19da135 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 cb0e52e9..5a9ac617 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 596660fb..d846e3c9 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ada9d094..94fdef89 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 40c293cd..34f12cca 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.9 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c82ea4f3..14154e2f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5c8cf73e..945f2ac7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 92f28b39..ef0ab44f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 a0315788..849c7907 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b19b1251..65de416c 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6f22a986..24888624 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 356a9cdd..3a0c4e44 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2af8728a..3eda2408 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 02f2df4d..18118dbe 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f8d56d7c..fc6bc95a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c07132db..f9a4445d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 91cbe662..0f15aa2d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 983e00f7..0855a5af 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 71bea7d3..23afb67e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 1b044b82..7871c975 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 e227b6b2..20459d99 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 483273c8..e60780f5 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ecb74803..0e5a19f6 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 dcdbfdf9..f7e22f1f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 7eb87698..bda30715 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d79257a1..3589f505 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 0bef790a..cc24fdfe 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 160bd264..c7ef2545 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 02fcbf20..670fa9f7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 af571bb9..950f0c53 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c5f875e0..792de9e5 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f682e35f..a44fb331 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 efe727e8..5ddf8920 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 faef7125..ae123f08 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 7b6dd3cc..ee78f032 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d074c46c..45abc542 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 8f4e7fb1..e9a78add 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 8622d978..52f1e2f2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 3c299892..c599ca93 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 16ce3e00..673dbbd9 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 690c093c..ef595e4f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 30eef1d9..9b18ae49 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 fecf86b2..ccec0bf0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d0823e6d..bb21db26 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 bc318f72..e9de0974 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 17dba80d..9f8ad1fa 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 64ebb3c6..7dfaadf5 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c8083fb8..684221e5 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ee2092c5..9f409cfd 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ef66ee74..4c5b258e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b2be8537..39063eb3 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 21563a12..3a953004 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 8027b1db..ca03cfe4 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 dc2b03cc..bc98d4c8 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f46689ab..6b1dbc2e 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 708ec628..40539eaf 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.9 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 a93e2716..eb799f31 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 8ffcb3a0..22964846 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 972ff4f9..87cd3637 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 0d3bd873..f4c96887 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d268405e..fbba7f50 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 96959665..0186fa4e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 28b62af9..fcd31ca6 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b833e8a3..b64c0cab 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 3bc3dfcb..c0faec20 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2d771f58..ddb24e3d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c726c7ad..a79c4daa 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 724060d3..2401fbe5 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 48088a67..736ea7b1 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 54978965..b4ede96f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 33d59829..6303ab06 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 7199f6b2..b163a594 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 1b59f0b0..a64b0fae 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 dd1c39ea..07891063 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 94f6cd8b..53e41149 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 fa1b9831..c9be903f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b3bc29f4..1a55af4d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 bd5c6aab..e2e88a99 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6bd66f1f..cf56e5a0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5ccaedec..66f8372b 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6538b9eb..a665bd25 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b267cedc..3fa51246 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6cef1c64..17b26d7c 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 9a22ad06..7aee3648 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 fa173239..cda24bc2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 602f7930..398b51b7 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.9 +import QtQuick 2.12 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 f5b73624..7a760574 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.9 +import QtQuick 2.12 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 b4478a2f..2b70548f 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.9 +import QtQuick 2.12 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 b8563b27..35f260c3 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.9 +import QtQuick 2.12 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 dfaba8a4..857b86ea 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.9 +import QtQuick 2.12 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 05d6ea11..17e0ed48 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.9 +import QtQuick 2.12 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 1651e294..a41e4674 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 830c7ded..d4d6c189 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.9 +import QtQuick 2.12 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 7d561b05..fc6acb8f 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.9 +import QtQuick 2.12 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 69dfba2d..69fcf49d 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.9 +import QtQuick 2.12 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 4b84a30a..484f8c3f 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.9 +import QtQuick 2.12 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 820bdae8..81798a39 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.9 +import QtQuick 2.12 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 1be2354a..5ab315d4 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.9 +import QtQuick 2.12 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 5fc918c7..943522e7 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.9 +import QtQuick 2.12 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 c99b7bd2..b3b589b5 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.9 +import QtQuick 2.12 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 ea5fa2c6..570bc63e 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.9 +import QtQuick 2.12 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 ddec79d2..6b2fd928 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.9 +import QtQuick 2.12 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 15e070b5..249a9e99 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.9 +import QtQuick 2.12 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 891de1bd..4e10c480 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.9 +import QtQuick 2.12 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 deefe496..baeef209 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.10 +import QtQuick 2.12 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 af318830..a76ca190 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.10 +import QtQuick 2.12 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 2259e739..ee10e1ba 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.9 +import QtQuick 2.12 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 49ae9ee7..c60cedea 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.9 +import QtQuick 2.12 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 8edb5dac..9f85d9e9 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.9 +import QtQuick 2.12 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 9abbc348..1d1e20ed 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.9 +import QtQuick 2.12 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 a88648f6..fb56cc07 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.9 +import QtQuick 2.12 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 96f00eb0..54e8a4f7 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.9 +import QtQuick 2.12 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 52c347a7..ce0623f2 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.9 +import QtQuick 2.12 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 42397f08..c435b3d9 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.9 +import QtQuick 2.12 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 a4f5a9a5..2659800e 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.9 +import QtQuick 2.12 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 575926e5..7c8cdbbc 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.9 +import QtQuick 2.12 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 e0573334..233d0c30 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.9 +import QtQuick 2.12 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 8853cf1c..69fc08f6 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.9 +import QtQuick 2.12 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 32ca31fa..15a44e7a 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.9 +import QtQuick 2.12 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 040c9815..a8041961 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.9 +import QtQuick 2.12 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 0ca6f6c4..252752fd 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.9 +import QtQuick 2.12 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 ea7117cb..041ba6a0 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.9 +import QtQuick 2.12 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 2f109a43..aa35fd62 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.9 +import QtQuick 2.12 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 14267943..634f1e69 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.9 +import QtQuick 2.12 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 fa2cf56f..ffea0df8 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.9 +import QtQuick 2.12 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 4ab8ffe7..0006b00d 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.9 +import QtQuick 2.12 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 25020d62..6a9e318c 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.9 +import QtQuick 2.12 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 7ea41c72..11c009e6 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.9 +import QtQuick 2.12 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 bdf3ff07..967e6ab5 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.9 +import QtQuick 2.12 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 66a80882..5a1b1fe9 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.9 +import QtQuick 2.12 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 4ef826be..2c37d9ae 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.9 +import QtQuick 2.12 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 8d201556..51346893 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.9 +import QtQuick 2.12 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 1f3adcdb..67bbcf64 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.9 +import QtQuick 2.12 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 7a13a25d..70704e6b 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.9 +import QtQuick 2.12 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 63f7ff6c..4be4dc43 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.9 +import QtQuick 2.12 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 de4dd177..f3d56273 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.9 +import QtQuick 2.12 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 e1bcc362..2daaea48 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ff0ac2dd..6cf6440d 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5b63b5c1..f859a09b 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d06ae6c1..66240ba2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 00d76614..931228b0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 08699bf8..cc1cdd7a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 42b95b61..658f5d77 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 59e51d6c..cfa32324 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 eb72f28a..d8ba3c81 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d9d071f2..d48abf9c 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 bebe2979..26f1f86a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c30399eb..020ff66b 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 cbb5273d..6514647e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 64028ba5..ac75cbdf 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5517f216..11a8e0fc 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d38670b5..309950ea 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 7af444ed..9eb3c9c8 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 592d7f64..d7afddbb 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 06163fcc..3c2d487c 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6e38bde7..1e64a3ac 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 5bb1e1f5..1454ceaa 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.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 cb915170..59ac3471 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.9 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 6734ba84..413b412f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 0d07d9ec..950bbdc0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 93eafdee..7ec5c57a 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 188e0edf..86fb079f 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 f605d3d6..41b90be0 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 eebd3eb9..81c0f146 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 8f07acc5..c9910756 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 734b7a20..c59fa336 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 3e46bb58..d16c4bcf 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 aa26e24b..c5609e34 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 faa0e510..01f3f78e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 9843021c..4b802ed7 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 1aabc897..fe782285 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 ba81a518..109709b2 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 bf27c5c0..9db98875 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 d0ad0529..f1439275 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 365858db..27701a92 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c9a4447e..abdde942 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 2f3a4a88..8d008ffb 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 85a27323..cdc91314 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b3080f3f..5055346e 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 7dccf5b8..d6b67647 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 c28b7a62..10c326a6 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 827506ec..09c12a60 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 b8c07927..9b23b67c 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 e6af792d..13ccb576 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 8e9ff373..ef172f74 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 1df40746..27a61c17 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 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 79686990..58c85541 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.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/tests/auto/focus/data/activeFocusOnTab.qml b/tests/auto/focus/data/activeFocusOnTab.qml index fac5a5d5..21bea5e8 100644 --- a/tests/auto/focus/data/activeFocusOnTab.qml +++ b/tests/auto/focus/data/activeFocusOnTab.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: main diff --git a/tests/auto/focus/data/keyNavigation.qml b/tests/auto/focus/data/keyNavigation.qml index ba7d5807..6e949d1d 100644 --- a/tests/auto/focus/data/keyNavigation.qml +++ b/tests/auto/focus/data/keyNavigation.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: main diff --git a/tests/auto/focus/data/visualFocus.qml b/tests/auto/focus/data/visualFocus.qml index 08b44203..3f3e8fb6 100644 --- a/tests/auto/focus/data/visualFocus.qml +++ b/tests/auto/focus/data/visualFocus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Column { width: 400 diff --git a/tests/auto/font/data/font-appwindow-custom.qml b/tests/auto/font/data/font-appwindow-custom.qml index e98b678e..20101bfa 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.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 8337b488..bc75cbb2 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.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { } diff --git a/tests/auto/font/data/font-control-custom.qml b/tests/auto/font/data/font-control-custom.qml index 0121eca2..3f198746 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.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 f3af36a2..e7e78036 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.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/font/data/font-popup-custom.qml b/tests/auto/font/data/font-popup-custom.qml index 3982721e..3d9eb4a2 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.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 c4fab76a..a9bde413 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.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { } diff --git a/tests/auto/font/data/inheritance-childcontrol.qml b/tests/auto/font/data/inheritance-childcontrol.qml index 7c2b0d0c..4ddab64c 100644 --- a/tests/auto/font/data/inheritance-childcontrol.qml +++ b/tests/auto/font/data/inheritance-childcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-childpopup.qml b/tests/auto/font/data/inheritance-childpopup.qml index 304f0486..6868949b 100644 --- a/tests/auto/font/data/inheritance-childpopup.qml +++ b/tests/auto/font/data/inheritance-childpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-control.qml b/tests/auto/font/data/inheritance-control.qml index fe555237..68f7371c 100644 --- a/tests/auto/font/data/inheritance-control.qml +++ b/tests/auto/font/data/inheritance-control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml index 982b5611..1f7c56d1 100644 --- a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml +++ b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/font/data/inheritance-dynamicchildpopup.qml index 7af10af6..a32d34ec 100644 --- a/tests/auto/font/data/inheritance-dynamicchildpopup.qml +++ b/tests/auto/font/data/inheritance-dynamicchildpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamiccontrol.qml b/tests/auto/font/data/inheritance-dynamiccontrol.qml index 263ad38d..d200e397 100644 --- a/tests/auto/font/data/inheritance-dynamiccontrol.qml +++ b/tests/auto/font/data/inheritance-dynamiccontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicpopup.qml b/tests/auto/font/data/inheritance-dynamicpopup.qml index cd355682..a084cc1b 100644 --- a/tests/auto/font/data/inheritance-dynamicpopup.qml +++ b/tests/auto/font/data/inheritance-dynamicpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-popup.qml b/tests/auto/font/data/inheritance-popup.qml index 3219a186..e114287f 100644 --- a/tests/auto/font/data/inheritance-popup.qml +++ b/tests/auto/font/data/inheritance-popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/listview.qml b/tests/auto/font/data/listview.qml index dcd38751..048567e5 100644 --- a/tests/auto/font/data/listview.qml +++ b/tests/auto/font/data/listview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-childcontrol.qml b/tests/auto/palette/data/inheritance-childcontrol.qml index 7c2b0d0c..4ddab64c 100644 --- a/tests/auto/palette/data/inheritance-childcontrol.qml +++ b/tests/auto/palette/data/inheritance-childcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-childpopup.qml b/tests/auto/palette/data/inheritance-childpopup.qml index 304f0486..6868949b 100644 --- a/tests/auto/palette/data/inheritance-childpopup.qml +++ b/tests/auto/palette/data/inheritance-childpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-control.qml b/tests/auto/palette/data/inheritance-control.qml index e5486edb..68f7371c 100644 --- a/tests/auto/palette/data/inheritance-control.qml +++ b/tests/auto/palette/data/inheritance-control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml index 982b5611..1f7c56d1 100644 --- a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml +++ b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml index 7af10af6..a32d34ec 100644 --- a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml +++ b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/palette/data/inheritance-dynamiccontrol.qml index 263ad38d..d200e397 100644 --- a/tests/auto/palette/data/inheritance-dynamiccontrol.qml +++ b/tests/auto/palette/data/inheritance-dynamiccontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicpopup.qml b/tests/auto/palette/data/inheritance-dynamicpopup.qml index cd355682..a084cc1b 100644 --- a/tests/auto/palette/data/inheritance-dynamicpopup.qml +++ b/tests/auto/palette/data/inheritance-dynamicpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-popup.qml b/tests/auto/palette/data/inheritance-popup.qml index e6ac0a3a..e114287f 100644 --- a/tests/auto/palette/data/inheritance-popup.qml +++ b/tests/auto/palette/data/inheritance-popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/listview.qml b/tests/auto/palette/data/listview.qml index 7381c310..a19f6d26 100644 --- a/tests/auto/palette/data/listview.qml +++ b/tests/auto/palette/data/listview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/palette-appwindow-custom.qml b/tests/auto/palette/data/palette-appwindow-custom.qml index 33139e48..a59fb42c 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.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 c071a0f4..bc75cbb2 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.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { } diff --git a/tests/auto/palette/data/palette-control-custom.qml b/tests/auto/palette/data/palette-control-custom.qml index d3eb05bd..fb4b9282 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.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 b747d7e2..e7e78036 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.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/palette/data/palette-popup-custom.qml b/tests/auto/palette/data/palette-popup-custom.qml index 3b7cec3d..ffecfea2 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.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 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 f09feae0..a9bde413 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.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { } diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/platform/data/tst_colordialog.qml index 224692f0..98122c25 100644 --- a/tests/auto/platform/data/tst_colordialog.qml +++ b/tests/auto/platform/data/tst_colordialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/platform/data/tst_filedialog.qml index 8edb0ec4..775e24d3 100644 --- a/tests/auto/platform/data/tst_filedialog.qml +++ b/tests/auto/platform/data/tst_filedialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/platform/data/tst_folderdialog.qml index 9aed6e67..5f44b995 100644 --- a/tests/auto/platform/data/tst_folderdialog.qml +++ b/tests/auto/platform/data/tst_folderdialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/platform/data/tst_fontdialog.qml index 493af4f0..8166964f 100644 --- a/tests/auto/platform/data/tst_fontdialog.qml +++ b/tests/auto/platform/data/tst_fontdialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml index 06b9a30f..bb37c17b 100644 --- a/tests/auto/platform/data/tst_menu.qml +++ b/tests/auto/platform/data/tst_menu.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/platform/data/tst_menubar.qml index 662d6ff7..199c5010 100644 --- a/tests/auto/platform/data/tst_menubar.qml +++ b/tests/auto/platform/data/tst_menubar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml index 17097073..63d4989a 100644 --- a/tests/auto/platform/data/tst_menuitem.qml +++ b/tests/auto/platform/data/tst_menuitem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menuitemgroup.qml b/tests/auto/platform/data/tst_menuitemgroup.qml index cc9da352..c65150ca 100644 --- a/tests/auto/platform/data/tst_menuitemgroup.qml +++ b/tests/auto/platform/data/tst_menuitemgroup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/platform/data/tst_menuseparator.qml index fb7688e3..29c48f6b 100644 --- a/tests/auto/platform/data/tst_menuseparator.qml +++ b/tests/auto/platform/data/tst_menuseparator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml index cf51c27d..d5f2e21f 100644 --- a/tests/auto/platform/data/tst_messagedialog.qml +++ b/tests/auto/platform/data/tst_messagedialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/platform/data/tst_standardpaths.qml index 3f7d51d1..35f0d23b 100644 --- a/tests/auto/platform/data/tst_standardpaths.qml +++ b/tests/auto/platform/data/tst_standardpaths.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml index ea6f731a..675f08f3 100644 --- a/tests/auto/platform/data/tst_systemtrayicon.qml +++ b/tests/auto/platform/data/tst_systemtrayicon.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/pressandhold/data/dependencies.qml b/tests/auto/pressandhold/data/dependencies.qml index cd3e88ba..dac5f935 100644 --- a/tests/auto/pressandhold/data/dependencies.qml +++ b/tests/auto/pressandhold/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml index 940e8e08..743ae16d 100644 --- a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml +++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml index 357ea9a4..45b3d1e3 100644 --- a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml +++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml index 09bc47ef..53a139c1 100644 --- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml +++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 ApplicationWindow { property alias childControl: childControl diff --git a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml index 16182f59..a9412fd6 100644 --- a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml index a992e0be..d3218998 100644 --- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml +++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 +import QtGraphicalEffects 1.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml index 741ce908..5dff2b6c 100644 --- a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml +++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { visible: true diff --git a/tests/auto/qquickapplicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml index 27b10d34..d29ed0f9 100644 --- a/tests/auto/qquickapplicationwindow/data/fill.qml +++ b/tests/auto/qquickapplicationwindow/data/fill.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml index f0499a3a..313bbb5f 100644 --- a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml +++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml index a675aeab..8bde4bf1 100644 --- a/tests/auto/qquickapplicationwindow/data/font.qml +++ b/tests/auto/qquickapplicationwindow/data/font.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/qquickapplicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml index 5bcffdf1..dc840443 100644 --- a/tests/auto/qquickapplicationwindow/data/layout.qml +++ b/tests/auto/qquickapplicationwindow/data/layout.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml index 92edb53a..5efb948f 100644 --- a/tests/auto/qquickapplicationwindow/data/locale.qml +++ b/tests/auto/qquickapplicationwindow/data/locale.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/qquickcolor/data/tst_color.qml b/tests/auto/qquickcolor/data/tst_color.qml index fbd74e3c..e3083514 100644 --- a/tests/auto/qquickcolor/data/tst_color.qml +++ b/tests/auto/qquickcolor/data/tst_color.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml index 9641351e..8e1047b5 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml index 560efec3..3de06805 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml index 541f08aa..5042f44f 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml index 673c4d4c..01b8ff77 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml index 66eb2f4b..7354b6b9 100644 --- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml +++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml index 62256afd..4afef66b 100644 --- a/tests/auto/qquickdrawer/data/flickable.qml +++ b/tests/auto/qquickdrawer/data/flickable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml index e6ebe2da..1f9bbcbb 100644 --- a/tests/auto/qquickdrawer/data/grabber.qml +++ b/tests/auto/qquickdrawer/data/grabber.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml index de3af106..af84cf9b 100644 --- a/tests/auto/qquickdrawer/data/header.qml +++ b/tests/auto/qquickdrawer/data/header.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml index 0faf3c61..57135e5f 100644 --- a/tests/auto/qquickdrawer/data/multiTouch.qml +++ b/tests/auto/qquickdrawer/data/multiTouch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml index 4e622fca..d629e3d0 100644 --- a/tests/auto/qquickdrawer/data/multiple.qml +++ b/tests/auto/qquickdrawer/data/multiple.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml index 485da85c..841e0b77 100644 --- a/tests/auto/qquickdrawer/data/reposition.qml +++ b/tests/auto/qquickdrawer/data/reposition.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/qquickdrawer/data/slider.qml index 595e7091..391a79f0 100644 --- a/tests/auto/qquickdrawer/data/slider.qml +++ b/tests/auto/qquickdrawer/data/slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml index 1b8ac7d5..975d50db 100644 --- a/tests/auto/qquickdrawer/data/window-button.qml +++ b/tests/auto/qquickdrawer/data/window-button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml index b35bcd99..8360d7ce 100644 --- a/tests/auto/qquickdrawer/data/window-hover.qml +++ b/tests/auto/qquickdrawer/data/window-hover.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml index 988a541e..f313f368 100644 --- a/tests/auto/qquickdrawer/data/window-wheel.qml +++ b/tests/auto/qquickdrawer/data/window-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { id: window diff --git a/tests/auto/qquickdrawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml index 88376ac4..578d3e9f 100644 --- a/tests/auto/qquickdrawer/data/window.qml +++ b/tests/auto/qquickdrawer/data/window.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/qquickiconimage/data/alignment.qml index 487ebfd0..4e5ac6e7 100644 --- a/tests/auto/qquickiconimage/data/alignment.qml +++ b/tests/auto/qquickiconimage/data/alignment.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/qquickiconimage/data/color.qml index d6f647e6..b5d40d70 100644 --- a/tests/auto/qquickiconimage/data/color.qml +++ b/tests/auto/qquickiconimage/data/color.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/qquickiconimage/data/fileSelectors.qml index 487ebfd0..4e5ac6e7 100644 --- a/tests/auto/qquickiconimage/data/fileSelectors.qml +++ b/tests/auto/qquickiconimage/data/fileSelectors.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml index 0d7d3033..cf03ac7e 100644 --- a/tests/auto/qquickiconimage/data/imageProvider.qml +++ b/tests/auto/qquickiconimage/data/imageProvider.qml @@ -1,7 +1,7 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T IconLabel { icon.color: "transparent" diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml index d6c33bb3..d0ea13c2 100644 --- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml index 487ebfd0..4e5ac6e7 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml index c503d8cf..db6697d0 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/qquickiconimage/data/root.qml index 0a8b8db9..31ad7265 100644 --- a/tests/auto/qquickiconimage/data/root.qml +++ b/tests/auto/qquickiconimage/data/root.qml @@ -1,4 +1,4 @@ -import QtQuick 2.10 +import QtQuick 2.12 Item { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml index 33f4a2d3..08dcd55e 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml index c246dc74..24678f8c 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml index ecbb7f6d..9ac26e22 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 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 f9e07899..655add7b 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 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 17cccd26..d2652827 100644 --- a/tests/auto/qquickiconimage/data/svgNoSizes.qml +++ b/tests/auto/qquickiconimage/data/svgNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml index 2387e98e..c9157700 100644 --- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/qquickiconimage/data/translucentColors.qml index 49178d76..fd208235 100644 --- a/tests/auto/qquickiconimage/data/translucentColors.qml +++ b/tests/auto/qquickiconimage/data/translucentColors.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 ApplicationWindow { width: 500 diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml index 6fc579f8..954c1ef4 100644 --- a/tests/auto/qquickiconlabel/data/colorChanges.qml +++ b/tests/auto/qquickiconlabel/data/colorChanges.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml index 97042107..b82f9faf 100644 --- a/tests/auto/qquickiconlabel/data/iconlabel.qml +++ b/tests/auto/qquickiconlabel/data/iconlabel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml index ccdb74e2..61c9f74c 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml index 9015aa9d..7c2ecb0f 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Item { width: 200 diff --git a/tests/auto/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/qquickimaginestyle/data/tst_imagine.qml index 72df8814..03bb9602 100644 --- a/tests/auto/qquickimaginestyle/data/tst_imagine.qml +++ b/tests/auto/qquickimaginestyle/data/tst_imagine.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.1 -import QtQuick.Templates 2.3 as T -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml index 38c177ee..9f2456b8 100644 --- a/tests/auto/qquickmaterialstyle/data/tst_material.qml +++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Templates 2.1 as T -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml index 9a31966f..8e3be027 100644 --- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml index 0ec9f36c..6998c722 100644 --- a/tests/auto/qquickmenu/data/actions.qml +++ b/tests/auto/qquickmenu/data/actions.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml index 0668e439..ae592432 100644 --- a/tests/auto/qquickmenu/data/addItem.qml +++ b/tests/auto/qquickmenu/data/addItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml index 1814356c..b9894aed 100644 --- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml +++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml index 265a2f1a..986853e4 100644 --- a/tests/auto/qquickmenu/data/applicationwindow.qml +++ b/tests/auto/qquickmenu/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml index 48176d37..303e9155 100644 --- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml index 6cdf8b27..ce6bd307 100644 --- a/tests/auto/qquickmenu/data/menuSeparator.qml +++ b/tests/auto/qquickmenu/data/menuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml index de4cd215..510d2401 100644 --- a/tests/auto/qquickmenu/data/mnemonics.qml +++ b/tests/auto/qquickmenu/data/mnemonics.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/order.qml b/tests/auto/qquickmenu/data/order.qml index db5c3c1a..e03c86d3 100644 --- a/tests/auto/qquickmenu/data/order.qml +++ b/tests/auto/qquickmenu/data/order.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml index 6040e8ba..e044a527 100644 --- a/tests/auto/qquickmenu/data/popup.qml +++ b/tests/auto/qquickmenu/data/popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml index 6f0acd3a..bcc46c08 100644 --- a/tests/auto/qquickmenu/data/pressAndHold.qml +++ b/tests/auto/qquickmenu/data/pressAndHold.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml index 89090fb6..8352bffd 100644 --- a/tests/auto/qquickmenu/data/removeTakeItem.qml +++ b/tests/auto/qquickmenu/data/removeTakeItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml index 2172f86a..40f44281 100644 --- a/tests/auto/qquickmenu/data/repeater.qml +++ b/tests/auto/qquickmenu/data/repeater.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml index 49811bc2..413e442d 100644 --- a/tests/auto/qquickmenu/data/subMenus.qml +++ b/tests/auto/qquickmenu/data/subMenus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 600 diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml index d21289d3..0d495242 100644 --- a/tests/auto/qquickmenu/data/windowScrollable.qml +++ b/tests/auto/qquickmenu/data/windowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.11 Window { diff --git a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml index 9d58e8c6..82321bca 100644 --- a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenubar/data/empty.qml b/tests/auto/qquickmenubar/data/empty.qml index 6ed0a141..87a3d73d 100644 --- a/tests/auto/qquickmenubar/data/empty.qml +++ b/tests/auto/qquickmenubar/data/empty.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MenuBar { } diff --git a/tests/auto/qquickmenubar/data/menubar.qml b/tests/auto/qquickmenubar/data/menubar.qml index 606dd92c..1ef83a6f 100644 --- a/tests/auto/qquickmenubar/data/menubar.qml +++ b/tests/auto/qquickmenubar/data/menubar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml index 7ef07a1c..4b9ac278 100644 --- a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml +++ b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml @@ -1,7 +1,7 @@ -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 -import QtQuick.Controls.Imagine 2.3 -import QtQuick.Controls.Imagine.impl 2.3 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 NinePatchImage { } diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml index ee0295c1..ed9b65e1 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml index cb215f9b..d089fbbb 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml index a8137b34..20bd7941 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml index 8cec6ba7..7b688147 100644 --- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml index a89bd0f6..de27d7ec 100644 --- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml index 659aa843..3ce8a718 100644 --- a/tests/auto/qquickpopup/data/applicationwindow.qml +++ b/tests/auto/qquickpopup/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml index f41516c8..4f18fc13 100644 --- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml +++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml index fd4475a0..4391f7a0 100644 --- a/tests/auto/qquickpopup/data/cursor.qml +++ b/tests/auto/qquickpopup/data/cursor.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml index b9995b54..6a6d6d65 100644 --- a/tests/auto/qquickpopup/data/grabber.qml +++ b/tests/auto/qquickpopup/data/grabber.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml index 48e51fc8..4ebdfb0c 100644 --- a/tests/auto/qquickpopup/data/nested.qml +++ b/tests/auto/qquickpopup/data/nested.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml index cbf69b2b..a1cc9c0e 100644 --- a/tests/auto/qquickpopup/data/orientation.qml +++ b/tests/auto/qquickpopup/data/orientation.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 600 diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml index 669afb08..0bf00660 100644 --- a/tests/auto/qquickpopup/data/window-hover.qml +++ b/tests/auto/qquickpopup/data/window-hover.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml index 45c09b45..37edee95 100644 --- a/tests/auto/qquickpopup/data/window-wheel.qml +++ b/tests/auto/qquickpopup/data/window-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { id: window diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/qquickpopup/data/window.qml index 962ab573..0e15e838 100644 --- a/tests/auto/qquickpopup/data/window.qml +++ b/tests/auto/qquickpopup/data/window.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickstyle/data/dependencies.qml b/tests/auto/qquickstyle/data/dependencies.qml index cd3e88ba..dac5f935 100644 --- a/tests/auto/qquickstyle/data/dependencies.qml +++ b/tests/auto/qquickstyle/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml index 5b08222c..eaeeadcd 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.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml b/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml index 5b08222c..eaeeadcd 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.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml b/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml index 5b08222c..eaeeadcd 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.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml index 5b08222c..eaeeadcd 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.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml index 5b08222c..eaeeadcd 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.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml +++ b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Button.qml b/tests/auto/qquickstyleselector/data/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/Button.qml +++ b/tests/auto/qquickstyleselector/data/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Control.qml b/tests/auto/qquickstyleselector/data/Control.qml index 697662f6..6820b57d 100644 --- a/tests/auto/qquickstyleselector/data/Control.qml +++ b/tests/auto/qquickstyleselector/data/Control.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Control { } diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml index 8879d93f..23699c1c 100644 --- a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml +++ b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Label { } diff --git a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Label.qml b/tests/auto/qquickstyleselector/data/Label.qml index 8879d93f..23699c1c 100644 --- a/tests/auto/qquickstyleselector/data/Label.qml +++ b/tests/auto/qquickstyleselector/data/Label.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Label { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/qquickuniversalstyle/data/tst_universal.qml index a5fa763b..0926cae3 100644 --- a/tests/auto/qquickuniversalstyle/data/tst_universal.qml +++ b/tests/auto/qquickuniversalstyle/data/tst_universal.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml index 94bf29aa..7abc8b13 100644 --- a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/revisions/data/dependencies.qml b/tests/auto/revisions/data/dependencies.qml index 6f21af18..e276ba59 100644 --- a/tests/auto/revisions/data/dependencies.qml +++ b/tests/auto/revisions/data/dependencies.qml @@ -1,6 +1,6 @@ -import QtQuick 2.8 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 Control { } diff --git a/tests/auto/sanity/data/dependencies.qml b/tests/auto/sanity/data/dependencies.qml index cd3e88ba..dac5f935 100644 --- a/tests/auto/sanity/data/dependencies.qml +++ b/tests/auto/sanity/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/snippets/data/dependencies.qml index 6c897566..db0a968d 100644 --- a/tests/auto/snippets/data/dependencies.qml +++ b/tests/auto/snippets/data/dependencies.qml @@ -1,8 +1,8 @@ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +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.calendar 1.0 Control { } -- cgit v1.2.3 From 953fbac6131823e4fce0eb4707a854469c4c04ff Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 11 Oct 2018 10:29:33 +0200 Subject: Fix Instantiator-created MenuItems disappearing When d5cb26bc fixed a bug in Menu, it also broke the use case of having an Instantiator create menu items. Using an Instantiator like this allows users to create a "Recent Files" menu, for example. The issue was that we would indiscriminately recreate items, even those owned by an Instantiator. This patch avoids recreating items owned by Instantiators. It also adds a logging category for Menu, to aid debugging. Fixes: QTBUG-71066 Change-Id: Ie0e46de1cbfaee81b43d63f3143435f2514371d5 Reviewed-by: Richard Moe Gustavsen --- tests/auto/qquickmenu/data/instantiator.qml | 76 +++++++++++++++++++ .../data/instantiatorWithItemsBeforeAndAfter.qml | 88 ++++++++++++++++++++++ tests/auto/qquickmenu/tst_qquickmenu.cpp | 71 +++++++++++++++++ 3 files changed, 235 insertions(+) create mode 100644 tests/auto/qquickmenu/data/instantiator.qml create mode 100644 tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml (limited to 'tests/auto') diff --git a/tests/auto/qquickmenu/data/instantiator.qml b/tests/auto/qquickmenu/data/instantiator.qml new file mode 100644 index 00000000..270266c3 --- /dev/null +++ b/tests/auto/qquickmenu/data/instantiator.qml @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQml 2.11 +import QtQuick 2.11 +import QtQuick.Controls 2.4 + +ApplicationWindow { + width: 200 + height: 200 + + property alias menu: menu + + Menu { + id: menu + + Instantiator { + model: ["A", "B"] + + MenuItem { + objectName: text + text: modelData + } + + onObjectAdded: menu.insertItem(index, object) + onObjectRemoved: menu.removeItem(object) + } + } +} diff --git a/tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml b/tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml new file mode 100644 index 00000000..9f3ef430 --- /dev/null +++ b/tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQml 2.11 +import QtQuick 2.11 +import QtQuick.Controls 2.4 + +ApplicationWindow { + width: 200 + height: 200 + + property alias menu: menu + + Menu { + id: menu + + MenuItem { + objectName: text + text: "Before" + } + + Instantiator { + model: ["Instantiated #1", "Instantiated #2"] + + MenuItem { + objectName: text + text: modelData + } + + // We want our items to be added after the "Before" MenuItem, + // so we have to insert items at the index after it. + onObjectAdded: menu.insertItem(1 + index, object) + onObjectRemoved: menu.removeItem(object) + } + + MenuItem { + objectName: text + text: "After" + } + } +} diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 27cd8aaa..2ba9363b 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -89,6 +89,8 @@ private slots: void scrollable_data(); void scrollable(); void delegateFromSeparateComponent(); + void instantiator(); + void instantiatorWithItemsBeforeAndAfter(); }; void tst_QQuickMenu::defaults() @@ -1434,6 +1436,75 @@ void tst_QQuickMenu::delegateFromSeparateComponent() QCOMPARE(actionItem2Bg->property("color").value(), green); } +void tst_QQuickMenu::instantiator() +{ + if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) + QSKIP("This platform only allows tab focus for text controls"); + + QQuickApplicationHelper helper(this, QLatin1String("instantiator.qml")); + + QQuickApplicationWindow *window = helper.appWindow; + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QGuiApplication::focusWindow() == window); + centerOnScreen(window); + moveMouseAway(window); + + QQuickMenu *menu = window->property("menu").value(); + menu->open(); + QVERIFY(menu->isVisible()); + waitForMenuListViewPolish(menu); + menu->setFocus(true); + + // Highlight the first item. + QQuickMenuItem *firstItem = qobject_cast(menu->itemAt(0)); + QVERIFY(firstItem); + QTest::keyClick(window, Qt::Key_Tab); + QVERIFY(firstItem->hasActiveFocus()); + QVERIFY(firstItem->hasVisualFocus()); + QVERIFY(firstItem->isHighlighted()); + QTRY_VERIFY(!QQuickItemPrivate::get(firstItem)->culled); + + // Highlight the second item. + QQuickMenuItem *secondItem = qobject_cast(menu->itemAt(1)); + QVERIFY(secondItem); + QTest::keyClick(window, Qt::Key_Down); + QVERIFY(secondItem->hasActiveFocus()); + QVERIFY(secondItem->hasVisualFocus()); + QVERIFY(secondItem->isHighlighted()); + QVERIFY(!QQuickItemPrivate::get(secondItem)->culled); +} + +void tst_QQuickMenu::instantiatorWithItemsBeforeAndAfter() +{ + QQuickApplicationHelper helper(this, QLatin1String("instantiatorWithItemsBeforeAndAfter.qml")); + + QQuickApplicationWindow *window = helper.appWindow; + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QGuiApplication::focusWindow() == window); + centerOnScreen(window); + moveMouseAway(window); + + QQuickMenu *menu = window->property("menu").value(); + menu->open(); + QVERIFY(menu->isVisible()); + waitForMenuListViewPolish(menu); + + QStringList expectedItemTexts; + expectedItemTexts << QLatin1String("Before") << QLatin1String("Instantiated #1") + << QLatin1String("Instantiated #2") << QLatin1String("After"); + + for (int i = 0; i < expectedItemTexts.size(); ++i) { + const QString expectedText = expectedItemTexts.at(i); + QQuickMenuItem *menuItem = qobject_cast(menu->itemAt(i)); + QVERIFY(menuItem); + QCOMPARE(menuItem->text(), expectedText); + } +} + QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" -- cgit v1.2.3 From 936d31179d44220571ded15840bedeccb581c83b Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 16 Oct 2018 16:45:15 +0200 Subject: tst_qquickmenu: add a test for MenuItems before and after a Repeater Just to verify that it works, as a similar test was added for Instantiator in another patch. Change-Id: I1ab55d98a3726bff1a2984db0d81ae444e05d630 Reviewed-by: Richard Moe Gustavsen --- .../data/repeaterWithItemsBeforeAndAfter.qml | 88 ++++++++++++++++++++++ tests/auto/qquickmenu/tst_qquickmenu.cpp | 32 +++++++- 2 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml (limited to 'tests/auto') diff --git a/tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml b/tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml new file mode 100644 index 00000000..46ed8856 --- /dev/null +++ b/tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQml 2.11 +import QtQuick 2.11 +import QtQuick.Controls 2.4 + +ApplicationWindow { + width: 200 + height: 200 + + property alias menu: menu + + Menu { + id: menu + + MenuItem { + objectName: text + text: "Before" + } + + Repeater { + model: ["Repeater Item #1", "Repeater Item #2"] + + MenuItem { + objectName: text + text: modelData + } + + // We want our items to be added after the "Before" MenuItem, + // so we have to insert items at the index after it. + onItemAdded: menu.insertItem(1 + index, item) + onItemRemoved: menu.removeItem(item) + } + + MenuItem { + objectName: text + text: "After" + } + } +} diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 2ba9363b..2f6d5049 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -75,6 +75,7 @@ private slots: void addItem(); void menuSeparator(); void repeater(); + void repeaterWithItemsBeforeAndAfter(); void order(); void popup(); void actions(); @@ -591,7 +592,7 @@ void tst_QQuickMenu::repeater() for (int i = 0; i < count; ++i) { QQuickItem *item = menu->itemAt(i); - QVERIFY(item); + QVERIFY2(item, qPrintable(QString::fromLatin1("Expected item to be at index %1").arg(i))); QCOMPARE(item->property("idx").toInt(), i); QQuickItem *repeaterItem = nullptr; @@ -615,6 +616,35 @@ void tst_QQuickMenu::repeater() } } +void tst_QQuickMenu::repeaterWithItemsBeforeAndAfter() +{ + QQuickApplicationHelper helper(this, QLatin1String("repeaterWithItemsBeforeAndAfter.qml")); + + QQuickApplicationWindow *window = helper.appWindow; + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QGuiApplication::focusWindow() == window); + centerOnScreen(window); + moveMouseAway(window); + + QQuickMenu *menu = window->property("menu").value(); + menu->open(); + QVERIFY(menu->isVisible()); + waitForMenuListViewPolish(menu); + + QStringList expectedItemTexts; + expectedItemTexts << QLatin1String("Before") << QLatin1String("Repeater Item #1") + << QLatin1String("Repeater Item #2") << QLatin1String("After"); + + for (int i = 0; i < expectedItemTexts.size(); ++i) { + const QString expectedText = expectedItemTexts.at(i); + QQuickMenuItem *menuItem = qobject_cast(menu->itemAt(i)); + QVERIFY(menuItem); + QCOMPARE(menuItem->text(), expectedText); + } +} + void tst_QQuickMenu::order() { QQuickApplicationHelper helper(this, QLatin1String("order.qml")); -- cgit v1.2.3 From 018df56aa6804908bcdf5c4f380c1fe9366ce324 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 9 Nov 2018 10:26:44 +0100 Subject: QQuickPage: fix a typo to avoid a crash when setting null to footer Fixes: QTBUG-71444 Change-Id: Id4b0a3fd7aa104357674b4e2be6206894f8878da Reviewed-by: J-P Nurmi Reviewed-by: Richard Moe Gustavsen --- tests/auto/controls/data/tst_dialog.qml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml index 22546083..1bfffc1d 100644 --- a/tests/auto/controls/data/tst_dialog.qml +++ b/tests/auto/controls/data/tst_dialog.qml @@ -66,6 +66,14 @@ TestCase { Dialog { } } + Component { + id: qtbug71444 + Dialog { + header: null + footer: null + } + } + Component { id: buttonBox DialogButtonBox { } @@ -198,6 +206,11 @@ TestCase { compare(rejectedSpy.count, 1) } + function test_qtbug71444() { + var control = createTemporaryObject(qtbug71444, testCase) + verify(control) + } + function test_standardButtons() { var control = createTemporaryObject(dialog, testCase) -- cgit v1.2.3 From fc1832810f6c09505d9413685ed0b2d6295bea4a Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 6 Nov 2018 11:39:23 +0100 Subject: QQuickMenuBar: fix menu not opening When a Menu is declared within a MenuBar, a MenuBarItem has to be created for it. Creation takes the following steps: - 1 Begin creation of the item - 1.1 Set the parent of the MenuBarItem to the MenuBar - 2 Set the menu on the item - 3 Complete creation of the item - 4 Add the item When setting the parent of the MenuBarItem, the following call stack can be observed: 1 QQuickContainer::itemChange qquickcontainer.cpp 757 0x7fff6e5f4544 2 QQuickItemPrivate::itemChange qquickitem.cpp 6213 0x7fff6aa226f7 3 QQuickItemPrivate::addChild qquickitem.cpp 2964 0x7fff6aa1e663 4 QQuickItem::setParentItem qquickitem.cpp 2753 0x7fff6aa0f57c 5 QQuickMenuBarPrivate::beginCreateItem qquickmenubar.cpp 100 0x7fff6e627c08 6 QQuickMenuBarPrivate::createItem qquickmenubar.cpp 115 0x7fff6e627c98 7 QQuickMenuBarPrivate::contentData_append qquickmenubar.cpp 263 0x7fff6e6285d9 In particular, the following function is called: void QQuickContainer::itemChange(ItemChange change, const ItemChangeData &data) { Q_D(QQuickContainer); QQuickControl::itemChange(change, data); if (change == QQuickItem::ItemChildAddedChange && isComponentComplete() && data.item != d->background && data.item != d->contentItem) { if (!QQuickItemPrivate::get(data.item)->isTransparentForPositioner() && d->contentModel->indexOf(data.item, nullptr) == -1) addItem(data.item); } } This check is for items that are added after component completion of the control (QQuickMenuBar), as there is a isComponentComplete() check. Before d923dd46, QQuickMenuBarItems were constructed the moment their QQuickMenus were appended to QQuickMenuBar's contentData, which was before component completion. This meant that the isComponentComplete() check above failed as expected and the item was instead added after its creation process was completed (step #4 in the list above): void QQuickMenuBarPrivate::contentData_append(QQmlListProperty *prop, QObject *obj) { QQuickMenuBar *menuBar = static_cast(prop->object); if (QQuickMenu *menu = qobject_cast(obj)) obj = QQuickMenuBarPrivate::get(menuBar)->createItem(menu); QQuickContainerPrivate::contentData_append(prop, obj); // leads to addItem() being called } Part of the process of an item being added to QQuickMenuBar involves connecting to the signals of its corresponding QQuickMenu (if it has a menu). Quoting the code from QQuickMenuBar::itemAdded(): if (QQuickMenu *menu = menuBarItem->menu()) QObjectPrivate::connect(menu, &QQuickPopup::aboutToHide, d, &QQuickMenuBarPrivate::onMenuAboutToHide); After d923dd46, QQuickMenuBarItems are now constructed *after* component completion to ensure that delegates declared outside of the menu bar have been completed. This means that the isComponentComplete() check in QQuickContainer::itemChange() no longer fails and the item is added before its QQuickMenu is set on it (step #2). As a result, it never connects to the QQuickPopup::aboutToHide() signal and hence it stays activated/highlighted even after the menu has been dismissed, which results in having to click twice on the QQuickMenuBarItem to open the menu the next time. This patch fixes the issue by simply setting the menu on the item before setting its parent: - 1 Begin creation of the item - 1.1 Set the menu on the item - 1.2 Set the parent of the MenuBarItem to the MenuBar - 2 Complete creation of the item - 3 Add the item This ensures that the item has a menu and the connection is made. Change-Id: I93edf7e5a8616a851595ce28ed43f0348078f0b5 Fixes: QTBUG-71583 Reviewed-by: Richard Moe Gustavsen --- tests/auto/qquickmenubar/tst_qquickmenubar.cpp | 60 ++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp index cfcdee5e..70d487a9 100644 --- a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp +++ b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -64,6 +65,7 @@ private slots: void mnemonics(); void addRemove(); void delegateFromSeparateComponent(); + void openTwice(); }; void tst_qquickmenubar::delegate() @@ -605,6 +607,64 @@ void tst_qquickmenubar::delegateFromSeparateComponent() QCOMPARE(menuBarItemBg->property("color").value(), green); } +void tst_qquickmenubar::openTwice() +{ + if ((QGuiApplication::platformName() == QLatin1String("offscreen")) + || (QGuiApplication::platformName() == QLatin1String("minimal"))) + QSKIP("Mouse highlight not functional on offscreen/minimal platforms"); + + QQmlApplicationEngine engine(testFileUrl("menubar.qml")); + + QScopedPointer window(qobject_cast(engine.rootObjects().value(0))); + QVERIFY(window); + QVERIFY(QTest::qWaitForWindowActive(window.data())); + + centerOnScreen(window.data()); + + QQuickMenuBar *menuBar = window->property("header").value(); + QVERIFY(menuBar); + + QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0); + QVERIFY(fileMenuBarMenu); + + QQuickMenuBarItem *fileMenuBarItem = qobject_cast(fileMenuBarMenu->parentItem()); + QVERIFY(fileMenuBarItem); + QQuickMenuBarPrivate *menuBarPrivate = QQuickMenuBarPrivate::get(menuBar); + menuBar->polish(); + QVERIFY(menuBarPrivate->polishScheduled); + QTRY_VERIFY(!menuBarPrivate->polishScheduled); + + // Open a menu. + QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, + fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); + QVERIFY(fileMenuBarItem->isHighlighted()); + QVERIFY(fileMenuBarMenu->isVisible()); + QTRY_VERIFY(fileMenuBarMenu->isOpened()); + waitForMenuListViewPolish(fileMenuBarMenu); + + // Click on an item to close the menu. + QQuickMenuItem *openMenuItem = qobject_cast(fileMenuBarMenu->itemAt(0)); + QVERIFY(openMenuItem); + QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, + openMenuItem->mapToScene(QPointF(openMenuItem->width() / 2, openMenuItem->height() / 2)).toPoint()); + QVERIFY(!fileMenuBarItem->isHighlighted()); + QTRY_VERIFY(!fileMenuBarMenu->isVisible()); + + // Re-open the menu. It should open with one click of the QQuickMenuBarItem. + QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, + fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); + QVERIFY(fileMenuBarItem->isHighlighted()); + QVERIFY(fileMenuBarMenu->isVisible()); + QTRY_VERIFY(fileMenuBarMenu->isOpened()); + waitForMenuListViewPolish(fileMenuBarMenu); + + // Click on an item to close the menu. + QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, + openMenuItem->mapToScene(QPointF(openMenuItem->width() / 2, openMenuItem->height() / 2)).toPoint()); + QVERIFY(!fileMenuBarItem->isHighlighted()); + QTRY_VERIFY(!fileMenuBarMenu->isVisible()); +} + QTEST_QUICKCONTROLS_MAIN(tst_qquickmenubar) #include "tst_qquickmenubar.moc" -- cgit v1.2.3 From d3545dbdfdb30e310c6c962ba92f4fdf57354666 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 14 Nov 2018 11:13:15 +0100 Subject: Revert all Menu delegate patches This reverts the following commits: d5cb26bc56a3b6f6e99c88654d4f7a65f43551ac - Menu: ensure the correct delegates are used when created via Component d923dd467c1aeb3e195a09949b04862084002f88 - MenuBar: ensure the correct delegates are used when created via Component d56c193eb4ceb640611d66f22e1f26aae91cd7d1 - QQuickPopupPositioner: avoid adding duplicate item change listeners 567a2de8cd493aabe0055d6dbc367b39447e70dd - Stabilize tst_qquickmenubar 953fbac6131823e4fce0eb4707a854469c4c04ff - Fix Instantiator-created MenuItems disappearing 936d31179d44220571ded15840bedeccb581c83b - tst_qquickmenu: add a test for MenuItems before and after a Repeater fc1832810f6c09505d9413685ed0b2d6295bea4a - QQuickMenuBar: fix menu not opening The fix for QTBUG-67559 has caused lots of issues, with the latest being a crash right before the 5.12 release. The bug that they fix is a P2, so it's not worth the hassle. The patches might be able to be resubmitted to dev after the crash is fixed. Change-Id: Ic192c7a302176bcdb2503b636b3462b10898a2ba Fixes: QTBUG-71770 Reviewed-by: J-P Nurmi Reviewed-by: Shawn Rutledge --- tests/auto/qquickmenu/data/instantiator.qml | 76 -------- .../data/instantiatorWithItemsBeforeAndAfter.qml | 88 --------- .../data/repeaterWithItemsBeforeAndAfter.qml | 88 --------- tests/auto/qquickmenu/qquickmenu.pro | 1 - tests/auto/qquickmenu/tst_qquickmenu.cpp | 201 +-------------------- tests/auto/qquickmenubar/qquickmenubar.pro | 1 - tests/auto/qquickmenubar/tst_qquickmenubar.cpp | 101 ----------- tests/auto/qquickpopup/tst_qquickpopup.cpp | 4 - tests/auto/shared/menuutil.h | 61 ------- 9 files changed, 1 insertion(+), 620 deletions(-) delete mode 100644 tests/auto/qquickmenu/data/instantiator.qml delete mode 100644 tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml delete mode 100644 tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml delete mode 100644 tests/auto/shared/menuutil.h (limited to 'tests/auto') diff --git a/tests/auto/qquickmenu/data/instantiator.qml b/tests/auto/qquickmenu/data/instantiator.qml deleted file mode 100644 index 270266c3..00000000 --- a/tests/auto/qquickmenu/data/instantiator.qml +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQml 2.11 -import QtQuick 2.11 -import QtQuick.Controls 2.4 - -ApplicationWindow { - width: 200 - height: 200 - - property alias menu: menu - - Menu { - id: menu - - Instantiator { - model: ["A", "B"] - - MenuItem { - objectName: text - text: modelData - } - - onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) - } - } -} diff --git a/tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml b/tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml deleted file mode 100644 index 9f3ef430..00000000 --- a/tests/auto/qquickmenu/data/instantiatorWithItemsBeforeAndAfter.qml +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQml 2.11 -import QtQuick 2.11 -import QtQuick.Controls 2.4 - -ApplicationWindow { - width: 200 - height: 200 - - property alias menu: menu - - Menu { - id: menu - - MenuItem { - objectName: text - text: "Before" - } - - Instantiator { - model: ["Instantiated #1", "Instantiated #2"] - - MenuItem { - objectName: text - text: modelData - } - - // We want our items to be added after the "Before" MenuItem, - // so we have to insert items at the index after it. - onObjectAdded: menu.insertItem(1 + index, object) - onObjectRemoved: menu.removeItem(object) - } - - MenuItem { - objectName: text - text: "After" - } - } -} diff --git a/tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml b/tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml deleted file mode 100644 index 46ed8856..00000000 --- a/tests/auto/qquickmenu/data/repeaterWithItemsBeforeAndAfter.qml +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQml 2.11 -import QtQuick 2.11 -import QtQuick.Controls 2.4 - -ApplicationWindow { - width: 200 - height: 200 - - property alias menu: menu - - Menu { - id: menu - - MenuItem { - objectName: text - text: "Before" - } - - Repeater { - model: ["Repeater Item #1", "Repeater Item #2"] - - MenuItem { - objectName: text - text: modelData - } - - // We want our items to be added after the "Before" MenuItem, - // so we have to insert items at the index after it. - onItemAdded: menu.insertItem(1 + index, item) - onItemRemoved: menu.removeItem(item) - } - - MenuItem { - objectName: text - text: "After" - } - } -} diff --git a/tests/auto/qquickmenu/qquickmenu.pro b/tests/auto/qquickmenu/qquickmenu.pro index 7e1080b9..ee539842 100644 --- a/tests/auto/qquickmenu/qquickmenu.pro +++ b/tests/auto/qquickmenu/qquickmenu.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qquickmenu -HEADERS += ../shared/menuutil.h SOURCES += tst_qquickmenu.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 2f6d5049..b46b8781 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -43,8 +43,6 @@ #include #include #include -#include -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" @@ -75,7 +73,6 @@ private slots: void addItem(); void menuSeparator(); void repeater(); - void repeaterWithItemsBeforeAndAfter(); void order(); void popup(); void actions(); @@ -89,9 +86,6 @@ private slots: void addRemoveSubMenus(); void scrollable_data(); void scrollable(); - void delegateFromSeparateComponent(); - void instantiator(); - void instantiatorWithItemsBeforeAndAfter(); }; void tst_QQuickMenu::defaults() @@ -151,7 +145,6 @@ void tst_QQuickMenu::mouse() menu->open(); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - waitForMenuListViewPolish(menu); QQuickItem *firstItem = menu->itemAt(0); QSignalSpy clickedSpy(firstItem, SIGNAL(clicked())); @@ -275,8 +268,6 @@ void tst_QQuickMenu::contextMenuKeyboard() QCOMPARE(visibleSpy.count(), 1); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - waitForMenuListViewPolish(menu); - QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->property("highlighted").toBool()); QCOMPARE(menu->currentIndex(), -1); @@ -592,7 +583,7 @@ void tst_QQuickMenu::repeater() for (int i = 0; i < count; ++i) { QQuickItem *item = menu->itemAt(i); - QVERIFY2(item, qPrintable(QString::fromLatin1("Expected item to be at index %1").arg(i))); + QVERIFY(item); QCOMPARE(item->property("idx").toInt(), i); QQuickItem *repeaterItem = nullptr; @@ -616,35 +607,6 @@ void tst_QQuickMenu::repeater() } } -void tst_QQuickMenu::repeaterWithItemsBeforeAndAfter() -{ - QQuickApplicationHelper helper(this, QLatin1String("repeaterWithItemsBeforeAndAfter.qml")); - - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - QVERIFY(QGuiApplication::focusWindow() == window); - centerOnScreen(window); - moveMouseAway(window); - - QQuickMenu *menu = window->property("menu").value(); - menu->open(); - QVERIFY(menu->isVisible()); - waitForMenuListViewPolish(menu); - - QStringList expectedItemTexts; - expectedItemTexts << QLatin1String("Before") << QLatin1String("Repeater Item #1") - << QLatin1String("Repeater Item #2") << QLatin1String("After"); - - for (int i = 0; i < expectedItemTexts.size(); ++i) { - const QString expectedText = expectedItemTexts.at(i); - QQuickMenuItem *menuItem = qobject_cast(menu->itemAt(i)); - QVERIFY(menuItem); - QCOMPARE(menuItem->text(), expectedText); - } -} - void tst_QQuickMenu::order() { QQuickApplicationHelper helper(this, QLatin1String("order.qml")); @@ -972,7 +934,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(!subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(mainMenu); // open the sub-menu with mouse click QQuickMenuItem *subMenu1Item = qobject_cast(mainMenu->itemAt(1)); @@ -983,7 +944,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(subMenu1); // open the cascading sub-sub-menu with mouse hover QQuickMenuItem *subSubMenu1Item = qobject_cast(subMenu1->itemAt(2)); @@ -994,7 +954,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - QVERIFY(subSubMenu1Item->isHovered()); if (cascade) QTRY_VERIFY(subSubMenu1->isVisible()); @@ -1014,7 +973,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - QVERIFY(subSubMenu1Item->isHovered()); if (cascade) QTRY_VERIFY(subSubMenu1->isVisible()); @@ -1241,7 +1199,6 @@ void tst_QQuickMenu::subMenuPosition() QVERIFY(!subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(mainMenu); // open the sub-menu (never flips) QQuickMenuItem *subMenu1Item = qobject_cast(mainMenu->itemAt(1)); @@ -1376,165 +1333,9 @@ void tst_QQuickMenu::scrollable() QVERIFY(menu->isVisible()); QQuickItem *contentItem = menu->contentItem(); - // Can only be scrollable if it exceeds the height of the window. - QTRY_VERIFY(contentItem->property("contentHeight").toReal() > window->height()); QCOMPARE(contentItem->property("interactive").toBool(), true); } -// QTBUG-67559 -// Test that Actions and MenuItems declared as children of a Menu have the -// correct delegate when it is declared outside of the Menu as a Component. -void tst_QQuickMenu::delegateFromSeparateComponent() -{ - QQuickApplicationHelper helper(this, QLatin1String("delegateFromSeparateComponent.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - const QColor green = QColor::fromRgb(0x00ff00); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - - // "Action Item 1" - QQuickMenuItem *actionItem1 = qobject_cast(menu->itemAt(0)); - QVERIFY(actionItem1); - QCOMPARE(actionItem1->text(), QLatin1String("Action Item 1")); - - QQuickItem *actionItem1Bg = actionItem1->property("background").value(); - QVERIFY(actionItem1Bg); - QCOMPARE(actionItem1Bg->property("color").value(), green); - - // "Sub-menu" - QQuickMenuItem *subMenuItem = qobject_cast(menu->itemAt(1)); - QVERIFY(subMenuItem); - QCOMPARE(subMenuItem->text(), QLatin1String("Sub-menu")); - - QQuickItem *subMenuItemBg = subMenuItem->property("background").value(); - QVERIFY(subMenuItemBg); - QCOMPARE(subMenuItemBg->property("color").value(), green); - - QQuickMenu *subMenu = subMenuItem->subMenu(); - QVERIFY(subMenu); - - // "Sub-menu Action Item 1" - QQuickMenuItem *subMenuActionItem1 = qobject_cast(subMenu->itemAt(0)); - QVERIFY(subMenuActionItem1); - QCOMPARE(subMenuActionItem1->text(), QLatin1String("Sub-menu Action Item 1")); - - QQuickItem *subMenuActionItem1Bg = subMenuActionItem1->property("background").value(); - QVERIFY(subMenuActionItem1Bg); - QCOMPARE(subMenuActionItem1Bg->property("color").value(), green); - - // "Sub-sub-menu" - QQuickMenuItem *subSubMenuItem = qobject_cast(subMenu->itemAt(1)); - QVERIFY(subSubMenuItem); - QCOMPARE(subSubMenuItem->text(), QLatin1String("Sub-sub-menu")); - - QQuickItem *subSubMenuItemBg = subSubMenuItem->property("background").value(); - QVERIFY(subSubMenuItemBg); - QCOMPARE(subSubMenuItemBg->property("color").value(), green); - - QQuickMenu *subSubMenu = subSubMenuItem->subMenu(); - QVERIFY(subSubMenu); - - // "Sub-sub-menu Action Item 1" - QQuickMenuItem *subSubMenuActionItem1 = qobject_cast(subSubMenu->itemAt(0)); - QVERIFY(subSubMenuActionItem1); - QCOMPARE(subSubMenuActionItem1->text(), QLatin1String("Sub-sub-menu Action Item 1")); - - QQuickItem *subSubMenuActionItem1Bg = subSubMenuActionItem1->property("background").value(); - QVERIFY(subSubMenuActionItem1Bg); - QCOMPARE(subSubMenuActionItem1Bg->property("color").value(), green); - - // "Sub-menu Action Item 2" - QQuickMenuItem *subMenuActionItem2 = qobject_cast(subMenu->itemAt(2)); - QVERIFY(subMenuActionItem2); - QCOMPARE(subMenuActionItem2->text(), QLatin1String("Sub-menu Action Item 2")); - - QQuickItem *subMenuActionItem2Bg = subMenuActionItem2->property("background").value(); - QVERIFY(subMenuActionItem2Bg); - QCOMPARE(subMenuActionItem2Bg->property("color").value(), green); - - // "Action Item 2" - QQuickMenuItem *actionItem2 = qobject_cast(menu->itemAt(2)); - QVERIFY(actionItem2); - QCOMPARE(actionItem2->text(), QLatin1String("Action Item 2")); - - QQuickItem *actionItem2Bg = actionItem2->property("background").value(); - QVERIFY(actionItem2Bg); - QCOMPARE(actionItem2Bg->property("color").value(), green); -} - -void tst_QQuickMenu::instantiator() -{ - if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) - QSKIP("This platform only allows tab focus for text controls"); - - QQuickApplicationHelper helper(this, QLatin1String("instantiator.qml")); - - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - QVERIFY(QGuiApplication::focusWindow() == window); - centerOnScreen(window); - moveMouseAway(window); - - QQuickMenu *menu = window->property("menu").value(); - menu->open(); - QVERIFY(menu->isVisible()); - waitForMenuListViewPolish(menu); - menu->setFocus(true); - - // Highlight the first item. - QQuickMenuItem *firstItem = qobject_cast(menu->itemAt(0)); - QVERIFY(firstItem); - QTest::keyClick(window, Qt::Key_Tab); - QVERIFY(firstItem->hasActiveFocus()); - QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); - QTRY_VERIFY(!QQuickItemPrivate::get(firstItem)->culled); - - // Highlight the second item. - QQuickMenuItem *secondItem = qobject_cast(menu->itemAt(1)); - QVERIFY(secondItem); - QTest::keyClick(window, Qt::Key_Down); - QVERIFY(secondItem->hasActiveFocus()); - QVERIFY(secondItem->hasVisualFocus()); - QVERIFY(secondItem->isHighlighted()); - QVERIFY(!QQuickItemPrivate::get(secondItem)->culled); -} - -void tst_QQuickMenu::instantiatorWithItemsBeforeAndAfter() -{ - QQuickApplicationHelper helper(this, QLatin1String("instantiatorWithItemsBeforeAndAfter.qml")); - - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - QVERIFY(QGuiApplication::focusWindow() == window); - centerOnScreen(window); - moveMouseAway(window); - - QQuickMenu *menu = window->property("menu").value(); - menu->open(); - QVERIFY(menu->isVisible()); - waitForMenuListViewPolish(menu); - - QStringList expectedItemTexts; - expectedItemTexts << QLatin1String("Before") << QLatin1String("Instantiated #1") - << QLatin1String("Instantiated #2") << QLatin1String("After"); - - for (int i = 0; i < expectedItemTexts.size(); ++i) { - const QString expectedText = expectedItemTexts.at(i); - QQuickMenuItem *menuItem = qobject_cast(menu->itemAt(i)); - QVERIFY(menuItem); - QCOMPARE(menuItem->text(), expectedText); - } -} - QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" diff --git a/tests/auto/qquickmenubar/qquickmenubar.pro b/tests/auto/qquickmenubar/qquickmenubar.pro index d2f28e47..b7d41f0f 100644 --- a/tests/auto/qquickmenubar/qquickmenubar.pro +++ b/tests/auto/qquickmenubar/qquickmenubar.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qquickmenubar -HEADERS += ../shared/menuutil.h SOURCES += tst_qquickmenubar.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp index 70d487a9..19d67eac 100644 --- a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp +++ b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp @@ -36,17 +36,13 @@ #include #include -#include -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" #include "../shared/qtest_quickcontrols.h" #include #include -#include #include -#include #include #include @@ -64,8 +60,6 @@ private slots: void keys(); void mnemonics(); void addRemove(); - void delegateFromSeparateComponent(); - void openTwice(); }; void tst_qquickmenubar::delegate() @@ -110,13 +104,6 @@ void tst_qquickmenubar::mouse() QQuickMenuBarItem *viewMenuBarItem = qobject_cast(viewMenuBarMenu->parentItem()); QQuickMenuBarItem *helpMenuBarItem = qobject_cast(helpMenuBarMenu->parentItem()); QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem); - // Something about postponing delegate creation to component completion - // means that the fileMenuBarItem->isHighlighted() check below fails occasionally. - // Give it a chance to sort itself out before sending move events. - QQuickMenuBarPrivate *menuBarPrivate = QQuickMenuBarPrivate::get(menuBar); - menuBar->polish(); - QVERIFY(menuBarPrivate->polishScheduled); - QTRY_VERIFY(!menuBarPrivate->polishScheduled); // highlight a menubar item QTest::mouseMove(window.data(), fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); @@ -159,7 +146,6 @@ void tst_qquickmenubar::mouse() QVERIFY(helpMenuBarMenu->isVisible()); QTRY_VERIFY(!editMenuBarMenu->isVisible()); QTRY_VERIFY(helpMenuBarMenu->isOpened()); - waitForMenuListViewPolish(helpMenuBarMenu); // trigger a menu item to close the menu QQuickMenuItem *aboutMenuItem = qobject_cast(helpMenuBarMenu->itemAt(0)); @@ -181,7 +167,6 @@ void tst_qquickmenubar::mouse() QVERIFY(viewMenuBarItem->isHighlighted()); QVERIFY(viewMenuBarMenu->isVisible()); QTRY_VERIFY(viewMenuBarMenu->isOpened()); - waitForMenuListViewPolish(viewMenuBarMenu); // trigger a menu item to open a sub-menu QQuickMenuItem *alignmentSubMenuItem = qobject_cast(viewMenuBarMenu->itemAt(0)); @@ -192,7 +177,6 @@ void tst_qquickmenubar::mouse() QVERIFY(viewMenuBarMenu->isVisible()); QVERIFY(alignmentSubMenu->isVisible()); QTRY_VERIFY(alignmentSubMenu->isOpened()); - waitForMenuListViewPolish(alignmentSubMenu); // trigger a menu item to open a sub-sub-menu QQuickMenuItem *verticalSubMenuItem = qobject_cast(alignmentSubMenu->itemAt(1)); @@ -204,7 +188,6 @@ void tst_qquickmenubar::mouse() QVERIFY(alignmentSubMenu->isVisible()); QVERIFY(verticalSubMenu->isVisible()); QTRY_VERIFY(verticalSubMenu->isOpened()); - waitForMenuListViewPolish(verticalSubMenu); // trigger a menu item to close the whole chain of menus QQuickMenuItem *centerMenuItem = qobject_cast(verticalSubMenu->itemAt(1)); @@ -581,90 +564,6 @@ void tst_qquickmenubar::addRemove() QVERIFY(menuBarItem1.isNull()); } -// QTBUG-67559 -// Test that Menus declared as children of a MenuBar have the -// correct delegate when it is declared outside of the MenuBar as a Component. -void tst_qquickmenubar::delegateFromSeparateComponent() -{ - QQuickApplicationHelper helper(this, QLatin1String("delegateFromSeparateComponent.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - const QColor green = QColor::fromRgb(0x00ff00); - - QQuickMenuBar *menuBar = window->property("menuBar").value(); - QVERIFY(menuBar); - - QQuickMenu *menu = qobject_cast(menuBar->menuAt(0)); - QVERIFY(menu); - - QQuickMenuBarItem *menuBarItem = qobject_cast(menu->parentItem()); - QVERIFY(menuBarItem); - - QQuickItem *menuBarItemBg = menuBarItem->property("background").value(); - QVERIFY(menuBarItemBg); - QCOMPARE(menuBarItemBg->property("color").value(), green); -} - -void tst_qquickmenubar::openTwice() -{ - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Mouse highlight not functional on offscreen/minimal platforms"); - - QQmlApplicationEngine engine(testFileUrl("menubar.qml")); - - QScopedPointer window(qobject_cast(engine.rootObjects().value(0))); - QVERIFY(window); - QVERIFY(QTest::qWaitForWindowActive(window.data())); - - centerOnScreen(window.data()); - - QQuickMenuBar *menuBar = window->property("header").value(); - QVERIFY(menuBar); - - QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0); - QVERIFY(fileMenuBarMenu); - - QQuickMenuBarItem *fileMenuBarItem = qobject_cast(fileMenuBarMenu->parentItem()); - QVERIFY(fileMenuBarItem); - QQuickMenuBarPrivate *menuBarPrivate = QQuickMenuBarPrivate::get(menuBar); - menuBar->polish(); - QVERIFY(menuBarPrivate->polishScheduled); - QTRY_VERIFY(!menuBarPrivate->polishScheduled); - - // Open a menu. - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, - fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); - QVERIFY(fileMenuBarItem->isHighlighted()); - QVERIFY(fileMenuBarMenu->isVisible()); - QTRY_VERIFY(fileMenuBarMenu->isOpened()); - waitForMenuListViewPolish(fileMenuBarMenu); - - // Click on an item to close the menu. - QQuickMenuItem *openMenuItem = qobject_cast(fileMenuBarMenu->itemAt(0)); - QVERIFY(openMenuItem); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, - openMenuItem->mapToScene(QPointF(openMenuItem->width() / 2, openMenuItem->height() / 2)).toPoint()); - QVERIFY(!fileMenuBarItem->isHighlighted()); - QTRY_VERIFY(!fileMenuBarMenu->isVisible()); - - // Re-open the menu. It should open with one click of the QQuickMenuBarItem. - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, - fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); - QVERIFY(fileMenuBarItem->isHighlighted()); - QVERIFY(fileMenuBarMenu->isVisible()); - QTRY_VERIFY(fileMenuBarMenu->isOpened()); - waitForMenuListViewPolish(fileMenuBarMenu); - - // Click on an item to close the menu. - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, - openMenuItem->mapToScene(QPointF(openMenuItem->width() / 2, openMenuItem->height() / 2)).toPoint()); - QVERIFY(!fileMenuBarItem->isHighlighted()); - QTRY_VERIFY(!fileMenuBarMenu->isVisible()); -} - QTEST_QUICKCONTROLS_MAIN(tst_qquickmenubar) #include "tst_qquickmenubar.moc" diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 6c860d6e..9230116b 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -36,7 +36,6 @@ #include #include -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" #include "../shared/qtest_quickcontrols.h" @@ -859,7 +858,6 @@ void tst_QQuickPopup::grabber() menu->open(); QTRY_COMPARE(menu->isOpened(), true); - waitForMenuListViewPolish(menu); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); @@ -882,7 +880,6 @@ void tst_QQuickPopup::grabber() menu->open(); QTRY_COMPARE(menu->isOpened(), true); - waitForMenuListViewPolish(menu); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); @@ -974,7 +971,6 @@ void tst_QQuickPopup::closeOnEscapeWithNestedPopups() QQuickPopup *optionsMenu = window->findChild("optionsMenu"); QVERIFY(optionsMenu); QTRY_VERIFY(optionsMenu->isVisible()); - waitForMenuListViewPolish(optionsMenu); QQuickItem *settingsMenuItem = window->findChild("settingsMenuItem"); QVERIFY(settingsMenuItem); diff --git a/tests/auto/shared/menuutil.h b/tests/auto/shared/menuutil.h deleted file mode 100644 index 067b7e55..00000000 --- a/tests/auto/shared/menuutil.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUTUTIL_H -#define QQUICKMENUTUTIL_H - -#include -#include - -/* - QQuickMenuPrivate::insertItem() culls newly added items to ensure - that they don't show up when they shouldn't, but now that QQuickMenu - postpones item creation until after component completion (QTBUG-67559), - the culled flag being set means that mouse events don't get delivered - to menu items (see the culled check in QQuickWindowPrivate::pointerTargets()). - - ListView unculls the items in FxViewItem::setVisible(), and waiting until - polishes are finished is a reliable way of ensuring that that happens - before we send mouse events. -*/ -#define waitForMenuListViewPolish(menu) \ -{ \ - const auto listView = qobject_cast((menu)->contentItem()); \ - Q_ASSERT(listView); \ - QTRY_COMPARE(QQuickItemPrivate::get(listView)->polishScheduled, false); \ -} - -#endif // QQUICKMENUTUTIL_H -- cgit v1.2.3 From 70199a43a978649d87c5b2815808c4a04902c6e0 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 16 Nov 2018 18:52:56 +0100 Subject: Fix for SpinBox crash in Qt Quick Designer The crash was not 100% reliable and depends on the order in the hash(). Something in beginDeferred() has a side effect on deferData->bindings and an element gets deleted. This causes a crash while iterating (++it). Therefore we do a copy of the hash. I added a regression test. The test did only crash for SpinBox and it did only crash roughly half the time. Task-number: QTBUG-71942 Change-Id: I339e0a4382f97db44f6ff2e9f07f2be7278d1e24 Reviewed-by: Mitch Curtis --- tests/auto/auto.pro | 1 + tests/auto/designer/designer.pro | 9 ++ tests/auto/designer/tst_designer.cpp | 161 +++++++++++++++++++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 tests/auto/designer/designer.pro create mode 100644 tests/auto/designer/tst_designer.cpp (limited to 'tests/auto') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d4e0c604..d528b848 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,6 +5,7 @@ SUBDIRS += \ controls \ cursor \ customization \ + designer \ focus \ font \ palette \ diff --git a/tests/auto/designer/designer.pro b/tests/auto/designer/designer.pro new file mode 100644 index 00000000..68fbc747 --- /dev/null +++ b/tests/auto/designer/designer.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = tst_designer + +QT += quick quick-private quickcontrols2 testlib +CONFIG += testcase +macos:CONFIG -= app_bundle + +SOURCES += \ + $$PWD/tst_designer.cpp diff --git a/tests/auto/designer/tst_designer.cpp b/tests/auto/designer/tst_designer.cpp new file mode 100644 index 00000000..2c67c2c6 --- /dev/null +++ b/tests/auto/designer/tst_designer.cpp @@ -0,0 +1,161 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include +#include +#include + +#include + +class tst_Designer : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + + void test_controls(); + void test_controls_data(); +}; + + +void tst_Designer::initTestCase() +{ +} + +void doComponentCompleteRecursive(QObject *object) +{ + if (object) { + QQuickItem *item = qobject_cast(object); + + if (item && DesignerSupport::isComponentComplete(item)) + return; + + DesignerSupport::emitComponentCompleteSignalForAttachedProperty(qobject_cast(object)); + + QList childList = object->children(); + + if (item) { + for (QQuickItem *childItem : item->childItems()) { + if (!childList.contains(childItem)) + childList.append(childItem); + } + } + + for (QObject *child : childList) + doComponentCompleteRecursive(child); + + if (item) { + static_cast(item)->componentComplete(); + } else { + QQmlParserStatus *qmlParserStatus = dynamic_cast< QQmlParserStatus*>(object); + if (qmlParserStatus) + qmlParserStatus->componentComplete(); + } + } +} + + +void tst_Designer::test_controls() +{ + QFETCH(QString, type); + + const QByteArray before("import QtQuick 2.10\n" + "import QtQuick.Controls 2.3\n" + "Item {\n"); + + QByteArray source = before; + source.append(type); + + const QByteArray after(" {" + "}\n" + "}\n"); + + source.append(after); + + QQmlEngine engine; + QQmlComponent component(&engine); + + { + ComponentCompleteDisabler disableComponentComplete; + component.setData(source, QUrl::fromLocalFile(QDir::current().absolutePath())); + } + + QObject *root = component.create(); + QVERIFY(root); + doComponentCompleteRecursive(root); +} + +void tst_Designer::test_controls_data() +{ + QTest::addColumn("type"); + + QTest::newRow("type") << "SpinBox"; + QTest::newRow("type") << "Switch"; + QTest::newRow("type") << "ComboBox"; + QTest::newRow("type") << "CheckBox"; + QTest::newRow("type") << "Button"; + QTest::newRow("type") << "DelayButton"; + QTest::newRow("type") << "Dial"; + QTest::newRow("type") << "Frame"; + QTest::newRow("type") << "GroupBox"; + QTest::newRow("type") << "Label"; + QTest::newRow("type") << "Page"; + QTest::newRow("type") << "Pane"; + QTest::newRow("type") << "ProgressBar"; + QTest::newRow("type") << "RadioButton"; + QTest::newRow("type") << "RangeSlider"; + QTest::newRow("type") << "RoundButton"; + QTest::newRow("type") << "ScrollView"; + QTest::newRow("type") << "Slider"; + QTest::newRow("type") << "StackView"; + QTest::newRow("type") << "SwipeView"; + QTest::newRow("type") << "Switch"; + QTest::newRow("type") << "TabBar"; + QTest::newRow("type") << "TabButton"; + QTest::newRow("type") << "TextArea"; + QTest::newRow("type") << "TextField"; + QTest::newRow("type") << "ToolBar"; + QTest::newRow("type") << "ToolButton"; + QTest::newRow("type") << "Tumbler"; +} + +QTEST_MAIN(tst_Designer) + +#include "tst_designer.moc" -- cgit v1.2.3 From 021c6064addd168017e0e9eff17639669e2f85d1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 12 Dec 2018 12:48:27 +0100 Subject: tst_QQuickStyle::availableStyles(): Ignore case when checking paths on Windows It is actually possible to get the test to fail in command line environments. Change-Id: I9e37e968bd259e3c7ad4acdb8bf289a64f199891 Reviewed-by: Mitch Curtis --- tests/auto/qquickstyle/tst_qquickstyle.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp index 8d09a293..f5207a96 100644 --- a/tests/auto/qquickstyle/tst_qquickstyle.cpp +++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp @@ -159,7 +159,11 @@ void tst_QQuickStyle::availableStyles() QQuickStyle::addStylePath(path); QStringList paths = QQuickStylePrivate::stylePaths(); +#ifndef Q_OS_WIN QVERIFY(paths.contains(path)); +#else + QVERIFY(paths.contains(path, Qt::CaseInsensitive)); +#endif const QStringList styles = QQuickStyle::availableStyles(); QVERIFY(!styles.isEmpty()); -- cgit v1.2.3 From b563bd583a50442b52e47f8c5f149aebafb385f2 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 14 Dec 2018 12:08:48 +0100 Subject: Fix TextField background not respecting control's width After 6858d4e9, the background of the Material style TextField does not respect the width of the control if the control is resized (e.g. due to being in a layout). - The first time resizeBackground() is called, !extra.isAllocated() returns true - that is, extra has not been allocated yet. - The if statement is executed and the background's width is set to the available width of the control (e.g. 120). - As a result of the background's width being set, its widthValid flag is set to true. This would previously be undone directly afterwards by setting widthValid flag to false. - In the case of the test case, the implicitWidth was already 120, so geometryChanged is not emitted. However, when the height of the background is set, this *does* cause itemGeometryChanged() to be called, which in turn does the following: extra.value().hasBackgroundWidth = p->widthValid; extra.value().hasBackgroundHeight = p->heightValid; resizeBackground(); So now all of the following checks evaluate to false: (!p->widthValid || !extra.isAllocated() || !extra->hasBackgroundWidth) This prevents the background from being resized. This patch fixes the issue by unsetting the widthValid (and heightValid) flags of the background directly after setting its width. To be safe, it also only unsets it if we were the ones to set it. By doing this, the check mentioned above succeeds because p->widthValid and extra->hasBackgroundWidth are both now false. It also adds some extra safety into itemGeometryChanged() that ensures that extra.value().hasBackgroundWidth is only set if necessary, and therefore prevents the extra data from unnecessarily being allocated. This is not necessary for the fix, but feels like the right thing to do. Change-Id: I051e281718bd8a2a20c100767d929fb71497ce1b Fixes: QTBUG-71875 Reviewed-by: Richard Moe Gustavsen --- tests/auto/controls/data/tst_textfield.qml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index ee2d1a54..2ee1db41 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -51,6 +51,7 @@ import QtQuick 2.12 import QtTest 1.0 import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 TestCase { id: testCase @@ -633,4 +634,30 @@ TestCase { compare(control.background.height, 100) } + Component { + id: layoutComponent + + ColumnLayout { + anchors.fill: parent + + property alias textField: textField + + TextField { + id: textField + placeholderText: "Placeholder" + Layout.fillWidth: true + } + } + } + + function test_inLayout() { + var layout = createTemporaryObject(layoutComponent, testCase) + verify(layout) + + var control = layout.textField + verify(control) + + compare(control.width, control.parent.width) + compare(control.background.width, control.width) + } } -- cgit v1.2.3 From d438e61fcd52c4a45fefc42edf6e8fe806b11de2 Mon Sep 17 00:00:00 2001 From: Massimo Callegari Date: Mon, 24 Dec 2018 10:57:14 +0100 Subject: Slider: fix wheel event propagation Don't propagate wheel events when reaching the limits. Sync the behavior with Qt widgets and SpinBox/ComboBox. Task-number: QTBUG-72750 Change-Id: Iefb8562c1d9632badc4a39bc4c301bd96b8a515b Reviewed-by: Mitch Curtis --- tests/auto/controls/data/tst_slider.qml | 57 +++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 2b3144a5..280138c5 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -772,6 +772,63 @@ TestCase { compare(control.position, 0.25) } + function test_wheelPropagation_data() { + return [ + { tag: "horizontal", orientation: Qt.Horizontal, dx: 120, dy: 0 }, + { tag: "vertical", orientation: Qt.Vertical, dx: 0, dy: 120 } + ] + } + + Component { + id: mouseAreaComponent + MouseArea {} + } + + function test_wheelPropagation(data) { + var mouseArea = createTemporaryObject(mouseAreaComponent, testCase, { width: parent.width, height: parent.height }) + verify(mouseArea) + + var mouseAreaWheelSpy = signalSpy.createObject(mouseArea, { target: mouseArea, signalName: "wheel" }) + verify(mouseAreaWheelSpy.valid) + + var control = createTemporaryObject(slider, mouseArea, + { wheelEnabled: true, orientation: data.orientation, stepSize: 1 }) + verify(control) + compare(control.value, 0.0) + + var movedCount = 0 + var movedSpy = signalSpy.createObject(control, { target: control, signalName: "moved" }) + verify(movedSpy.valid) + + // Scroll the handle to the edge. + mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy) + compare(control.value, 1.0) + compare(control.position, 1.0) + compare(movedSpy.count, ++movedCount) + compare(mouseAreaWheelSpy.count, 0) + + // Scroll again; the wheel event shouldn't go through to the MouseArea parent. + mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy) + compare(control.value, 1.0) + compare(control.position, 1.0) + compare(movedSpy.count, movedCount) + compare(mouseAreaWheelSpy.count, 0) + + // Scroll the handle to the other edge. + mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy) + compare(control.value, 0.0) + compare(control.position, 0.0) + compare(movedSpy.count, ++movedCount) + compare(mouseAreaWheelSpy.count, 0) + + // Scroll again; the wheel event shouldn't go through to the MouseArea parent. + mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy) + compare(control.value, 0.0) + compare(control.position, 0.0) + compare(movedSpy.count, movedCount) + compare(mouseAreaWheelSpy.count, 0) + } + function test_valueAt_data() { return [ { tag: "0.0..1.0", from: 0.0, to: 1.0, values: [0.0, 0.2, 0.5, 1.0] }, -- cgit v1.2.3 From 0ca69961a2bd544cd417d849018427ae0c8cda05 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 11 Dec 2018 11:21:52 +0100 Subject: Fix incorrect font size in certain styles on Windows When a style is loaded, QtQuickControls2Plugin::loadStylePlugins() is called. This function uses QPluginLoader to search the style directory for the style plugin. On Windows, the code was looking for the plugin without the debug "d" suffix, causing the style plugin to fail to load for debug builds. This results in the QQuickTheme subclasses not being created, causing controls to be shown with default font sizes. This patch fixes the issue by appending the "d" suffix on Windows. Change-Id: I706dbe39325a104bcd6ce72cb0a8d37025adb055 Fixes: QTBUG-71902 Reviewed-by: Friedemann Kleint Reviewed-by: Oliver Wolff Reviewed-by: Richard Moe Gustavsen --- tests/auto/qquickstyle/tst_qquickstyle.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp index f5207a96..3f55bcfb 100644 --- a/tests/auto/qquickstyle/tst_qquickstyle.cpp +++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include "../shared/util.h" @@ -102,6 +103,10 @@ void tst_QQuickStyle::lookup() loadControls(); + // The font size for editors in the (default) Normal variant is 16. + // If this is wrong, the style plugin may not have been loaded. + QCOMPARE(QQuickTheme::instance()->font(QQuickTheme::TextArea).pixelSize(), 16); + QCOMPARE(QQuickStyle::name(), QString("Material")); QVERIFY(!QQuickStyle::path().isEmpty()); } -- cgit v1.2.3 From 6476de0b669162cf08c11f5c8d5ad0b42419f365 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 10 Dec 2018 14:04:53 +0100 Subject: DialogButtonBox: fix issue where single button would go outside box c2fd8f7d made the following changes to the geometry calculation of QQuickDialogButtonBox's contentItem: @@ -244,11 +252,8 @@ void QQuickDialogButtonBoxPrivate::resizeContent() return; QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); - if (alignment != 0) { - qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentItem->property("contentWidth").toReal(); - qreal ch = (alignment & Qt::AlignVertical_Mask) == 0 ? q->availableHeight() : contentItem->property("contentHeight").toReal(); - geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(cw, ch), geometry); - } + if (alignment != 0) + geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(contentWidth, contentHeight), geometry); It turns out that this breaks the use case of a fixed width box (e.g. where a Dialog is assigned a width of 400 and the box assumes that width) with a single button. For example, in the case of the Default style, QQuickDialogButtonBox::contentWidth is 100 because Button's implicitWidth is 100. Since contentWidth is "used for calculating the total implicit width" of the box, it's not useful for positioning items which have an explicit width. The result is that QQuickDialogButtonBox thinks the contentItem is smaller than it really is, and therefore the ListView is positioned too far to the right. Only the Default and Universal styles are affected, as they are the only styles that resize the button to cover half of the button box. This patch fixes the issue by reverting the code above to its original state, where the content size of the contentItem is used instead of the contentWidth of the box. Change-Id: Idd2f94f3b4d3413fc2057c0ade2efdd66d701c08 Fixes: QTBUG-72372 Reviewed-by: Richard Moe Gustavsen --- tests/auto/controls/data/tst_dialogbuttonbox.qml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml index 43153c94..62789a47 100644 --- a/tests/auto/controls/data/tst_dialogbuttonbox.qml +++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml @@ -275,4 +275,21 @@ TestCase { compare(okButton.width + cancelButton.width, control.availableWidth - control.spacing) } + + function test_oneButtonInFixedWidthBox() { + var control = createTemporaryObject(buttonBox, testCase, + { width: 400, standardButtons: Dialog.Close }) + verify(control) + + var listView = control.contentItem + waitForRendering(listView) + + var button = control.itemAt(0) + verify(button) + + // The button should never go outside of the box. + var buttonPosInBox = button.mapToItem(control, 0, 0) + verify(buttonPosInBox.x >= 0) + verify(buttonPosInBox.x + button.width < control.width) + } } -- cgit v1.2.3