aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-10-23 15:23:58 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-02 16:45:04 +0000
commit3c7bfc156797b2f3ef08a8cf620b79da80e4b061 (patch)
tree8eb2cc945b9dab6792df6f8df59472440d998457
parent70fe6a67e8fdff5bc5486c4fe5c0e44242e10427 (diff)
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 <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter2-lists/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml6
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml6
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml6
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc4
-rw-r--r--examples/quickcontrols2/contactlist/ContactDelegate.ui.qml6
-rw-r--r--examples/quickcontrols2/contactlist/ContactDialog.qml4
-rw-r--r--examples/quickcontrols2/contactlist/ContactForm.ui.qml6
-rw-r--r--examples/quickcontrols2/contactlist/ContactView.ui.qml4
-rw-r--r--examples/quickcontrols2/contactlist/SectionDelegate.ui.qml4
-rw-r--r--examples/quickcontrols2/contactlist/contactlist.qml4
-rw-r--r--examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml2
-rw-r--r--examples/quickcontrols2/flatstyle/Flat/Button.qml4
-rw-r--r--examples/quickcontrols2/flatstyle/Flat/CheckBox.qml4
-rw-r--r--examples/quickcontrols2/flatstyle/Flat/Switch.qml4
-rw-r--r--examples/quickcontrols2/flatstyle/MainForm.ui.qml6
-rw-r--r--examples/quickcontrols2/flatstyle/flatstyle.qml4
-rw-r--r--examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml2
-rw-r--r--examples/quickcontrols2/gallery/gallery.qml10
-rw-r--r--examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ButtonPage.qml6
-rw-r--r--examples/quickcontrols2/gallery/pages/CheckBoxPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ComboBoxPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/DelayButtonPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/DelegatePage.qml6
-rw-r--r--examples/quickcontrols2/gallery/pages/DialPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/DialogPage.qml6
-rw-r--r--examples/quickcontrols2/gallery/pages/FramePage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/GroupBoxPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ProgressBarPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/RadioButtonPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/RangeSliderPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ScrollBarPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ScrollablePage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/SliderPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/SpinBoxPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/StackViewPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/SwipeViewPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/SwitchPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/TabBarPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/TextAreaPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/TextFieldPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/ToolTipPage.qml4
-rw-r--r--examples/quickcontrols2/gallery/pages/TumblerPage.qml4
-rw-r--r--examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml2
-rw-r--r--examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml6
-rw-r--r--examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml4
-rw-r--r--examples/quickcontrols2/imagine/automotive/qml/automotive.qml8
-rw-r--r--examples/quickcontrols2/imagine/musicplayer/musicplayer.qml6
-rw-r--r--examples/quickcontrols2/sidepanel/sidepanel.qml6
-rw-r--r--examples/quickcontrols2/swipetoremove/swipetoremove.qml6
-rw-r--r--examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml8
-rw-r--r--examples/quickcontrols2/texteditor/qml/texteditor.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/DemoMode.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/NaviButton.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/Slider.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/Switch.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/UIStyle.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/SwipeViewPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/wearable.qml2
-rw-r--r--src/imports/calendar/DayOfWeekRow.qml2
-rw-r--r--src/imports/calendar/MonthGrid.qml2
-rw-r--r--src/imports/calendar/WeekNumberColumn.qml2
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml4
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml4
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml2
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml4
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml2
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml4
-rw-r--r--src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml2
-rw-r--r--src/imports/controls/AbstractButton.qml2
-rw-r--r--src/imports/controls/Action.qml2
-rw-r--r--src/imports/controls/ActionGroup.qml2
-rw-r--r--src/imports/controls/ApplicationWindow.qml8
-rw-r--r--src/imports/controls/BusyIndicator.qml6
-rw-r--r--src/imports/controls/Button.qml6
-rw-r--r--src/imports/controls/ButtonGroup.qml2
-rw-r--r--src/imports/controls/CheckBox.qml6
-rw-r--r--src/imports/controls/CheckDelegate.qml6
-rw-r--r--src/imports/controls/ComboBox.qml8
-rw-r--r--src/imports/controls/Container.qml2
-rw-r--r--src/imports/controls/Control.qml2
-rw-r--r--src/imports/controls/DelayButton.qml6
-rw-r--r--src/imports/controls/Dial.qml6
-rw-r--r--src/imports/controls/Dialog.qml6
-rw-r--r--src/imports/controls/DialogButtonBox.qml2
-rw-r--r--src/imports/controls/Drawer.qml6
-rw-r--r--src/imports/controls/Frame.qml6
-rw-r--r--src/imports/controls/GroupBox.qml6
-rw-r--r--src/imports/controls/ItemDelegate.qml6
-rw-r--r--src/imports/controls/Label.qml6
-rw-r--r--src/imports/controls/Menu.qml6
-rw-r--r--src/imports/controls/MenuBar.qml6
-rw-r--r--src/imports/controls/MenuBarItem.qml6
-rw-r--r--src/imports/controls/MenuItem.qml6
-rw-r--r--src/imports/controls/MenuSeparator.qml6
-rw-r--r--src/imports/controls/Page.qml6
-rw-r--r--src/imports/controls/PageIndicator.qml6
-rw-r--r--src/imports/controls/Pane.qml6
-rw-r--r--src/imports/controls/Popup.qml6
-rw-r--r--src/imports/controls/ProgressBar.qml6
-rw-r--r--src/imports/controls/RadioButton.qml6
-rw-r--r--src/imports/controls/RadioDelegate.qml6
-rw-r--r--src/imports/controls/RangeSlider.qml6
-rw-r--r--src/imports/controls/RoundButton.qml6
-rw-r--r--src/imports/controls/ScrollBar.qml6
-rw-r--r--src/imports/controls/ScrollIndicator.qml6
-rw-r--r--src/imports/controls/ScrollView.qml6
-rw-r--r--src/imports/controls/Slider.qml6
-rw-r--r--src/imports/controls/SpinBox.qml6
-rw-r--r--src/imports/controls/StackView.qml4
-rw-r--r--src/imports/controls/SwipeDelegate.qml6
-rw-r--r--src/imports/controls/SwipeView.qml4
-rw-r--r--src/imports/controls/Switch.qml6
-rw-r--r--src/imports/controls/SwitchDelegate.qml6
-rw-r--r--src/imports/controls/TabBar.qml2
-rw-r--r--src/imports/controls/TabButton.qml6
-rw-r--r--src/imports/controls/TextArea.qml6
-rw-r--r--src/imports/controls/TextField.qml6
-rw-r--r--src/imports/controls/ToolBar.qml6
-rw-r--r--src/imports/controls/ToolButton.qml6
-rw-r--r--src/imports/controls/ToolSeparator.qml6
-rw-r--r--src/imports/controls/ToolTip.qml6
-rw-r--r--src/imports/controls/Tumbler.qml6
-rw-r--r--src/imports/controls/designer/AbstractButtonSection.qml4
-rw-r--r--src/imports/controls/designer/BusyIndicatorSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ButtonSection.qml4
-rw-r--r--src/imports/controls/designer/ButtonSpecifics.qml4
-rw-r--r--src/imports/controls/designer/CheckBoxSpecifics.qml4
-rw-r--r--src/imports/controls/designer/CheckDelegateSpecifics.qml4
-rw-r--r--src/imports/controls/designer/CheckSection.qml4
-rw-r--r--src/imports/controls/designer/ComboBoxSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ContainerSection.qml4
-rw-r--r--src/imports/controls/designer/ControlSection.qml4
-rw-r--r--src/imports/controls/designer/ControlSpecifics.qml4
-rw-r--r--src/imports/controls/designer/DelayButtonSpecifics.qml4
-rw-r--r--src/imports/controls/designer/DialSpecifics.qml4
-rw-r--r--src/imports/controls/designer/FrameSpecifics.qml4
-rw-r--r--src/imports/controls/designer/GroupBoxSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ItemDelegateSection.qml4
-rw-r--r--src/imports/controls/designer/ItemDelegateSpecifics.qml4
-rw-r--r--src/imports/controls/designer/LabelSpecifics.qml4
-rw-r--r--src/imports/controls/designer/PaddingSection.qml4
-rw-r--r--src/imports/controls/designer/PageIndicatorSpecifics.qml4
-rw-r--r--src/imports/controls/designer/PageSpecifics.qml4
-rw-r--r--src/imports/controls/designer/PaneSection.qml4
-rw-r--r--src/imports/controls/designer/PaneSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ProgressBarSpecifics.qml4
-rw-r--r--src/imports/controls/designer/RadioButtonSpecifics.qml4
-rw-r--r--src/imports/controls/designer/RadioDelegateSpecifics.qml4
-rw-r--r--src/imports/controls/designer/RangeSliderSpecifics.qml4
-rw-r--r--src/imports/controls/designer/RoundButtonSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ScrollViewSpecifics.qml4
-rw-r--r--src/imports/controls/designer/SliderSpecifics.qml4
-rw-r--r--src/imports/controls/designer/SpinBoxSpecifics.qml4
-rw-r--r--src/imports/controls/designer/StackViewSpecifics.qml4
-rw-r--r--src/imports/controls/designer/SwipeDelegateSpecifics.qml4
-rw-r--r--src/imports/controls/designer/SwipeViewSpecifics.qml4
-rw-r--r--src/imports/controls/designer/SwitchDelegateSpecifics.qml4
-rw-r--r--src/imports/controls/designer/SwitchSpecifics.qml4
-rw-r--r--src/imports/controls/designer/TabBarSpecifics.qml4
-rw-r--r--src/imports/controls/designer/TabButtonSpecifics.qml4
-rw-r--r--src/imports/controls/designer/TextAreaSpecifics.qml4
-rw-r--r--src/imports/controls/designer/TextFieldSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ToolBarSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ToolButtonSpecifics.qml4
-rw-r--r--src/imports/controls/designer/ToolSeparatorSpecifics.qml4
-rw-r--r--src/imports/controls/designer/TumblerSpecifics.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-action.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-label.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml8
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml8
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml2
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml8
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml6
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc46
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc22
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc6
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc8
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-index.qdoc9
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-material.qdoc8
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc8
-rw-r--r--src/imports/controls/fusion/ApplicationWindow.qml6
-rw-r--r--src/imports/controls/fusion/BusyIndicator.qml10
-rw-r--r--src/imports/controls/fusion/Button.qml10
-rw-r--r--src/imports/controls/fusion/ButtonPanel.qml8
-rw-r--r--src/imports/controls/fusion/CheckBox.qml10
-rw-r--r--src/imports/controls/fusion/CheckDelegate.qml10
-rw-r--r--src/imports/controls/fusion/CheckIndicator.qml8
-rw-r--r--src/imports/controls/fusion/ComboBox.qml12
-rw-r--r--src/imports/controls/fusion/DelayButton.qml10
-rw-r--r--src/imports/controls/fusion/Dial.qml10
-rw-r--r--src/imports/controls/fusion/Dialog.qml10
-rw-r--r--src/imports/controls/fusion/DialogButtonBox.qml10
-rw-r--r--src/imports/controls/fusion/Drawer.qml10
-rw-r--r--src/imports/controls/fusion/Frame.qml10
-rw-r--r--src/imports/controls/fusion/GroupBox.qml10
-rw-r--r--src/imports/controls/fusion/ItemDelegate.qml10
-rw-r--r--src/imports/controls/fusion/Label.qml10
-rw-r--r--src/imports/controls/fusion/Menu.qml10
-rw-r--r--src/imports/controls/fusion/MenuBar.qml10
-rw-r--r--src/imports/controls/fusion/MenuBarItem.qml10
-rw-r--r--src/imports/controls/fusion/MenuItem.qml10
-rw-r--r--src/imports/controls/fusion/MenuSeparator.qml10
-rw-r--r--src/imports/controls/fusion/Page.qml10
-rw-r--r--src/imports/controls/fusion/PageIndicator.qml10
-rw-r--r--src/imports/controls/fusion/Pane.qml10
-rw-r--r--src/imports/controls/fusion/Popup.qml10
-rw-r--r--src/imports/controls/fusion/ProgressBar.qml10
-rw-r--r--src/imports/controls/fusion/RadioButton.qml10
-rw-r--r--src/imports/controls/fusion/RadioDelegate.qml10
-rw-r--r--src/imports/controls/fusion/RadioIndicator.qml8
-rw-r--r--src/imports/controls/fusion/RangeSlider.qml10
-rw-r--r--src/imports/controls/fusion/RoundButton.qml10
-rw-r--r--src/imports/controls/fusion/ScrollBar.qml10
-rw-r--r--src/imports/controls/fusion/ScrollIndicator.qml10
-rw-r--r--src/imports/controls/fusion/Slider.qml10
-rw-r--r--src/imports/controls/fusion/SliderGroove.qml8
-rw-r--r--src/imports/controls/fusion/SliderHandle.qml8
-rw-r--r--src/imports/controls/fusion/SpinBox.qml10
-rw-r--r--src/imports/controls/fusion/SwipeDelegate.qml10
-rw-r--r--src/imports/controls/fusion/Switch.qml10
-rw-r--r--src/imports/controls/fusion/SwitchDelegate.qml10
-rw-r--r--src/imports/controls/fusion/SwitchIndicator.qml8
-rw-r--r--src/imports/controls/fusion/TabBar.qml10
-rw-r--r--src/imports/controls/fusion/TabButton.qml10
-rw-r--r--src/imports/controls/fusion/TextArea.qml10
-rw-r--r--src/imports/controls/fusion/TextField.qml10
-rw-r--r--src/imports/controls/fusion/ToolBar.qml10
-rw-r--r--src/imports/controls/fusion/ToolButton.qml10
-rw-r--r--src/imports/controls/fusion/ToolSeparator.qml10
-rw-r--r--src/imports/controls/fusion/ToolTip.qml10
-rw-r--r--src/imports/controls/fusion/Tumbler.qml10
-rw-r--r--src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp4
-rw-r--r--src/imports/controls/imagine/ApplicationWindow.qml6
-rw-r--r--src/imports/controls/imagine/BusyIndicator.qml6
-rw-r--r--src/imports/controls/imagine/Button.qml10
-rw-r--r--src/imports/controls/imagine/CheckBox.qml6
-rw-r--r--src/imports/controls/imagine/CheckDelegate.qml10
-rw-r--r--src/imports/controls/imagine/ComboBox.qml10
-rw-r--r--src/imports/controls/imagine/DelayButton.qml8
-rw-r--r--src/imports/controls/imagine/Dial.qml6
-rw-r--r--src/imports/controls/imagine/Dialog.qml8
-rw-r--r--src/imports/controls/imagine/DialogButtonBox.qml8
-rw-r--r--src/imports/controls/imagine/Drawer.qml6
-rw-r--r--src/imports/controls/imagine/Frame.qml6
-rw-r--r--src/imports/controls/imagine/GroupBox.qml8
-rw-r--r--src/imports/controls/imagine/ItemDelegate.qml10
-rw-r--r--src/imports/controls/imagine/Label.qml6
-rw-r--r--src/imports/controls/imagine/Menu.qml8
-rw-r--r--src/imports/controls/imagine/MenuItem.qml10
-rw-r--r--src/imports/controls/imagine/MenuSeparator.qml6
-rw-r--r--src/imports/controls/imagine/Page.qml6
-rw-r--r--src/imports/controls/imagine/PageIndicator.qml6
-rw-r--r--src/imports/controls/imagine/Pane.qml6
-rw-r--r--src/imports/controls/imagine/Popup.qml6
-rw-r--r--src/imports/controls/imagine/ProgressBar.qml8
-rw-r--r--src/imports/controls/imagine/RadioButton.qml6
-rw-r--r--src/imports/controls/imagine/RadioDelegate.qml10
-rw-r--r--src/imports/controls/imagine/RangeSlider.qml6
-rw-r--r--src/imports/controls/imagine/RoundButton.qml10
-rw-r--r--src/imports/controls/imagine/ScrollBar.qml6
-rw-r--r--src/imports/controls/imagine/ScrollIndicator.qml6
-rw-r--r--src/imports/controls/imagine/ScrollView.qml8
-rw-r--r--src/imports/controls/imagine/Slider.qml6
-rw-r--r--src/imports/controls/imagine/SpinBox.qml6
-rw-r--r--src/imports/controls/imagine/StackView.qml6
-rw-r--r--src/imports/controls/imagine/SwipeDelegate.qml10
-rw-r--r--src/imports/controls/imagine/SwipeView.qml6
-rw-r--r--src/imports/controls/imagine/Switch.qml6
-rw-r--r--src/imports/controls/imagine/SwitchDelegate.qml10
-rw-r--r--src/imports/controls/imagine/TabBar.qml6
-rw-r--r--src/imports/controls/imagine/TabButton.qml10
-rw-r--r--src/imports/controls/imagine/TextArea.qml10
-rw-r--r--src/imports/controls/imagine/TextField.qml10
-rw-r--r--src/imports/controls/imagine/ToolBar.qml6
-rw-r--r--src/imports/controls/imagine/ToolButton.qml10
-rw-r--r--src/imports/controls/imagine/ToolSeparator.qml6
-rw-r--r--src/imports/controls/imagine/ToolTip.qml6
-rw-r--r--src/imports/controls/imagine/Tumbler.qml10
-rw-r--r--src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp4
-rw-r--r--src/imports/controls/material/ApplicationWindow.qml6
-rw-r--r--src/imports/controls/material/BoxShadow.qml4
-rw-r--r--src/imports/controls/material/BusyIndicator.qml6
-rw-r--r--src/imports/controls/material/Button.qml10
-rw-r--r--src/imports/controls/material/CheckBox.qml6
-rw-r--r--src/imports/controls/material/CheckDelegate.qml10
-rw-r--r--src/imports/controls/material/CheckIndicator.qml4
-rw-r--r--src/imports/controls/material/ComboBox.qml12
-rw-r--r--src/imports/controls/material/CursorDelegate.qml2
-rw-r--r--src/imports/controls/material/DelayButton.qml10
-rw-r--r--src/imports/controls/material/Dial.qml6
-rw-r--r--src/imports/controls/material/Dialog.qml10
-rw-r--r--src/imports/controls/material/DialogButtonBox.qml10
-rw-r--r--src/imports/controls/material/Drawer.qml6
-rw-r--r--src/imports/controls/material/ElevationEffect.qml4
-rw-r--r--src/imports/controls/material/Frame.qml6
-rw-r--r--src/imports/controls/material/GroupBox.qml6
-rw-r--r--src/imports/controls/material/ItemDelegate.qml10
-rw-r--r--src/imports/controls/material/Label.qml4
-rw-r--r--src/imports/controls/material/Menu.qml8
-rw-r--r--src/imports/controls/material/MenuBar.qml10
-rw-r--r--src/imports/controls/material/MenuBarItem.qml10
-rw-r--r--src/imports/controls/material/MenuItem.qml10
-rw-r--r--src/imports/controls/material/MenuSeparator.qml4
-rw-r--r--src/imports/controls/material/Page.qml4
-rw-r--r--src/imports/controls/material/PageIndicator.qml4
-rw-r--r--src/imports/controls/material/Pane.qml6
-rw-r--r--src/imports/controls/material/Popup.qml6
-rw-r--r--src/imports/controls/material/ProgressBar.qml6
-rw-r--r--src/imports/controls/material/RadioButton.qml6
-rw-r--r--src/imports/controls/material/RadioDelegate.qml10
-rw-r--r--src/imports/controls/material/RadioIndicator.qml4
-rw-r--r--src/imports/controls/material/RangeSlider.qml6
-rw-r--r--src/imports/controls/material/RoundButton.qml10
-rw-r--r--src/imports/controls/material/ScrollBar.qml4
-rw-r--r--src/imports/controls/material/ScrollIndicator.qml4
-rw-r--r--src/imports/controls/material/Slider.qml6
-rw-r--r--src/imports/controls/material/SliderHandle.qml4
-rw-r--r--src/imports/controls/material/SpinBox.qml6
-rw-r--r--src/imports/controls/material/StackView.qml4
-rw-r--r--src/imports/controls/material/SwipeDelegate.qml10
-rw-r--r--src/imports/controls/material/SwipeView.qml4
-rw-r--r--src/imports/controls/material/Switch.qml6
-rw-r--r--src/imports/controls/material/SwitchDelegate.qml10
-rw-r--r--src/imports/controls/material/SwitchIndicator.qml4
-rw-r--r--src/imports/controls/material/TabBar.qml6
-rw-r--r--src/imports/controls/material/TabButton.qml10
-rw-r--r--src/imports/controls/material/TextArea.qml10
-rw-r--r--src/imports/controls/material/TextField.qml10
-rw-r--r--src/imports/controls/material/ToolBar.qml6
-rw-r--r--src/imports/controls/material/ToolButton.qml10
-rw-r--r--src/imports/controls/material/ToolSeparator.qml4
-rw-r--r--src/imports/controls/material/ToolTip.qml4
-rw-r--r--src/imports/controls/material/Tumbler.qml8
-rw-r--r--src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp4
-rw-r--r--src/imports/controls/qtquickcontrols2plugin.cpp16
-rw-r--r--src/imports/controls/universal/ApplicationWindow.qml8
-rw-r--r--src/imports/controls/universal/BusyIndicator.qml6
-rw-r--r--src/imports/controls/universal/Button.qml8
-rw-r--r--src/imports/controls/universal/CheckBox.qml6
-rw-r--r--src/imports/controls/universal/CheckDelegate.qml10
-rw-r--r--src/imports/controls/universal/CheckIndicator.qml8
-rw-r--r--src/imports/controls/universal/ComboBox.qml10
-rw-r--r--src/imports/controls/universal/DelayButton.qml4
-rw-r--r--src/imports/controls/universal/Dial.qml4
-rw-r--r--src/imports/controls/universal/Dialog.qml6
-rw-r--r--src/imports/controls/universal/DialogButtonBox.qml6
-rw-r--r--src/imports/controls/universal/Drawer.qml4
-rw-r--r--src/imports/controls/universal/Frame.qml4
-rw-r--r--src/imports/controls/universal/GroupBox.qml4
-rw-r--r--src/imports/controls/universal/ItemDelegate.qml8
-rw-r--r--src/imports/controls/universal/Label.qml4
-rw-r--r--src/imports/controls/universal/Menu.qml6
-rw-r--r--src/imports/controls/universal/MenuBar.qml8
-rw-r--r--src/imports/controls/universal/MenuBarItem.qml8
-rw-r--r--src/imports/controls/universal/MenuItem.qml8
-rw-r--r--src/imports/controls/universal/MenuSeparator.qml4
-rw-r--r--src/imports/controls/universal/Page.qml4
-rw-r--r--src/imports/controls/universal/PageIndicator.qml4
-rw-r--r--src/imports/controls/universal/Pane.qml4
-rw-r--r--src/imports/controls/universal/Popup.qml4
-rw-r--r--src/imports/controls/universal/ProgressBar.qml6
-rw-r--r--src/imports/controls/universal/RadioButton.qml6
-rw-r--r--src/imports/controls/universal/RadioDelegate.qml10
-rw-r--r--src/imports/controls/universal/RadioIndicator.qml2
-rw-r--r--src/imports/controls/universal/RangeSlider.qml4
-rw-r--r--src/imports/controls/universal/RoundButton.qml8
-rw-r--r--src/imports/controls/universal/ScrollBar.qml4
-rw-r--r--src/imports/controls/universal/ScrollIndicator.qml4
-rw-r--r--src/imports/controls/universal/Slider.qml4
-rw-r--r--src/imports/controls/universal/SpinBox.qml8
-rw-r--r--src/imports/controls/universal/StackView.qml4
-rw-r--r--src/imports/controls/universal/SwipeDelegate.qml8
-rw-r--r--src/imports/controls/universal/Switch.qml6
-rw-r--r--src/imports/controls/universal/SwitchDelegate.qml10
-rw-r--r--src/imports/controls/universal/SwitchIndicator.qml4
-rw-r--r--src/imports/controls/universal/TabBar.qml4
-rw-r--r--src/imports/controls/universal/TabButton.qml8
-rw-r--r--src/imports/controls/universal/TextArea.qml8
-rw-r--r--src/imports/controls/universal/TextField.qml8
-rw-r--r--src/imports/controls/universal/ToolBar.qml4
-rw-r--r--src/imports/controls/universal/ToolButton.qml8
-rw-r--r--src/imports/controls/universal/ToolSeparator.qml4
-rw-r--r--src/imports/controls/universal/ToolTip.qml4
-rw-r--r--src/imports/controls/universal/Tumbler.qml8
-rw-r--r--src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp4
-rw-r--r--src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc2
-rw-r--r--src/imports/templates/qtquicktemplates2plugin.cpp8
-rw-r--r--src/quicktemplates2/qquickapplicationwindow.cpp2
-rw-r--r--src/quicktemplates2/qquickdrawer.cpp18
-rw-r--r--src/quicktemplates2/qquickmenuseparator.cpp4
-rw-r--r--src/quicktemplates2/qquickpage.cpp2
-rw-r--r--src/quicktemplates2/qquickpopup.cpp2
-rw-r--r--tests/auto/accessibility/data/abstractbutton.qml4
-rw-r--r--tests/auto/accessibility/data/busyindicator.qml4
-rw-r--r--tests/auto/accessibility/data/button.qml4
-rw-r--r--tests/auto/accessibility/data/checkbox.qml4
-rw-r--r--tests/auto/accessibility/data/checkdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/combobox.qml4
-rw-r--r--tests/auto/accessibility/data/container.qml4
-rw-r--r--tests/auto/accessibility/data/control.qml4
-rw-r--r--tests/auto/accessibility/data/dayofweekrow-2.qml2
-rw-r--r--tests/auto/accessibility/data/dayofweekrow.qml2
-rw-r--r--tests/auto/accessibility/data/dial.qml4
-rw-r--r--tests/auto/accessibility/data/dialog.qml4
-rw-r--r--tests/auto/accessibility/data/drawer.qml4
-rw-r--r--tests/auto/accessibility/data/frame.qml4
-rw-r--r--tests/auto/accessibility/data/groupbox.qml4
-rw-r--r--tests/auto/accessibility/data/itemdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/label.qml4
-rw-r--r--tests/auto/accessibility/data/menu.qml4
-rw-r--r--tests/auto/accessibility/data/menuitem.qml4
-rw-r--r--tests/auto/accessibility/data/monthgrid-2.qml2
-rw-r--r--tests/auto/accessibility/data/monthgrid.qml2
-rw-r--r--tests/auto/accessibility/data/page.qml4
-rw-r--r--tests/auto/accessibility/data/pageindicator.qml4
-rw-r--r--tests/auto/accessibility/data/pane.qml4
-rw-r--r--tests/auto/accessibility/data/popup.qml4
-rw-r--r--tests/auto/accessibility/data/progressbar.qml4
-rw-r--r--tests/auto/accessibility/data/radiobutton.qml4
-rw-r--r--tests/auto/accessibility/data/radiodelegate.qml4
-rw-r--r--tests/auto/accessibility/data/rangeslider.qml4
-rw-r--r--tests/auto/accessibility/data/roundbutton.qml4
-rw-r--r--tests/auto/accessibility/data/scrollbar.qml4
-rw-r--r--tests/auto/accessibility/data/scrollindicator.qml4
-rw-r--r--tests/auto/accessibility/data/slider.qml4
-rw-r--r--tests/auto/accessibility/data/spinbox.qml4
-rw-r--r--tests/auto/accessibility/data/stackview.qml4
-rw-r--r--tests/auto/accessibility/data/swipedelegate.qml4
-rw-r--r--tests/auto/accessibility/data/swipeview.qml4
-rw-r--r--tests/auto/accessibility/data/switch.qml4
-rw-r--r--tests/auto/accessibility/data/switchdelegate.qml4
-rw-r--r--tests/auto/accessibility/data/tabbar.qml4
-rw-r--r--tests/auto/accessibility/data/tabbutton.qml4
-rw-r--r--tests/auto/accessibility/data/textarea.qml4
-rw-r--r--tests/auto/accessibility/data/textfield.qml4
-rw-r--r--tests/auto/accessibility/data/toolbar.qml4
-rw-r--r--tests/auto/accessibility/data/toolbutton.qml4
-rw-r--r--tests/auto/accessibility/data/tooltip.qml4
-rw-r--r--tests/auto/accessibility/data/tumbler.qml4
-rw-r--r--tests/auto/accessibility/data/weeknumbercolumn-2.qml2
-rw-r--r--tests/auto/accessibility/data/weeknumbercolumn.qml2
-rw-r--r--tests/auto/calendar/data/tst_calendarmodel.qml2
-rw-r--r--tests/auto/calendar/data/tst_dayofweekrow.qml2
-rw-r--r--tests/auto/calendar/data/tst_monthgrid.qml2
-rw-r--r--tests/auto/calendar/data/tst_weeknumbercolumn.qml2
-rw-r--r--tests/auto/controls/data/SignalSequenceSpy.qml2
-rw-r--r--tests/auto/controls/data/TestItem.qml2
-rw-r--r--tests/auto/controls/data/TumblerDatePicker.qml4
-rw-r--r--tests/auto/controls/data/TumblerListView.qml4
-rw-r--r--tests/auto/controls/data/TumblerPathView.qml4
-rw-r--r--tests/auto/controls/data/tst_abstractbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_action.qml6
-rw-r--r--tests/auto/controls/data/tst_actiongroup.qml4
-rw-r--r--tests/auto/controls/data/tst_busyindicator.qml4
-rw-r--r--tests/auto/controls/data/tst_button.qml4
-rw-r--r--tests/auto/controls/data/tst_buttongroup.qml4
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml4
-rw-r--r--tests/auto/controls/data/tst_checkdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_combobox.qml4
-rw-r--r--tests/auto/controls/data/tst_container.qml6
-rw-r--r--tests/auto/controls/data/tst_control.qml6
-rw-r--r--tests/auto/controls/data/tst_delaybutton.qml4
-rw-r--r--tests/auto/controls/data/tst_dial.qml4
-rw-r--r--tests/auto/controls/data/tst_dialog.qml6
-rw-r--r--tests/auto/controls/data/tst_dialogbuttonbox.qml4
-rw-r--r--tests/auto/controls/data/tst_frame.qml4
-rw-r--r--tests/auto/controls/data/tst_groupbox.qml4
-rw-r--r--tests/auto/controls/data/tst_itemdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_label.qml4
-rw-r--r--tests/auto/controls/data/tst_menuitem.qml4
-rw-r--r--tests/auto/controls/data/tst_page.qml4
-rw-r--r--tests/auto/controls/data/tst_pageindicator.qml4
-rw-r--r--tests/auto/controls/data/tst_pane.qml4
-rw-r--r--tests/auto/controls/data/tst_popup.qml4
-rw-r--r--tests/auto/controls/data/tst_progressbar.qml4
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml4
-rw-r--r--tests/auto/controls/data/tst_radiodelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_rangeslider.qml4
-rw-r--r--tests/auto/controls/data/tst_roundbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_scrollbar.qml4
-rw-r--r--tests/auto/controls/data/tst_scrollindicator.qml4
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml4
-rw-r--r--tests/auto/controls/data/tst_slider.qml4
-rw-r--r--tests/auto/controls/data/tst_spinbox.qml6
-rw-r--r--tests/auto/controls/data/tst_stackview.qml4
-rw-r--r--tests/auto/controls/data/tst_swipedelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_swipeview.qml4
-rw-r--r--tests/auto/controls/data/tst_switch.qml4
-rw-r--r--tests/auto/controls/data/tst_switchdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_tabbar.qml4
-rw-r--r--tests/auto/controls/data/tst_tabbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_textarea.qml4
-rw-r--r--tests/auto/controls/data/tst_textfield.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbar.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_toolseparator.qml4
-rw-r--r--tests/auto/controls/data/tst_tooltip.qml4
-rw-r--r--tests/auto/controls/data/tst_tumbler.qml4
-rw-r--r--tests/auto/controls/default/dependencies.qml4
-rw-r--r--tests/auto/controls/fusion/dependencies.qml6
-rw-r--r--tests/auto/controls/imagine/dependencies.qml6
-rw-r--r--tests/auto/controls/material/dependencies.qml6
-rw-r--r--tests/auto/controls/universal/dependencies.qml6
-rw-r--r--tests/auto/cursor/data/buttons.qml4
-rw-r--r--tests/auto/cursor/data/containers.qml4
-rw-r--r--tests/auto/cursor/data/editable.qml4
-rw-r--r--tests/auto/cursor/data/pageindicator.qml4
-rw-r--r--tests/auto/cursor/data/scrollbar.qml4
-rw-r--r--tests/auto/cursor/data/sliders.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/empty/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ComboBox.qml6
-rw-r--r--tests/auto/customization/data/styles/identified/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/identified/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/incomplete/Tumbler.qml4
-rw-r--r--tests/auto/customization/data/styles/override/AbstractButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ApplicationWindow.qml2
-rw-r--r--tests/auto/customization/data/styles/override/BusyIndicator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Button.qml2
-rw-r--r--tests/auto/customization/data/styles/override/CheckBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/CheckDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/override/Container.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Control.qml2
-rw-r--r--tests/auto/customization/data/styles/override/DelayButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Dial.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Dialog.qml2
-rw-r--r--tests/auto/customization/data/styles/override/DialogButtonBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Drawer.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Frame.qml2
-rw-r--r--tests/auto/customization/data/styles/override/GroupBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ItemDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Label.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Menu.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuBarItem.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuItem.qml2
-rw-r--r--tests/auto/customization/data/styles/override/MenuSeparator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Page.qml2
-rw-r--r--tests/auto/customization/data/styles/override/PageIndicator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Pane.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Popup.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ProgressBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RadioButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RadioDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RangeSlider.qml2
-rw-r--r--tests/auto/customization/data/styles/override/RoundButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ScrollBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ScrollIndicator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ScrollView.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Slider.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SpinBox.qml2
-rw-r--r--tests/auto/customization/data/styles/override/StackView.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SwipeDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SwipeView.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Switch.qml2
-rw-r--r--tests/auto/customization/data/styles/override/SwitchDelegate.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TabBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TabButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TextArea.qml2
-rw-r--r--tests/auto/customization/data/styles/override/TextField.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolBar.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolButton.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolSeparator.qml2
-rw-r--r--tests/auto/customization/data/styles/override/ToolTip.qml2
-rw-r--r--tests/auto/customization/data/styles/override/Tumbler.qml2
-rw-r--r--tests/auto/customization/data/styles/simple/AbstractButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ApplicationWindow.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/BusyIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Button.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/CheckBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/CheckDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ComboBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Container.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Control.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/DelayButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Dial.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Dialog.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/DialogButtonBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Drawer.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Frame.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/GroupBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ItemDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Label.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Menu.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuBarItem.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuItem.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/MenuSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Page.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/PageIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Pane.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Popup.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ProgressBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RadioButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RadioDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RangeSlider.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/RoundButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ScrollBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ScrollIndicator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ScrollView.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Slider.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SpinBox.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/StackView.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SwipeDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SwipeView.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Switch.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/SwitchDelegate.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TabBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TabButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TextArea.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/TextField.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolBar.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolButton.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolSeparator.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/ToolTip.qml4
-rw-r--r--tests/auto/customization/data/styles/simple/Tumbler.qml4
-rw-r--r--tests/auto/focus/data/activeFocusOnTab.qml4
-rw-r--r--tests/auto/focus/data/keyNavigation.qml4
-rw-r--r--tests/auto/focus/data/visualFocus.qml4
-rw-r--r--tests/auto/font/data/font-appwindow-custom.qml4
-rw-r--r--tests/auto/font/data/font-appwindow-default.qml4
-rw-r--r--tests/auto/font/data/font-control-custom.qml4
-rw-r--r--tests/auto/font/data/font-control-default.qml4
-rw-r--r--tests/auto/font/data/font-popup-custom.qml4
-rw-r--r--tests/auto/font/data/font-popup-default.qml4
-rw-r--r--tests/auto/font/data/inheritance-childcontrol.qml4
-rw-r--r--tests/auto/font/data/inheritance-childpopup.qml4
-rw-r--r--tests/auto/font/data/inheritance-control.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamicchildcontrol.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamicchildpopup.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamiccontrol.qml4
-rw-r--r--tests/auto/font/data/inheritance-dynamicpopup.qml4
-rw-r--r--tests/auto/font/data/inheritance-popup.qml4
-rw-r--r--tests/auto/font/data/listview.qml4
-rw-r--r--tests/auto/palette/data/inheritance-childcontrol.qml4
-rw-r--r--tests/auto/palette/data/inheritance-childpopup.qml4
-rw-r--r--tests/auto/palette/data/inheritance-control.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamicchildcontrol.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamicchildpopup.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamiccontrol.qml4
-rw-r--r--tests/auto/palette/data/inheritance-dynamicpopup.qml4
-rw-r--r--tests/auto/palette/data/inheritance-popup.qml4
-rw-r--r--tests/auto/palette/data/listview.qml4
-rw-r--r--tests/auto/palette/data/palette-appwindow-custom.qml4
-rw-r--r--tests/auto/palette/data/palette-appwindow-default.qml4
-rw-r--r--tests/auto/palette/data/palette-control-custom.qml4
-rw-r--r--tests/auto/palette/data/palette-control-default.qml4
-rw-r--r--tests/auto/palette/data/palette-popup-custom.qml4
-rw-r--r--tests/auto/palette/data/palette-popup-default.qml4
-rw-r--r--tests/auto/platform/data/tst_colordialog.qml2
-rw-r--r--tests/auto/platform/data/tst_filedialog.qml2
-rw-r--r--tests/auto/platform/data/tst_folderdialog.qml2
-rw-r--r--tests/auto/platform/data/tst_fontdialog.qml2
-rw-r--r--tests/auto/platform/data/tst_menu.qml2
-rw-r--r--tests/auto/platform/data/tst_menubar.qml2
-rw-r--r--tests/auto/platform/data/tst_menuitem.qml2
-rw-r--r--tests/auto/platform/data/tst_menuitemgroup.qml2
-rw-r--r--tests/auto/platform/data/tst_menuseparator.qml2
-rw-r--r--tests/auto/platform/data/tst_messagedialog.qml2
-rw-r--r--tests/auto/platform/data/tst_standardpaths.qml2
-rw-r--r--tests/auto/platform/data/tst_systemtrayicon.qml2
-rw-r--r--tests/auto/pressandhold/data/dependencies.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/activeFocusControl.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/activefocusontab.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/attachedProperties.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml8
-rw-r--r--tests/auto/qquickapplicationwindow/data/defaultFocus.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/fill.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/font.qml6
-rw-r--r--tests/auto/qquickapplicationwindow/data/layout.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/locale.qml6
-rw-r--r--tests/auto/qquickcolor/data/tst_color.qml6
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-button.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-wheel.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickdrawer/data/dragOverModalShadow.qml4
-rw-r--r--tests/auto/qquickdrawer/data/flickable.qml4
-rw-r--r--tests/auto/qquickdrawer/data/grabber.qml4
-rw-r--r--tests/auto/qquickdrawer/data/header.qml4
-rw-r--r--tests/auto/qquickdrawer/data/multiTouch.qml4
-rw-r--r--tests/auto/qquickdrawer/data/multiple.qml4
-rw-r--r--tests/auto/qquickdrawer/data/reposition.qml4
-rw-r--r--tests/auto/qquickdrawer/data/slider.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-button.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-hover.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-wheel.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window.qml4
-rw-r--r--tests/auto/qquickiconimage/data/alignment.qml6
-rw-r--r--tests/auto/qquickiconimage/data/color.qml6
-rw-r--r--tests/auto/qquickiconimage/data/fileSelectors.qml6
-rw-r--r--tests/auto/qquickiconimage/data/imageProvider.qml8
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml6
-rw-r--r--tests/auto/qquickiconimage/data/root.qml2
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml6
-rw-r--r--tests/auto/qquickiconimage/data/svgNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/translucentColors.qml6
-rw-r--r--tests/auto/qquickiconlabel/data/colorChanges.qml6
-rw-r--r--tests/auto/qquickiconlabel/data/iconlabel.qml6
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml6
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml6
-rw-r--r--tests/auto/qquickimaginestyle/data/tst_imagine.qml8
-rw-r--r--tests/auto/qquickmaterialstyle/data/tst_material.qml8
-rw-r--r--tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml6
-rw-r--r--tests/auto/qquickmenu/data/actions.qml4
-rw-r--r--tests/auto/qquickmenu/data/addItem.qml4
-rw-r--r--tests/auto/qquickmenu/data/applicationWindowScrollable.qml4
-rw-r--r--tests/auto/qquickmenu/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml4
-rw-r--r--tests/auto/qquickmenu/data/menuSeparator.qml4
-rw-r--r--tests/auto/qquickmenu/data/mnemonics.qml4
-rw-r--r--tests/auto/qquickmenu/data/order.qml4
-rw-r--r--tests/auto/qquickmenu/data/popup.qml4
-rw-r--r--tests/auto/qquickmenu/data/pressAndHold.qml4
-rw-r--r--tests/auto/qquickmenu/data/removeTakeItem.qml4
-rw-r--r--tests/auto/qquickmenu/data/repeater.qml4
-rw-r--r--tests/auto/qquickmenu/data/subMenus.qml4
-rw-r--r--tests/auto/qquickmenu/data/windowScrollable.qml4
-rw-r--r--tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml4
-rw-r--r--tests/auto/qquickmenubar/data/empty.qml4
-rw-r--r--tests/auto/qquickmenubar/data/menubar.qml4
-rw-r--r--tests/auto/qquickninepatchimage/data/ninepatchimage.qml8
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose1.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose2.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose3.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-wheel.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/cursor.qml4
-rw-r--r--tests/auto/qquickpopup/data/grabber.qml4
-rw-r--r--tests/auto/qquickpopup/data/nested.qml4
-rw-r--r--tests/auto/qquickpopup/data/orientation.qml4
-rw-r--r--tests/auto/qquickpopup/data/window-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/window-wheel.qml4
-rw-r--r--tests/auto/qquickpopup/data/window.qml4
-rw-r--r--tests/auto/qquickstyle/data/dependencies.qml4
-rw-r--r--tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml2
-rw-r--r--tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/ResourceStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/Control.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/Label.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml2
-rw-r--r--tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml2
-rw-r--r--tests/auto/qquickuniversalstyle/data/tst_universal.qml6
-rw-r--r--tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml6
-rw-r--r--tests/auto/revisions/data/dependencies.qml8
-rw-r--r--tests/auto/sanity/data/dependencies.qml4
-rw-r--r--tests/auto/snippets/data/dependencies.qml10
-rw-r--r--tests/benchmarks/creationtime/data/dependencies.qml12
-rw-r--r--tests/benchmarks/objectcount/data/dependencies.qml12
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_button.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_checkbox.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_combobox.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_container.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_control.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_dial.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_dialog.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_drawer.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_frame.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_groupbox.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_label.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_menu.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_menuitem.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_page.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_pane.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_popup.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_progressbar.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_scrollview.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_slider.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_spinbox.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_stackview.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_swipeview.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_switch.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tabbar.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_textarea.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_textfield.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tooltip.qml4
-rw-r--r--tests/benchmarks/qmlbench/creation/delegates_tumbler.qml4
-rw-r--r--tests/manual/buttons/ButtonLoader.qml4
-rw-r--r--tests/manual/buttons/buttons.qml8
-rw-r--r--tests/manual/fonts/main.qml8
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-button-flat.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-button.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkbox.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-combobox.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-drawer.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-menu.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-progressbar.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml6
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-slider.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-swipeview.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-switch.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-tabbar.qml4
-rw-r--r--tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml4
-rw-r--r--tests/manual/screenshots/screenshots.qml6
-rw-r--r--tests/manual/shared/FontAwesome.qml2
-rw-r--r--tests/manual/shared/FontAwesomeIcon.qml2
-rw-r--r--tests/manual/styles-cover-flow/CoverFlowDelegate.qml4
-rw-r--r--tests/manual/styles-cover-flow/CoverFlowPath.qml2
-rw-r--r--tests/manual/styles-cover-flow/styles-cover-flow.qml4
-rw-r--r--tests/manual/styles/styles.qml6
-rw-r--r--tests/manual/systemtrayicon/systemtrayicon.qml4
-rw-r--r--tests/manual/testbench/ColorEditor.qml6
-rw-r--r--tests/manual/testbench/ControlContainer.qml2
-rw-r--r--tests/manual/testbench/ExampleContainer.qml6
-rw-r--r--tests/manual/testbench/SettingsDialog.qml8
-rw-r--r--tests/manual/testbench/controls/BusyIndicator.qml4
-rw-r--r--tests/manual/testbench/controls/Button.qml4
-rw-r--r--tests/manual/testbench/controls/CheckBox.qml4
-rw-r--r--tests/manual/testbench/controls/CheckDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/ComboBox.qml4
-rw-r--r--tests/manual/testbench/controls/DelayButton.qml4
-rw-r--r--tests/manual/testbench/controls/Dial.qml4
-rw-r--r--tests/manual/testbench/controls/Dialog.qml6
-rw-r--r--tests/manual/testbench/controls/Frame.qml4
-rw-r--r--tests/manual/testbench/controls/GroupBox.qml4
-rw-r--r--tests/manual/testbench/controls/ItemDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/Label.qml4
-rw-r--r--tests/manual/testbench/controls/Menu.qml6
-rw-r--r--tests/manual/testbench/controls/MenuBar.qml4
-rw-r--r--tests/manual/testbench/controls/Page.qml4
-rw-r--r--tests/manual/testbench/controls/PageIndicator.qml6
-rw-r--r--tests/manual/testbench/controls/Pane.qml4
-rw-r--r--tests/manual/testbench/controls/ProgressBar.qml4
-rw-r--r--tests/manual/testbench/controls/RadioButton.qml4
-rw-r--r--tests/manual/testbench/controls/RadioDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/RangeSlider.qml4
-rw-r--r--tests/manual/testbench/controls/RoundButton.qml4
-rw-r--r--tests/manual/testbench/controls/ScrollBar.qml4
-rw-r--r--tests/manual/testbench/controls/ScrollIndicator.qml4
-rw-r--r--tests/manual/testbench/controls/Slider.qml4
-rw-r--r--tests/manual/testbench/controls/SpinBox.qml4
-rw-r--r--tests/manual/testbench/controls/SwipeDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/Switch.qml4
-rw-r--r--tests/manual/testbench/controls/SwitchDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/TabBar.qml4
-rw-r--r--tests/manual/testbench/controls/TextArea.qml4
-rw-r--r--tests/manual/testbench/controls/TextField.qml4
-rw-r--r--tests/manual/testbench/controls/ToolBar.qml6
-rw-r--r--tests/manual/testbench/controls/ToolTip.qml6
-rw-r--r--tests/manual/testbench/controls/Tumbler.qml6
-rw-r--r--tests/manual/testbench/testbench.qml10
-rw-r--r--tests/manual/viewinqwidget/main.qml4
1178 files changed, 2806 insertions, 2787 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
index 53bf6620..29e5c300 100644
--- a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.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: 540
diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
index 150fd004..8308f5c0 100644
--- a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.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: 540
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
index 200fa0ae..826aee42 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
index 61436057..90a846ac 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
index 71ec250c..3c0d1a23 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
index 1051b189..61819491 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import io.qt.examples.chattutorial 1.0
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
index bcae4b99..6684c233 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
import io.qt.examples.chattutorial 1.0
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
index 71ec250c..3c0d1a23 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
index 70cf97d9..1252706b 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick.Controls 2.1
-import QtQuick.Controls.Material 2.1
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
ToolBar {
Material.theme: Material.Dark
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
index ddbc6a1b..32e6217c 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
ToolBar {
}
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
index ad37ba5f..f26712f8 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import io.qt.examples.chattutorial 1.0
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
index 2ec6a55e..790f9ee9 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
import io.qt.examples.chattutorial 1.0
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
index 71ec250c..3c0d1a23 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index aea27d94..a26ce20b 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -97,7 +97,7 @@ Let's modify the default QML code to suit our needs.
\quotefromfile chattutorial/chapter1-settingup/main.qml
\skipto import
-\printuntil import QtQuick.Controls 2.1
+\printuntil import QtQuick.Controls 2.12
First, import the \l {Qt Quick} module. This gives us
access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so
@@ -767,7 +767,7 @@ their text color to something lighter. The simplest way of doing so is to
import the Material style directly and use the Material attached property:
\code
- import QtQuick.Controls.Material 2.1
+ import QtQuick.Controls.Material 2.12
// ...
diff --git a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
index c3047dcb..36803599 100644
--- a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
+++ b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
ItemDelegate {
id: delegate
diff --git a/examples/quickcontrols2/contactlist/ContactDialog.qml b/examples/quickcontrols2/contactlist/ContactDialog.qml
index 3fa0af40..7569f356 100644
--- a/examples/quickcontrols2/contactlist/ContactDialog.qml
+++ b/examples/quickcontrols2/contactlist/ContactDialog.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Dialog {
id: dialog
diff --git a/examples/quickcontrols2/contactlist/ContactForm.ui.qml b/examples/quickcontrols2/contactlist/ContactForm.ui.qml
index 831d3fcd..5988735a 100644
--- a/examples/quickcontrols2/contactlist/ContactForm.ui.qml
+++ b/examples/quickcontrols2/contactlist/ContactForm.ui.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
GridLayout {
id: grid
diff --git a/examples/quickcontrols2/contactlist/ContactView.ui.qml b/examples/quickcontrols2/contactlist/ContactView.ui.qml
index ef47f551..747f3042 100644
--- a/examples/quickcontrols2/contactlist/ContactView.ui.qml
+++ b/examples/quickcontrols2/contactlist/ContactView.ui.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import Backend 1.0
ListView {
diff --git a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml
index 884daf03..e7d7c2aa 100644
--- a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml
+++ b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ToolBar {
id: background
diff --git a/examples/quickcontrols2/contactlist/contactlist.qml b/examples/quickcontrols2/contactlist/contactlist.qml
index edddfc02..f79c609b 100644
--- a/examples/quickcontrols2/contactlist/contactlist.qml
+++ b/examples/quickcontrols2/contactlist/contactlist.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml
index c25789fa..12c1d416 100644
--- a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml
+++ b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
ListModel {
ListElement {
diff --git a/examples/quickcontrols2/flatstyle/Flat/Button.qml b/examples/quickcontrols2/flatstyle/Flat/Button.qml
index c56a9c6a..0420ddb4 100644
--- a/examples/quickcontrols2/flatstyle/Flat/Button.qml
+++ b/examples/quickcontrols2/flatstyle/Flat/Button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.12
+import QtQuick.Templates 2.12 as T
import Theme 1.0
T.Button {
diff --git a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml
index 332d63b8..ae819afa 100644
--- a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml
+++ b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.12
+import QtQuick.Templates 2.12 as T
import Theme 1.0
T.CheckBox {
diff --git a/examples/quickcontrols2/flatstyle/Flat/Switch.qml b/examples/quickcontrols2/flatstyle/Flat/Switch.qml
index 00b38767..3eea062f 100644
--- a/examples/quickcontrols2/flatstyle/Flat/Switch.qml
+++ b/examples/quickcontrols2/flatstyle/Flat/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.12
+import QtQuick.Templates 2.12 as T
import Theme 1.0
T.Switch {
diff --git a/examples/quickcontrols2/flatstyle/MainForm.ui.qml b/examples/quickcontrols2/flatstyle/MainForm.ui.qml
index 06b87d5e..e25158a3 100644
--- a/examples/quickcontrols2/flatstyle/MainForm.ui.qml
+++ b/examples/quickcontrols2/flatstyle/MainForm.ui.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
import Theme 1.0
Item {
diff --git a/examples/quickcontrols2/flatstyle/flatstyle.qml b/examples/quickcontrols2/flatstyle/flatstyle.qml
index f3e35876..44a29cda 100644
--- a/examples/quickcontrols2/flatstyle/flatstyle.qml
+++ b/examples/quickcontrols2/flatstyle/flatstyle.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import Qt.labs.platform 1.0
import Theme 1.0
diff --git a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml
index 003e743b..9018ece5 100644
--- a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml
+++ b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml
@@ -50,7 +50,7 @@
pragma Singleton
-import QtQuick 2.8
+import QtQuick 2.12
QtObject {
readonly property color gray: "#b2b1b1"
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index 5344b74e..e9f0b432 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -48,11 +48,11 @@
**
****************************************************************************/
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
-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.settings 1.0
ApplicationWindow {
diff --git a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
index 3fbae0ce..b0aa6284 100644
--- a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/ButtonPage.qml b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
index 7ebceb49..c77b41e4 100644
--- a/examples/quickcontrols2/gallery/pages/ButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
index a8a16928..7795f814 100644
--- a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
index bc89e998..ec75607c 100644
--- a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
index 974dcab1..91110567 100644
--- a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
index bf07e1b5..30f07be1 100644
--- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
Pane {
padding: 0
diff --git a/examples/quickcontrols2/gallery/pages/DialPage.qml b/examples/quickcontrols2/gallery/pages/DialPage.qml
index a8fa9764..3bb3bb28 100644
--- a/examples/quickcontrols2/gallery/pages/DialPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DialPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/DialogPage.qml b/examples/quickcontrols2/gallery/pages/DialogPage.qml
index 8bade21f..9d23e260 100644
--- a/examples/quickcontrols2/gallery/pages/DialogPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DialogPage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml
index a1d7d7f7..4834d04d 100644
--- a/examples/quickcontrols2/gallery/pages/FramePage.qml
+++ b/examples/quickcontrols2/gallery/pages/FramePage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
index bb332a8b..16f8762a 100644
--- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
index ed35c07e..4f13ce33 100644
--- a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
index 36bba90c..1f3c81b9 100644
--- a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
index 451caf58..b573731e 100644
--- a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
index 9e8d9a95..b6c35766 100644
--- a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
index aaa1d8ea..d9e77fa4 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Flickable {
id: flickable
diff --git a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
index 89b8bc1a..2adcbc6b 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Flickable {
id: flickable
diff --git a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
index 90bd0145..afb5ef5c 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Page {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/SliderPage.qml b/examples/quickcontrols2/gallery/pages/SliderPage.qml
index 9d941d01..93a1ebb1 100644
--- a/examples/quickcontrols2/gallery/pages/SliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SliderPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
index b063a37d..9e458331 100644
--- a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/StackViewPage.qml b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
index 45884a70..43ee5684 100644
--- a/examples/quickcontrols2/gallery/pages/StackViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
StackView {
id: stackView
diff --git a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
index d09ac501..3c3bc56c 100644
--- a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Pane {
id: pane
diff --git a/examples/quickcontrols2/gallery/pages/SwitchPage.qml b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
index d894ed56..53ee1660 100644
--- a/examples/quickcontrols2/gallery/pages/SwitchPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/TabBarPage.qml b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
index 16200fc2..7f5cbce5 100644
--- a/examples/quickcontrols2/gallery/pages/TabBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Page {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
index d83096d5..7ed2b58b 100644
--- a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
index 959d9681..37a5d605 100644
--- a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
index bc2aa81a..295ea2c4 100644
--- a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/gallery/pages/TumblerPage.qml b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
index bc0aa24e..af4caee3 100644
--- a/examples/quickcontrols2/gallery/pages/TumblerPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollablePage {
id: page
diff --git a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml
index dfd66ada..483059ae 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml
+++ b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtGraphicalEffects 1.0
+import QtGraphicalEffects 1.12
Glow {
color: glowColor
diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml
index e19d8665..d86b39c7 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml
+++ b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
Button {
id: button
diff --git a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml
index 50f816ce..088e9c16 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml
+++ b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.9
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
// This container and the transform on the Label are
// necessary to get precise bounding rect of the text for layouting reasons,
diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
index 86355bb0..91e3bf7c 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
+++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Imagine 2.3
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Imagine 2.12
import QtQuick.Window 2.0
ApplicationWindow {
diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
index f772fa42..de4fd281 100644
--- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
+++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
import QtQuick.Window 2.0
ApplicationWindow {
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols2/sidepanel/sidepanel.qml
index f7e459fc..e2473ac9 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.qml
+++ b/examples/quickcontrols2/sidepanel/sidepanel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-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
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.qml b/examples/quickcontrols2/swipetoremove/swipetoremove.qml
index 942669ce..b4b0d588 100644
--- a/examples/quickcontrols2/swipetoremove/swipetoremove.qml
+++ b/examples/quickcontrols2/swipetoremove/swipetoremove.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.8
-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
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
index 911cb9f3..e56eddcd 100644
--- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
+++ b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
-import QtQuick.Controls.Material 2.1
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+import QtQuick.Layouts 1.12
import QtQuick.Window 2.0
import io.qt.examples.texteditor 1.0
diff --git a/examples/quickcontrols2/texteditor/qml/texteditor.qml b/examples/quickcontrols2/texteditor/qml/texteditor.qml
index 9d50daf5..a1cb3435 100644
--- a/examples/quickcontrols2/texteditor/qml/texteditor.qml
+++ b/examples/quickcontrols2/texteditor/qml/texteditor.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import QtQuick.Window 2.0
import Qt.labs.platform 1.0
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
index 99343d24..6874008f 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/DemoMode.qml b/examples/quickcontrols2/wearable/qml/DemoMode.qml
index c67a56e6..9d0f4d6b 100644
--- a/examples/quickcontrols2/wearable/qml/DemoMode.qml
+++ b/examples/quickcontrols2/wearable/qml/DemoMode.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
index 66ced325..88678b36 100644
--- a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
+++ b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index 1f018e2e..0e361066 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
index 53c9e5a4..96a2d975 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/NaviButton.qml b/examples/quickcontrols2/wearable/qml/NaviButton.qml
index 5058bd62..55ccc19d 100644
--- a/examples/quickcontrols2/wearable/qml/NaviButton.qml
+++ b/examples/quickcontrols2/wearable/qml/NaviButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
index 8ab82bac..4a7fbde1 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import "../Style"
import "navigation.js" as NavigationData
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
index 937b84a8..005ae3f7 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import "../Style"
Rectangle {
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index eeddf6dc..b3102771 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "../Style"
import "notifications.js" as NotificationData
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
index bb347e7d..23bb9acd 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
index 81d4c9ef..68485f5d 100644
--- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.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
import "."
T.PageIndicator {
diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols2/wearable/qml/Style/Slider.qml
index cdff4aec..a0be11c7 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/Slider.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
import "."
T.Slider {
diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols2/wearable/qml/Style/Switch.qml
index b1597737..4a0f4e49 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/Switch.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
import "."
T.Switch {
diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
index f4a5df69..0efe84e5 100644
--- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
pragma Singleton
diff --git a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
index 6d4b687f..1417d9f7 100644
--- a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
+++ b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
// Don't show the item when the StackView that contains us
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
index 256e60a4..2d411302 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
index 158f3d70..613d936b 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
index 1456072f..8def8b45 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "../Style"
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml
index ea84adca..bda7d169 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols2/wearable/wearable.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import Qt.labs.settings 1.0
import "qml"
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml
index 23e3c30e..2fc0d6f7 100644
--- a/src/imports/calendar/DayOfWeekRow.qml
+++ b/src/imports/calendar/DayOfWeekRow.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.11
+import QtQuick 2.12
import Qt.labs.calendar 1.0
AbstractDayOfWeekRow {
diff --git a/src/imports/calendar/MonthGrid.qml b/src/imports/calendar/MonthGrid.qml
index 95e2a801..884ce65f 100644
--- a/src/imports/calendar/MonthGrid.qml
+++ b/src/imports/calendar/MonthGrid.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.11
+import QtQuick 2.12
import Qt.labs.calendar 1.0
AbstractMonthGrid {
diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml
index c46e25ae..e2c9d98b 100644
--- a/src/imports/calendar/WeekNumberColumn.qml
+++ b/src/imports/calendar/WeekNumberColumn.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.11
+import QtQuick 2.12
import Qt.labs.calendar 1.0
AbstractWeekNumberColumn {
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
index 0a7f1688..6f6e8f2e 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
import Qt.labs.calendar 1.0
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
//! [1]
ListView {
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
index d7e56384..2de76098 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
import Qt.labs.calendar 1.0
//! [1]
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
index c98372b4..e52ebb2d 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
@@ -25,7 +25,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
import Qt.labs.calendar 1.0
//! [1]
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
index fed2cc5a..5710b4dd 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
import Qt.labs.calendar 1.0
//! [1]
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
index 4427d343..cdb7201e 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
@@ -25,7 +25,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
import Qt.labs.calendar 1.0
//! [1]
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
index a8e5717b..18613f12 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
import Qt.labs.calendar 1.0
//! [1]
diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
index 1d42c1c3..f086468b 100644
--- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
+++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
@@ -25,7 +25,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
import Qt.labs.calendar 1.0
//! [1]
diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml
index f3dda0af..50ddb933 100644
--- a/src/imports/controls/AbstractButton.qml
+++ b/src/imports/controls/AbstractButton.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.AbstractButton {
id: control
diff --git a/src/imports/controls/Action.qml b/src/imports/controls/Action.qml
index fe86213a..996e9086 100644
--- a/src/imports/controls/Action.qml
+++ b/src/imports/controls/Action.qml
@@ -35,6 +35,6 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.Action { }
diff --git a/src/imports/controls/ActionGroup.qml b/src/imports/controls/ActionGroup.qml
index ae8772d6..89e72c8f 100644
--- a/src/imports/controls/ActionGroup.qml
+++ b/src/imports/controls/ActionGroup.qml
@@ -35,6 +35,6 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.ActionGroup { }
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index 4ad97082..4686a298 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Window 2.3
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Window 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ApplicationWindow {
id: window
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index a79e2620..ff5c191c 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.BusyIndicator {
id: control
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 4132e326..a9e7fce6 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Button {
id: control
diff --git a/src/imports/controls/ButtonGroup.qml b/src/imports/controls/ButtonGroup.qml
index 50d3b840..cf0355ba 100644
--- a/src/imports/controls/ButtonGroup.qml
+++ b/src/imports/controls/ButtonGroup.qml
@@ -35,6 +35,6 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.ButtonGroup { }
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index be4e62a6..c58399f7 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.CheckBox {
id: control
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index 3e58ffbb..71b390ac 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.CheckDelegate {
id: control
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 5cef9e55..6b7fe008 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Window 2.3
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Window 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ComboBox {
id: control
diff --git a/src/imports/controls/Container.qml b/src/imports/controls/Container.qml
index 1f30de42..83ab957d 100644
--- a/src/imports/controls/Container.qml
+++ b/src/imports/controls/Container.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.Container {
id: control
diff --git a/src/imports/controls/Control.qml b/src/imports/controls/Control.qml
index ff1c0b08..a963a563 100644
--- a/src/imports/controls/Control.qml
+++ b/src/imports/controls/Control.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.Control {
id: control
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml
index 024ebcfe..1c545a71 100644
--- a/src/imports/controls/DelayButton.qml
+++ b/src/imports/controls/DelayButton.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.DelayButton {
id: control
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index 37a9edbe..b6324db5 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Dial {
id: control
diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml
index 5f8d74c4..6c2e4b1b 100644
--- a/src/imports/controls/Dialog.qml
+++ b/src/imports/controls/Dialog.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.Dialog {
id: control
diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml
index aa0353c0..1b783b3b 100644
--- a/src/imports/controls/DialogButtonBox.qml
+++ b/src/imports/controls/DialogButtonBox.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.DialogButtonBox {
id: control
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml
index 0b882f90..17465fd4 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/Drawer.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Drawer {
id: control
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index 9ada5273..2fe46104 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Frame {
id: control
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index e16148bc..96f776f2 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.GroupBox {
id: control
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index a7cc499d..8cc12cab 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ItemDelegate {
id: control
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index 6c3c05d4..9a42635f 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Label {
id: control
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index cebca827..041942f5 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
import QtQuick.Window 2.12
T.Menu {
diff --git a/src/imports/controls/MenuBar.qml b/src/imports/controls/MenuBar.qml
index 9e145b6a..122cdc53 100644
--- a/src/imports/controls/MenuBar.qml
+++ b/src/imports/controls/MenuBar.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.MenuBar {
id: control
diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml
index e1ba4a41..f6835412 100644
--- a/src/imports/controls/MenuBarItem.qml
+++ b/src/imports/controls/MenuBarItem.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.MenuBarItem {
id: control
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index 7af280a3..22cdf3ea 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.MenuItem {
id: control
diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml
index 43c421a3..cc5c2b6e 100644
--- a/src/imports/controls/MenuSeparator.qml
+++ b/src/imports/controls/MenuSeparator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.MenuSeparator {
id: control
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml
index 844f44d1..4b3cf3d2 100644
--- a/src/imports/controls/Page.qml
+++ b/src/imports/controls/Page.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Page {
id: control
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 6985919b..78f9e3cf 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.PageIndicator {
id: control
diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml
index ee715c86..47b916e3 100644
--- a/src/imports/controls/Pane.qml
+++ b/src/imports/controls/Pane.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Pane {
id: control
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml
index 13de88a3..ee243c10 100644
--- a/src/imports/controls/Popup.qml
+++ b/src/imports/controls/Popup.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Popup {
id: control
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index c6b773ce..61cdea43 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.ProgressBar {
id: control
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 02251239..726e8862 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.RadioButton {
id: control
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml
index 3846cd34..a7e7dec0 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/RadioDelegate.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.RadioDelegate {
id: control
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index 6de74a9f..c3e7c964 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.RangeSlider {
id: control
diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml
index 11649094..825d5252 100644
--- a/src/imports/controls/RoundButton.qml
+++ b/src/imports/controls/RoundButton.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.RoundButton {
id: control
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index c16b4356..1cff0afc 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ScrollBar {
id: control
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 96099bf1..795c20ee 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ScrollIndicator {
id: control
diff --git a/src/imports/controls/ScrollView.qml b/src/imports/controls/ScrollView.qml
index 57299575..f775d624 100644
--- a/src/imports/controls/ScrollView.qml
+++ b/src/imports/controls/ScrollView.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ScrollView {
id: control
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 3d95cae9..6d532389 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Slider {
id: control
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 14a6ea52..824ce061 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.SpinBox {
id: control
diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml
index 5da0c541..3e416b87 100644
--- a/src/imports/controls/StackView.qml
+++ b/src/imports/controls/StackView.qml
@@ -35,8 +35,8 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
T.StackView {
id: control
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml
index 146c357b..37d66bb6 100644
--- a/src/imports/controls/SwipeDelegate.qml
+++ b/src/imports/controls/SwipeDelegate.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.SwipeDelegate {
id: control
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml
index 9665b5ca..ad242e1a 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/SwipeView.qml
@@ -35,8 +35,8 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
T.SwipeView {
id: control
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index e7987385..522d9980 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.Switch {
id: control
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index 4d4602e8..0abf7641 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
T.SwitchDelegate {
id: control
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index eb4c0ae2..83f6b3b2 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
+import QtQuick.Templates 2.12 as T
T.TabBar {
id: control
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index b6a6317c..34a5a115 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.TabButton {
id: control
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index ff252bba..45790e67 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.TextArea {
id: control
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index aa57da81..4d9cb691 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.TextField {
id: control
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index 1e73c0d6..1e07b6bf 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ToolBar {
id: control
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 1c5b4662..63aaf893 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ToolButton {
id: control
diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml
index f2de5aa9..188d0758 100644
--- a/src/imports/controls/ToolSeparator.qml
+++ b/src/imports/controls/ToolSeparator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ToolSeparator {
id: control
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml
index e3af2ade..ae903e4c 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/ToolTip.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.ToolTip {
id: control
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml
index 0229dcf3..621f4113 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/Tumbler.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
T.Tumbler {
id: control
diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/imports/controls/designer/AbstractButtonSection.qml
index 3cc50925..e8aa39c2 100644
--- a/src/imports/controls/designer/AbstractButtonSection.qml
+++ b/src/imports/controls/designer/AbstractButtonSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
caption: qsTr("AbstractButton")
diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/imports/controls/designer/BusyIndicatorSpecifics.qml
index cf51efd2..7ae927fc 100644
--- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml
+++ b/src/imports/controls/designer/BusyIndicatorSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml
index 038abab7..fef46071 100644
--- a/src/imports/controls/designer/ButtonSection.qml
+++ b/src/imports/controls/designer/ButtonSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
id: section
diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/imports/controls/designer/ButtonSpecifics.qml
index 7b5d0a24..e094b9df 100644
--- a/src/imports/controls/designer/ButtonSpecifics.qml
+++ b/src/imports/controls/designer/ButtonSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/imports/controls/designer/CheckBoxSpecifics.qml
index f11c55a1..f76aa215 100644
--- a/src/imports/controls/designer/CheckBoxSpecifics.qml
+++ b/src/imports/controls/designer/CheckBoxSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/CheckDelegateSpecifics.qml b/src/imports/controls/designer/CheckDelegateSpecifics.qml
index d5c92d87..1df55e11 100644
--- a/src/imports/controls/designer/CheckDelegateSpecifics.qml
+++ b/src/imports/controls/designer/CheckDelegateSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/CheckSection.qml b/src/imports/controls/designer/CheckSection.qml
index 28353874..76cde03e 100644
--- a/src/imports/controls/designer/CheckSection.qml
+++ b/src/imports/controls/designer/CheckSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
SectionLayout {
diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/imports/controls/designer/ComboBoxSpecifics.qml
index c5fc6781..8a5e33b6 100644
--- a/src/imports/controls/designer/ComboBoxSpecifics.qml
+++ b/src/imports/controls/designer/ComboBoxSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ContainerSection.qml b/src/imports/controls/designer/ContainerSection.qml
index 9a31069a..896804c0 100644
--- a/src/imports/controls/designer/ContainerSection.qml
+++ b/src/imports/controls/designer/ContainerSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
caption: qsTr("Container")
diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml
index 90dd3816..7c53ac73 100644
--- a/src/imports/controls/designer/ControlSection.qml
+++ b/src/imports/controls/designer/ControlSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
caption: qsTr("Control")
diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/imports/controls/designer/ControlSpecifics.qml
index 1eef1c68..ccfd8853 100644
--- a/src/imports/controls/designer/ControlSpecifics.qml
+++ b/src/imports/controls/designer/ControlSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/DelayButtonSpecifics.qml b/src/imports/controls/designer/DelayButtonSpecifics.qml
index 3821edc2..40b673a1 100644
--- a/src/imports/controls/designer/DelayButtonSpecifics.qml
+++ b/src/imports/controls/designer/DelayButtonSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/imports/controls/designer/DialSpecifics.qml
index 6c9bda34..c338fa94 100644
--- a/src/imports/controls/designer/DialSpecifics.qml
+++ b/src/imports/controls/designer/DialSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/imports/controls/designer/FrameSpecifics.qml
index 8b2cd97d..f17b6399 100644
--- a/src/imports/controls/designer/FrameSpecifics.qml
+++ b/src/imports/controls/designer/FrameSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/imports/controls/designer/GroupBoxSpecifics.qml
index 59b3299d..3a705bcc 100644
--- a/src/imports/controls/designer/GroupBoxSpecifics.qml
+++ b/src/imports/controls/designer/GroupBoxSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ItemDelegateSection.qml b/src/imports/controls/designer/ItemDelegateSection.qml
index 6f466439..a337bcee 100644
--- a/src/imports/controls/designer/ItemDelegateSection.qml
+++ b/src/imports/controls/designer/ItemDelegateSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
id: section
diff --git a/src/imports/controls/designer/ItemDelegateSpecifics.qml b/src/imports/controls/designer/ItemDelegateSpecifics.qml
index 6efb1bdc..58063980 100644
--- a/src/imports/controls/designer/ItemDelegateSpecifics.qml
+++ b/src/imports/controls/designer/ItemDelegateSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml
index 48cf8d05..c832f894 100644
--- a/src/imports/controls/designer/LabelSpecifics.qml
+++ b/src/imports/controls/designer/LabelSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/imports/controls/designer/PaddingSection.qml
index 2e24bd42..a7dee28e 100644
--- a/src/imports/controls/designer/PaddingSection.qml
+++ b/src/imports/controls/designer/PaddingSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
caption: qsTr("Padding")
diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml
index f8bf09d4..042672a9 100644
--- a/src/imports/controls/designer/PageIndicatorSpecifics.qml
+++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/PageSpecifics.qml b/src/imports/controls/designer/PageSpecifics.qml
index 32feedd7..2dca1100 100644
--- a/src/imports/controls/designer/PageSpecifics.qml
+++ b/src/imports/controls/designer/PageSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/PaneSection.qml b/src/imports/controls/designer/PaneSection.qml
index 57aa53ae..80d154c9 100644
--- a/src/imports/controls/designer/PaneSection.qml
+++ b/src/imports/controls/designer/PaneSection.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Section {
caption: qsTr("Pane")
diff --git a/src/imports/controls/designer/PaneSpecifics.qml b/src/imports/controls/designer/PaneSpecifics.qml
index 8b2cd97d..f17b6399 100644
--- a/src/imports/controls/designer/PaneSpecifics.qml
+++ b/src/imports/controls/designer/PaneSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/imports/controls/designer/ProgressBarSpecifics.qml
index fb1eb838..c24d71db 100644
--- a/src/imports/controls/designer/ProgressBarSpecifics.qml
+++ b/src/imports/controls/designer/ProgressBarSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/imports/controls/designer/RadioButtonSpecifics.qml
index 671218a8..6137ad8c 100644
--- a/src/imports/controls/designer/RadioButtonSpecifics.qml
+++ b/src/imports/controls/designer/RadioButtonSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/RadioDelegateSpecifics.qml b/src/imports/controls/designer/RadioDelegateSpecifics.qml
index 6efb1bdc..58063980 100644
--- a/src/imports/controls/designer/RadioDelegateSpecifics.qml
+++ b/src/imports/controls/designer/RadioDelegateSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/RangeSliderSpecifics.qml b/src/imports/controls/designer/RangeSliderSpecifics.qml
index d1a81512..79d2404f 100644
--- a/src/imports/controls/designer/RangeSliderSpecifics.qml
+++ b/src/imports/controls/designer/RangeSliderSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/RoundButtonSpecifics.qml b/src/imports/controls/designer/RoundButtonSpecifics.qml
index 1c1eed43..2da4cda6 100644
--- a/src/imports/controls/designer/RoundButtonSpecifics.qml
+++ b/src/imports/controls/designer/RoundButtonSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ScrollViewSpecifics.qml b/src/imports/controls/designer/ScrollViewSpecifics.qml
index 4ce7668a..0f3d56d2 100644
--- a/src/imports/controls/designer/ScrollViewSpecifics.qml
+++ b/src/imports/controls/designer/ScrollViewSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml
index 08a3f868..076d8a1c 100644
--- a/src/imports/controls/designer/SliderSpecifics.qml
+++ b/src/imports/controls/designer/SliderSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/SpinBoxSpecifics.qml b/src/imports/controls/designer/SpinBoxSpecifics.qml
index 335b15db..d6375d7c 100644
--- a/src/imports/controls/designer/SpinBoxSpecifics.qml
+++ b/src/imports/controls/designer/SpinBoxSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/StackViewSpecifics.qml b/src/imports/controls/designer/StackViewSpecifics.qml
index 1eef1c68..ccfd8853 100644
--- a/src/imports/controls/designer/StackViewSpecifics.qml
+++ b/src/imports/controls/designer/StackViewSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/SwipeDelegateSpecifics.qml b/src/imports/controls/designer/SwipeDelegateSpecifics.qml
index 6efb1bdc..58063980 100644
--- a/src/imports/controls/designer/SwipeDelegateSpecifics.qml
+++ b/src/imports/controls/designer/SwipeDelegateSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/SwipeViewSpecifics.qml b/src/imports/controls/designer/SwipeViewSpecifics.qml
index ac91880c..02cc900e 100644
--- a/src/imports/controls/designer/SwipeViewSpecifics.qml
+++ b/src/imports/controls/designer/SwipeViewSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/SwitchDelegateSpecifics.qml b/src/imports/controls/designer/SwitchDelegateSpecifics.qml
index c71cb13d..f8c0dcc6 100644
--- a/src/imports/controls/designer/SwitchDelegateSpecifics.qml
+++ b/src/imports/controls/designer/SwitchDelegateSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/imports/controls/designer/SwitchSpecifics.qml
index 671218a8..6137ad8c 100644
--- a/src/imports/controls/designer/SwitchSpecifics.qml
+++ b/src/imports/controls/designer/SwitchSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/TabBarSpecifics.qml b/src/imports/controls/designer/TabBarSpecifics.qml
index 7a4984a1..f17e8e9a 100644
--- a/src/imports/controls/designer/TabBarSpecifics.qml
+++ b/src/imports/controls/designer/TabBarSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/TabButtonSpecifics.qml b/src/imports/controls/designer/TabButtonSpecifics.qml
index 671218a8..6137ad8c 100644
--- a/src/imports/controls/designer/TabButtonSpecifics.qml
+++ b/src/imports/controls/designer/TabButtonSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml
index e8bed83d..a14584e7 100644
--- a/src/imports/controls/designer/TextAreaSpecifics.qml
+++ b/src/imports/controls/designer/TextAreaSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml
index 5faeb914..67a63ec4 100644
--- a/src/imports/controls/designer/TextFieldSpecifics.qml
+++ b/src/imports/controls/designer/TextFieldSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/imports/controls/designer/ToolBarSpecifics.qml
index 9c0a3da1..acf02e7b 100644
--- a/src/imports/controls/designer/ToolBarSpecifics.qml
+++ b/src/imports/controls/designer/ToolBarSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/imports/controls/designer/ToolButtonSpecifics.qml
index 7b5d0a24..e094b9df 100644
--- a/src/imports/controls/designer/ToolButtonSpecifics.qml
+++ b/src/imports/controls/designer/ToolButtonSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/ToolSeparatorSpecifics.qml b/src/imports/controls/designer/ToolSeparatorSpecifics.qml
index 0bf088c7..d0ebd57c 100644
--- a/src/imports/controls/designer/ToolSeparatorSpecifics.qml
+++ b/src/imports/controls/designer/ToolSeparatorSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.8
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/designer/TumblerSpecifics.qml b/src/imports/controls/designer/TumblerSpecifics.qml
index 0f1b2a74..04507ef6 100644
--- a/src/imports/controls/designer/TumblerSpecifics.qml
+++ b/src/imports/controls/designer/TumblerSpecifics.qml
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.12
import HelperWidgets 2.0
-import QtQuick.Layouts 1.0
+import QtQuick.Layouts 1.12
Column {
width: parent.width
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml
index 1913e131..11c7e802 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
//! [action]
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
index ad92acfc..93ba9c44 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
BusyIndicator {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml
index f1cd4fb9..3145a6ef 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Button {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
index 32b0797a..f6559376 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Button {
icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
index 870da262..bc99bba7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Button {
text: "Button"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml
index fe871639..1ff1f0a8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Button {
text: "Button"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml
index ed2a6621..806655a3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
CheckBox {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml
index 985e6219..a32e9f5f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.4
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
Column {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
index aa19ff14..b8fbbf69 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
CheckDelegate {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml
index 68e7ddad..1bb68bdf 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ComboBox {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
index 66b1fa77..86c6a0b7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
DelayButton {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml
index 434386f1..0221350d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Dial {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml
index af03744d..c8a71e5b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: dialog.implicitWidth
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml
index b43ce506..be0e6f02 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: dialog.implicitWidth
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml
index f71371f8..2953c371 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: dialog.implicitWidth
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
index 8e437957..f71f91cb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
DialogButtonBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
index 248de50d..adfd8035 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
DialogButtonBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml
index 2c57ef13..0e90f0aa 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Frame {
background: Rectangle {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
index d91d684e..8f8f9c23 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
//! [1]
Frame {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
index bf5d4556..5f6ee591 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
//! [1]
GroupBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
index afefd3d8..7ccb55c3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
GroupBox {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
index 90d34bde..67c68cf3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
//! [1]
GroupBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
index e19d28f3..d6ec5f78 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ItemDelegate {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
index 7965776b..8f483ed9 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
ListView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml
index 4d960708..e984fc71 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Label {
text: qsTr("Label")
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
index baa43f53..fb68bb04 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
Label {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml
index a9107b1c..5191efce 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml
@@ -25,10 +25,10 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.0
-import QtQuick.Controls.Material 2.0
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
Pane {
padding: 4
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml
index 472b2b39..cdbc16cc 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
padding: 4
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml
index 0bf01a46..e15bc216 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
contentWidth: 120
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml
index 01d2a1df..003b5624 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
padding: 4
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml
index 717491a2..955290fd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
padding: 10
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml
index fc2be179..ce8a0356 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml
@@ -25,10 +25,10 @@
**
****************************************************************************/
-import QtQuick 2.11
-import QtQuick.Controls 2.4
-import QtQuick.Controls.Material 2.4
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+import QtQuick.Layouts 1.12
Pane {
implicitWidth: 400
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml
index 2d05b74a..5a702b9f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml
index 513ad440..ea27acf6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml
index 550680f6..87371877 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [begin]
ApplicationWindow {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
index ba2c59a8..ea2d6ae7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
id: window
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml
index d59b337e..0712c5fa 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
id: window
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml
index 211697e0..8913e5bd 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.11
-import QtQuick.Controls 2.4
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import QtQuick.Window 2.2
Item {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml
index 783f611e..96fb606f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.11
-import QtQuick.Controls 2.4
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import QtQuick.Window 2.2
Item {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
index ff97aa2f..7f828d93 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
PageIndicator {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
index 9f14cc0b..0a40c8b0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
@@ -25,7 +25,7 @@
**
****************************************************************************/
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Pane {
//! [1]
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
index 70182276..0eeec4d8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml
@@ -24,8 +24,8 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
PageIndicator {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml
index b2bb7ad4..dfe2eaa4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Pane {
background: Rectangle {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
index baedbb53..9ed7a5b4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
//! [1]
Pane {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml
index 8c1976d4..9408cd66 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import QtQuick.Window 2.2
Item {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml
index 593058c6..6d46b810 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml
@@ -26,7 +26,7 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.12
Item {
//! [centerIn]
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml
index 05384845..e23c1438 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ProgressBar {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
index 6d77772d..1361f09e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
RadioButton {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
index d486943d..27ad9da2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
RadioDelegate {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
index d66850c6..1c5db214 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
RangeSlider {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml
index 55065125..4f727344 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
RoundButton {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
index 64a3a44b..a4a66e93 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
index 611e8f19..5efcb461 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollBar {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
index ff02a344..43e2853e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 200
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
index fdcef987..942722a5 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
Flickable {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
index ce26e4a3..6cb749e6 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
index dba2f566..616c877d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ScrollIndicator {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
index f4dcc21a..f1b99bca 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 200
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml
index 0d5686f3..9010f0af 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 200
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
index 9770de33..26b0b5c4 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [file]
ScrollView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml
index b3eff14f..6907d674 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml
index efd23100..f5c33975 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [file]
ScrollView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml
index 74c0e85c..cbdf9eb8 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Rectangle {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml
index 26c73462..7745892d 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Slider {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
index ab5ee1f3..ad05d463 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
SpinBox {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml
index d8ae971d..6f1bb55b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
SpinBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
index 1943746a..daa54967 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
SpinBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
index 9eeb9017..32d39b9f 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
SpinBox {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml
index 5faff67b..cfeab812 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
StackView {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml
index c80b6e4d..a9298460 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
StackView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
index 4159e7f7..432fcc87 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
SwipeDelegate {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
index a6936fe8..6b71a5f0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
SwipeDelegate {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
index 7fa76f13..6e02c057 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
ListView {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml
index d0303f9f..40833dde 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
SwipeView {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
index 6a612767..1869a032 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 200
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml
index 51e6b0c2..a7dd2eea 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Switch {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
index 726614d8..19060824 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
SwitchDelegate {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml
index 0aa275a7..c06c44c7 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TabBar {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
index 611195ea..01f0d875 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 360
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
index 0c175f3b..628aef80 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 360
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
index bf8595b1..cbf6d728 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
Column {
width: 300
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
index bfc8ac34..0aae7d15 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
TabBar {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml
index dc89d9cd..3ce856ac 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TextArea {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
index 3a9aa2c5..e16c6bbf 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
width: 100
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml
index b7987abd..e48e0d65 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TextField {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
index d7b06ab1..18634d5e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
index f66a9245..5d8e067b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
index 0ff83b67..b0a04674 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TextField {
width: 80
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml
index cbb08f23..3d26e510 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
//! [file]
ToolBar {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
index baa970f9..e1c8c580 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
Item {
width: children[0].implicitWidth * 2
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
index e49c6dfe..cf5bc70e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ToolButton {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
index 7071a31b..e26986cc 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
@@ -25,10 +25,10 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Layouts 1.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
//! [file]
ToolBar {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml
index 52300550..2ccfb439 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml
@@ -25,10 +25,10 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Layouts 1.1
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
//! [1]
ToolBar {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml
index d53e3f9e..6a0a5b38 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
ToolTip {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
index 06af3f60..812b5ba2 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
Button {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
index a571d728..927d29c3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [1]
Button {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
index 9e5d991a..508a417e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
index fe96cea6..a4e92f88 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
Item {
id: root
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml
index cc37d541..ee054106 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml
@@ -26,8 +26,8 @@
****************************************************************************/
//! [file]
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Tumbler {
id: control
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml
index b46aa129..7d16d139 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [contentItem]
Tumbler {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
index 627806d2..61e4ce01 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
@@ -25,8 +25,8 @@
**
****************************************************************************/
-import QtQuick 2.8
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
//! [contentItem]
Tumbler {
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
index 52c3efdd..13130f97 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
@@ -26,9 +26,9 @@
****************************************************************************/
//! [tumbler]
-import QtQuick 2.8
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
Rectangle {
width: frame.implicitWidth + 10
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml
index 322dbf42..c54a18a0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml
@@ -25,10 +25,10 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.0
-import QtQuick.Controls.Universal 2.0
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Universal 2.12
Pane {
padding: 10
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml
index d73f98a9..f22b5308 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
padding: 10
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml
index 8b71f25f..8c5b99a3 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
padding: 10
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml
index 1885876d..1f0d6bd0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml
@@ -25,9 +25,9 @@
**
****************************************************************************/
-import QtQuick 2.0
-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
Pane {
padding: 10
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index cabeb528..d50e4c83 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -47,9 +47,9 @@
can override the \l {Control::}{background} item and set the radius
property of Rectangle:
- \qml
- import QtQuick 2.6
- import QtQuick.Controls 2.1
+ \qml \QtMinorVersion
+ import QtQuick 2.\1
+ import QtQuick.Controls 2.\1
ApplicationWindow {
width: 400
@@ -91,8 +91,8 @@
module itself, we'll call the file \c MyButton.qml. To use the control in
your application, refer to it by its filename:
- \qml
- import QtQuick.Controls 2.1
+ \qml \QtMinorVersion
+ import QtQuick.Controls 2.\1
ApplicationWindow {
MyButton {
@@ -107,8 +107,8 @@
subfolder in your project named (for example) \c controls. To use the
control, first import the folder into a namespace:
- \qml
- import QtQuick.Controls 2.1
+ \qml \QtMinorVersion
+ import QtQuick.Controls 2.\1
import "controls" as MyControls
ApplicationWindow {
@@ -328,9 +328,9 @@
Next, we add a drop shadow to the \l {Control::}{background} delegate of
the Button:
- \code
+ \code \QtMinorVersion
// ...
- import QtGraphicalEffects 1.0
+ import QtGraphicalEffects 1.\1
import MyStyle 1.0
// ...
@@ -359,9 +359,9 @@
To try out the attached property, we create a \l Row with two Buttons in
\c main.qml:
- \qml
- import QtQuick 2.6
- import QtQuick.Controls 2.1
+ \qml \QtMinorVersion
+ import QtQuick 2.\1
+ import QtQuick.Controls 2.\1
import MyStyle 1.0
@@ -416,9 +416,9 @@
to customize the \l {ApplicationWindow::overlay}{modal} and
\l {ApplicationWindow::overlay}{modeless} items.
- \code
- import QtQuick 2.7
- import QtQuick.Controls 2.0
+ \code \QtMinorVersion
+ import QtQuick 2.\1
+ import QtQuick.Controls 2.\1
ApplicationWindow {
visible: true
@@ -580,8 +580,8 @@
\image qtquickcontrols2-menu-custom.png
\quotefromfile qtquickcontrols2-menu-custom.qml
- \skipto import QtQuick 2.10
- \printuntil import QtQuick.Controls 2.3
+ \skipto import QtQuick
+ \printuntil import QtQuick.Controls
\skipto Menu
\printto eof
@@ -595,8 +595,8 @@
\image qtquickcontrols2-menubar-custom.png
\quotefromfile qtquickcontrols2-menubar-custom.qml
- \skipto import QtQuick 2.10
- \printuntil import QtQuick.Controls 2.3
+ \skipto import QtQuick
+ \printuntil import QtQuick.Controls
\skipto MenuBar
\printto eof
@@ -627,8 +627,8 @@
\image qtquickcontrols2-popup-custom.png
\quotefromfile qtquickcontrols2-popup-custom.qml
- \skipto import QtQuick 2.6
- \printuntil import QtQuick.Controls 2.0
+ \skipto import QtQuick 2.12
+ \printuntil import QtQuick.Controls 2.12
\codeline
\skipto Popup
\printuntil {
@@ -853,8 +853,8 @@
and \l {Popup::contentItem}{content item}.
\quotefromfile qtquickcontrols2-tooltip-custom.qml
- \skipto import QtQuick 2.6
- \printuntil import QtQuick.Controls 2.1
+ \skipto import QtQuick
+ \printuntil import QtQuick.Controls
\skipto ToolTip
\printuntil }
\printuntil }
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
index afe5611f..cfcfa149 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
@@ -59,10 +59,10 @@
\c material selector will be present and the \c +material/CustomButton.qml
version will be used instead.
- \code
+ \code \QtMinorVersion
// main.qml
- import QtQuick 2.6
- import QtQuick.Controls 2.1
+ import QtQuick 2.\1
+ import QtQuick.Controls 2.\1
ApplicationWindow {
id: window
@@ -78,10 +78,10 @@
The base implementation of the custom button is a simple rounded
flat button.
- \code
+ \code \QtMinorVersion
// CustomButton.qml
- import QtQuick 2.6
- import QtQuick.Controls 2.1
+ import QtQuick 2.\1
+ import QtQuick.Controls 2.\1
Button {
id: control
@@ -99,12 +99,12 @@
Material style, requests a dark theme to get light text, and creates
a drop shadow for the background.
- \code
+ \code \QtMinorVersion
// +material/CustomButton.qml
- import QtQuick 2.6
- import QtGraphicalEffects 1.0
- import QtQuick.Controls 2.1
- import QtQuick.Controls.Material 2.1
+ import QtQuick 2.\1
+ import QtGraphicalEffects 1.\1
+ import QtQuick.Controls 2.\1
+ import QtQuick.Controls.Material 2.\1
Button {
id: control
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
index 4708a4be..043aaed2 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
@@ -62,8 +62,8 @@
\row
\li
\qml
- import QtQuick 2.7
- import QtQuick.Controls 2.3
+ import QtQuick 2.12
+ import QtQuick.Controls 2.12
ApplicationWindow {
visible: true
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc
index fe3f27a9..fecad927 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc
@@ -31,9 +31,9 @@
A basic example of a QML file that makes use of controls is shown here:
- \qml
- import QtQuick 2.6
- import QtQuick.Controls 2.1
+ \qml \QtMinorVersion
+ import QtQuick 2.\1
+ import QtQuick.Controls 2.\1
ApplicationWindow {
title: "My Application"
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
index f24f82a9..c7ad71cf 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
@@ -31,7 +31,7 @@
The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...}
- \styleimport {QtQuick.Controls.Imagine 2.5} {Qt 5.10}
+ \styleimport {QtQuick.Controls.Imagine 2.12} {Qt 5.10}
\section1 Attached Properties
@@ -2431,9 +2431,9 @@
\row
\li
\qml
- import QtQuick 2.0
- 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
ApplicationWindow {
visible: true
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index a9916f60..6fed4866 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -46,8 +46,8 @@
The \l{Qt Quick Controls 2 QML Types}{QML types} can be imported into your
application using the following import statement in your \c {.qml} file:
- \code
- import QtQuick.Controls 2.5
+ \code \QtMinorVersion
+ import QtQuick.Controls 2.\1
\endcode
The \l{Qt Quick Controls 2 C++ Classes}{C++ classes} can be included into
@@ -78,7 +78,8 @@
\section1 Versions
Qt Quick Controls 2.0 was introduced in Qt 5.7. Subsequent minor Qt releases
- increment the import version of the Qt Quick Controls 2 modules by one. The
+ increment the import version of the Qt Quick Controls 2 modules by one,
+ until Qt 5.12, where the import versions match Qt's minor version. The
experimental Qt Labs modules use import version 1.0.
\table
@@ -119,7 +120,7 @@
\row
\li 5.12
\li 2.12
- \li 2.5
+ \li 2.12
\li 1.0
\row
\li ...
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index fa7874e5..d9e34a5f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -32,7 +32,7 @@
The Material Style is based on the Google Material Design Guidelines.
\l{detailed-desc-material}{More...}
- \styleimport {QtQuick.Controls.Material 2.5} {Qt 5.7}
+ \styleimport {QtQuick.Controls.Material 2.12} {Qt 5.7}
\section1 Attached Properties
@@ -93,9 +93,9 @@
\row
\li
\qml
- import QtQuick 2.0
- import QtQuick.Controls 2.1
- import QtQuick.Controls.Material 2.1
+ import QtQuick 2.12
+ import QtQuick.Controls 2.12
+ import QtQuick.Controls.Material 2.12
ApplicationWindow {
visible: true
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index 5f0f704c..db8a37a3 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -39,8 +39,8 @@
Qt Quick Controls 2 QML types can be imported into your application
using the following import statement in your .qml file:
- \badcode
- import QtQuick.Controls 2.5
+ \badcode \QtMinorVersion
+ import QtQuick.Controls 2.\1
\endcode
\section1 QML Types
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index 80bf9ef7..f1bfb1c8 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -32,7 +32,7 @@
The Universal Style is based on the Microsoft Universal Design Guidelines.
\l {detailed-desc-universal}{More...}
- \styleimport {QtQuick.Controls.Universal 2.5} {Qt 5.7}
+ \styleimport {QtQuick.Controls.Universal 2.12} {Qt 5.7}
\section1 Attached Properties
@@ -92,9 +92,9 @@
\row
\li
\qml
- import QtQuick 2.0
- import QtQuick.Controls 2.1
- import QtQuick.Controls.Universal 2.1
+ import QtQuick 2.12
+ import QtQuick.Controls 2.12
+ import QtQuick.Controls.Universal 2.12
ApplicationWindow {
visible: true
diff --git a/src/imports/controls/fusion/ApplicationWindow.qml b/src/imports/controls/fusion/ApplicationWindow.qml
index 6abe832f..9079403e 100644
--- a/src/imports/controls/fusion/ApplicationWindow.qml
+++ b/src/imports/controls/fusion/ApplicationWindow.qml
@@ -36,9 +36,9 @@
import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ApplicationWindow {
id: window
diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/imports/controls/fusion/BusyIndicator.qml
index 7afff2df..554c3368 100644
--- a/src/imports/controls/fusion/BusyIndicator.qml
+++ b/src/imports/controls/fusion/BusyIndicator.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.BusyIndicator {
id: control
diff --git a/src/imports/controls/fusion/Button.qml b/src/imports/controls/fusion/Button.qml
index ca6d81a9..7822634d 100644
--- a/src/imports/controls/fusion/Button.qml
+++ b/src/imports/controls/fusion/Button.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Button {
id: control
diff --git a/src/imports/controls/fusion/ButtonPanel.qml b/src/imports/controls/fusion/ButtonPanel.qml
index fc1af2de..3250044b 100644
--- a/src/imports/controls/fusion/ButtonPanel.qml
+++ b/src/imports/controls/fusion/ButtonPanel.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
Rectangle {
id: panel
diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml
index 9b9dba18..f90c80fb 100644
--- a/src/imports/controls/fusion/CheckBox.qml
+++ b/src/imports/controls/fusion/CheckBox.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.CheckBox {
id: control
diff --git a/src/imports/controls/fusion/CheckDelegate.qml b/src/imports/controls/fusion/CheckDelegate.qml
index 40f68164..1b97b1fd 100644
--- a/src/imports/controls/fusion/CheckDelegate.qml
+++ b/src/imports/controls/fusion/CheckDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.CheckDelegate {
id: control
diff --git a/src/imports/controls/fusion/CheckIndicator.qml b/src/imports/controls/fusion/CheckIndicator.qml
index 8c49e6b2..314a6798 100644
--- a/src/imports/controls/fusion/CheckIndicator.qml
+++ b/src/imports/controls/fusion/CheckIndicator.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
Rectangle {
id: indicator
diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml
index cafbdb02..012dbbd0 100644
--- a/src/imports/controls/fusion/ComboBox.qml
+++ b/src/imports/controls/fusion/ComboBox.qml
@@ -35,12 +35,12 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Window 2.3
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Window 2.12
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ComboBox {
id: control
diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml
index c150bb2e..622de111 100644
--- a/src/imports/controls/fusion/DelayButton.qml
+++ b/src/imports/controls/fusion/DelayButton.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.DelayButton {
id: control
diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml
index fb248d5e..423087c9 100644
--- a/src/imports/controls/fusion/Dial.qml
+++ b/src/imports/controls/fusion/Dial.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Dial {
id: control
diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml
index a079d09f..79e179d9 100644
--- a/src/imports/controls/fusion/Dialog.qml
+++ b/src/imports/controls/fusion/Dialog.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Dialog {
id: control
diff --git a/src/imports/controls/fusion/DialogButtonBox.qml b/src/imports/controls/fusion/DialogButtonBox.qml
index 49446c31..a0b0f243 100644
--- a/src/imports/controls/fusion/DialogButtonBox.qml
+++ b/src/imports/controls/fusion/DialogButtonBox.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.DialogButtonBox {
id: control
diff --git a/src/imports/controls/fusion/Drawer.qml b/src/imports/controls/fusion/Drawer.qml
index f0ee0200..5a23dde1 100644
--- a/src/imports/controls/fusion/Drawer.qml
+++ b/src/imports/controls/fusion/Drawer.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Drawer {
id: control
diff --git a/src/imports/controls/fusion/Frame.qml b/src/imports/controls/fusion/Frame.qml
index ffe816b4..c2df6351 100644
--- a/src/imports/controls/fusion/Frame.qml
+++ b/src/imports/controls/fusion/Frame.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Frame {
id: control
diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/imports/controls/fusion/GroupBox.qml
index 11372556..3df3e1e6 100644
--- a/src/imports/controls/fusion/GroupBox.qml
+++ b/src/imports/controls/fusion/GroupBox.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.GroupBox {
id: control
diff --git a/src/imports/controls/fusion/ItemDelegate.qml b/src/imports/controls/fusion/ItemDelegate.qml
index 407078dd..4c15ae68 100644
--- a/src/imports/controls/fusion/ItemDelegate.qml
+++ b/src/imports/controls/fusion/ItemDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ItemDelegate {
id: control
diff --git a/src/imports/controls/fusion/Label.qml b/src/imports/controls/fusion/Label.qml
index 23e337e2..9821f71c 100644
--- a/src/imports/controls/fusion/Label.qml
+++ b/src/imports/controls/fusion/Label.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Label {
id: control
diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml
index fd64ed45..e06b70fd 100644
--- a/src/imports/controls/fusion/Menu.qml
+++ b/src/imports/controls/fusion/Menu.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
import QtQuick.Window 2.12
T.Menu {
diff --git a/src/imports/controls/fusion/MenuBar.qml b/src/imports/controls/fusion/MenuBar.qml
index 81aaf9b5..4ba71fee 100644
--- a/src/imports/controls/fusion/MenuBar.qml
+++ b/src/imports/controls/fusion/MenuBar.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.MenuBar {
id: control
diff --git a/src/imports/controls/fusion/MenuBarItem.qml b/src/imports/controls/fusion/MenuBarItem.qml
index 85330a73..9fa685dc 100644
--- a/src/imports/controls/fusion/MenuBarItem.qml
+++ b/src/imports/controls/fusion/MenuBarItem.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.MenuBarItem {
id: control
diff --git a/src/imports/controls/fusion/MenuItem.qml b/src/imports/controls/fusion/MenuItem.qml
index b8ebd5e6..a428fbc8 100644
--- a/src/imports/controls/fusion/MenuItem.qml
+++ b/src/imports/controls/fusion/MenuItem.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.MenuItem {
id: control
diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/imports/controls/fusion/MenuSeparator.qml
index 904a15ef..522ada15 100644
--- a/src/imports/controls/fusion/MenuSeparator.qml
+++ b/src/imports/controls/fusion/MenuSeparator.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.MenuSeparator {
id: control
diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml
index 13f92c7a..796dff1c 100644
--- a/src/imports/controls/fusion/Page.qml
+++ b/src/imports/controls/fusion/Page.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Page {
id: control
diff --git a/src/imports/controls/fusion/PageIndicator.qml b/src/imports/controls/fusion/PageIndicator.qml
index fb3a5b89..5679b14f 100644
--- a/src/imports/controls/fusion/PageIndicator.qml
+++ b/src/imports/controls/fusion/PageIndicator.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.PageIndicator {
id: control
diff --git a/src/imports/controls/fusion/Pane.qml b/src/imports/controls/fusion/Pane.qml
index 53d51bf7..69fbdca0 100644
--- a/src/imports/controls/fusion/Pane.qml
+++ b/src/imports/controls/fusion/Pane.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Pane {
id: control
diff --git a/src/imports/controls/fusion/Popup.qml b/src/imports/controls/fusion/Popup.qml
index 93c7afd3..25a8c5ae 100644
--- a/src/imports/controls/fusion/Popup.qml
+++ b/src/imports/controls/fusion/Popup.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Popup {
id: control
diff --git a/src/imports/controls/fusion/ProgressBar.qml b/src/imports/controls/fusion/ProgressBar.qml
index 4e31d611..5deade58 100644
--- a/src/imports/controls/fusion/ProgressBar.qml
+++ b/src/imports/controls/fusion/ProgressBar.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ProgressBar {
id: control
diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml
index ef574201..fed6fa7c 100644
--- a/src/imports/controls/fusion/RadioButton.qml
+++ b/src/imports/controls/fusion/RadioButton.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.RadioButton {
id: control
diff --git a/src/imports/controls/fusion/RadioDelegate.qml b/src/imports/controls/fusion/RadioDelegate.qml
index ddcb1217..e8555a17 100644
--- a/src/imports/controls/fusion/RadioDelegate.qml
+++ b/src/imports/controls/fusion/RadioDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.RadioDelegate {
id: control
diff --git a/src/imports/controls/fusion/RadioIndicator.qml b/src/imports/controls/fusion/RadioIndicator.qml
index 790a5e24..4b67d24e 100644
--- a/src/imports/controls/fusion/RadioIndicator.qml
+++ b/src/imports/controls/fusion/RadioIndicator.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
Rectangle {
id: indicator
diff --git a/src/imports/controls/fusion/RangeSlider.qml b/src/imports/controls/fusion/RangeSlider.qml
index 17f4c62b..7edbed57 100644
--- a/src/imports/controls/fusion/RangeSlider.qml
+++ b/src/imports/controls/fusion/RangeSlider.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.RangeSlider {
id: control
diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/imports/controls/fusion/RoundButton.qml
index a38d123f..59bf4c16 100644
--- a/src/imports/controls/fusion/RoundButton.qml
+++ b/src/imports/controls/fusion/RoundButton.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.RoundButton {
id: control
diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/imports/controls/fusion/ScrollBar.qml
index 154f540b..e4fb7949 100644
--- a/src/imports/controls/fusion/ScrollBar.qml
+++ b/src/imports/controls/fusion/ScrollBar.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ScrollBar {
id: control
diff --git a/src/imports/controls/fusion/ScrollIndicator.qml b/src/imports/controls/fusion/ScrollIndicator.qml
index 3f8668c5..efe0b2fa 100644
--- a/src/imports/controls/fusion/ScrollIndicator.qml
+++ b/src/imports/controls/fusion/ScrollIndicator.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ScrollIndicator {
id: control
diff --git a/src/imports/controls/fusion/Slider.qml b/src/imports/controls/fusion/Slider.qml
index 67ee73cc..d212a233 100644
--- a/src/imports/controls/fusion/Slider.qml
+++ b/src/imports/controls/fusion/Slider.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Slider {
id: control
diff --git a/src/imports/controls/fusion/SliderGroove.qml b/src/imports/controls/fusion/SliderGroove.qml
index 678ac8c2..c34217a8 100644
--- a/src/imports/controls/fusion/SliderGroove.qml
+++ b/src/imports/controls/fusion/SliderGroove.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
Rectangle {
id: groove
diff --git a/src/imports/controls/fusion/SliderHandle.qml b/src/imports/controls/fusion/SliderHandle.qml
index 9bfa45a1..c53af57e 100644
--- a/src/imports/controls/fusion/SliderHandle.qml
+++ b/src/imports/controls/fusion/SliderHandle.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
Rectangle {
id: handle
diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/imports/controls/fusion/SpinBox.qml
index 5ef01d8f..fd77f9f3 100644
--- a/src/imports/controls/fusion/SpinBox.qml
+++ b/src/imports/controls/fusion/SpinBox.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.SpinBox {
id: control
diff --git a/src/imports/controls/fusion/SwipeDelegate.qml b/src/imports/controls/fusion/SwipeDelegate.qml
index c5de54a8..48c531ea 100644
--- a/src/imports/controls/fusion/SwipeDelegate.qml
+++ b/src/imports/controls/fusion/SwipeDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.SwipeDelegate {
id: control
diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml
index 6406ba64..edcb3650 100644
--- a/src/imports/controls/fusion/Switch.qml
+++ b/src/imports/controls/fusion/Switch.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Switch {
id: control
diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/imports/controls/fusion/SwitchDelegate.qml
index 6f07731e..0db13b41 100644
--- a/src/imports/controls/fusion/SwitchDelegate.qml
+++ b/src/imports/controls/fusion/SwitchDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.SwitchDelegate {
id: control
diff --git a/src/imports/controls/fusion/SwitchIndicator.qml b/src/imports/controls/fusion/SwitchIndicator.qml
index 7948a794..f89388c7 100644
--- a/src/imports/controls/fusion/SwitchIndicator.qml
+++ b/src/imports/controls/fusion/SwitchIndicator.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
Rectangle {
id: indicator
diff --git a/src/imports/controls/fusion/TabBar.qml b/src/imports/controls/fusion/TabBar.qml
index 3797e573..233a2acd 100644
--- a/src/imports/controls/fusion/TabBar.qml
+++ b/src/imports/controls/fusion/TabBar.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.TabBar {
id: control
diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml
index 201e7763..136503b6 100644
--- a/src/imports/controls/fusion/TabButton.qml
+++ b/src/imports/controls/fusion/TabButton.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.TabButton {
id: control
diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml
index d2469d28..c7107ac4 100644
--- a/src/imports/controls/fusion/TextArea.qml
+++ b/src/imports/controls/fusion/TextArea.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.TextArea {
id: control
diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml
index 6f5f49b3..d5b5788d 100644
--- a/src/imports/controls/fusion/TextField.qml
+++ b/src/imports/controls/fusion/TextField.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.TextField {
id: control
diff --git a/src/imports/controls/fusion/ToolBar.qml b/src/imports/controls/fusion/ToolBar.qml
index d569899d..fa069c0b 100644
--- a/src/imports/controls/fusion/ToolBar.qml
+++ b/src/imports/controls/fusion/ToolBar.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ToolBar {
id: control
diff --git a/src/imports/controls/fusion/ToolButton.qml b/src/imports/controls/fusion/ToolButton.qml
index f198a18b..4c00b402 100644
--- a/src/imports/controls/fusion/ToolButton.qml
+++ b/src/imports/controls/fusion/ToolButton.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ToolButton {
id: control
diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/imports/controls/fusion/ToolSeparator.qml
index f8047b81..5d366652 100644
--- a/src/imports/controls/fusion/ToolSeparator.qml
+++ b/src/imports/controls/fusion/ToolSeparator.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ToolSeparator {
id: control
diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/imports/controls/fusion/ToolTip.qml
index 922789dd..73f561e4 100644
--- a/src/imports/controls/fusion/ToolTip.qml
+++ b/src/imports/controls/fusion/ToolTip.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.ToolTip {
id: control
diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml
index fd0d7ef3..6abf7b5a 100644
--- a/src/imports/controls/fusion/Tumbler.qml
+++ b/src/imports/controls/fusion/Tumbler.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Fusion 2.5
-import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Fusion 2.12
+import QtQuick.Controls.Fusion.impl 2.12
T.Tumbler {
id: control
diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
index 107b4a2d..dcba73fe 100644
--- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
+++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp
@@ -73,10 +73,10 @@ QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *pa
void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri)
{
qmlRegisterModule(uri, 2, 3); // Qt 5.10->2.3
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5...
+ qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13...
QByteArray import = QByteArray(uri) + ".impl";
- qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5...
+ qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13...
qmlRegisterSingletonType<QQuickFusionStyle>(import, 2, 3, "Fusion", styleSingleton);
diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/imports/controls/imagine/ApplicationWindow.qml
index 00922f63..7bfcc3f9 100644
--- a/src/imports/controls/imagine/ApplicationWindow.qml
+++ b/src/imports/controls/imagine/ApplicationWindow.qml
@@ -36,9 +36,9 @@
import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.ApplicationWindow {
id: window
diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml
index bd90d21a..652365b1 100644
--- a/src/imports/controls/imagine/BusyIndicator.qml
+++ b/src/imports/controls/imagine/BusyIndicator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.BusyIndicator {
id: control
diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml
index c8962a6b..e7171eb1 100644
--- a/src/imports/controls/imagine/Button.qml
+++ b/src/imports/controls/imagine/Button.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Button {
id: control
diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml
index 3f0b7684..b91ceb40 100644
--- a/src/imports/controls/imagine/CheckBox.qml
+++ b/src/imports/controls/imagine/CheckBox.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.CheckBox {
id: control
diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/imports/controls/imagine/CheckDelegate.qml
index 2336131f..19975152 100644
--- a/src/imports/controls/imagine/CheckDelegate.qml
+++ b/src/imports/controls/imagine/CheckDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.CheckDelegate {
id: control
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml
index 530fa378..6cae167a 100644
--- a/src/imports/controls/imagine/ComboBox.qml
+++ b/src/imports/controls/imagine/ComboBox.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Window 2.3
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Window 2.12
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.ComboBox {
id: control
diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/imports/controls/imagine/DelayButton.qml
index ef1f6511..f60b5eae 100644
--- a/src/imports/controls/imagine/DelayButton.qml
+++ b/src/imports/controls/imagine/DelayButton.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
-import QtGraphicalEffects 1.0
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
+import QtGraphicalEffects 1.12
T.DelayButton {
id: control
diff --git a/src/imports/controls/imagine/Dial.qml b/src/imports/controls/imagine/Dial.qml
index ac7a4645..f10634e6 100644
--- a/src/imports/controls/imagine/Dial.qml
+++ b/src/imports/controls/imagine/Dial.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Dial {
id: control
diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml
index 968f70ab..730b7f57 100644
--- a/src/imports/controls/imagine/Dialog.qml
+++ b/src/imports/controls/imagine/Dialog.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Dialog {
id: control
diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml
index ec1cbde8..c24b29fc 100644
--- a/src/imports/controls/imagine/DialogButtonBox.qml
+++ b/src/imports/controls/imagine/DialogButtonBox.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.DialogButtonBox {
id: control
diff --git a/src/imports/controls/imagine/Drawer.qml b/src/imports/controls/imagine/Drawer.qml
index ea4f7337..2c93ba75 100644
--- a/src/imports/controls/imagine/Drawer.qml
+++ b/src/imports/controls/imagine/Drawer.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Drawer {
id: control
diff --git a/src/imports/controls/imagine/Frame.qml b/src/imports/controls/imagine/Frame.qml
index b049715b..2bef3c88 100644
--- a/src/imports/controls/imagine/Frame.qml
+++ b/src/imports/controls/imagine/Frame.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Frame {
id: control
diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml
index 816e0c8c..7abdb6f0 100644
--- a/src/imports/controls/imagine/GroupBox.qml
+++ b/src/imports/controls/imagine/GroupBox.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.GroupBox {
id: control
diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/imports/controls/imagine/ItemDelegate.qml
index 7ec07f55..0b3edeaf 100644
--- a/src/imports/controls/imagine/ItemDelegate.qml
+++ b/src/imports/controls/imagine/ItemDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.ItemDelegate {
id: control
diff --git a/src/imports/controls/imagine/Label.qml b/src/imports/controls/imagine/Label.qml
index f9a5bdb6..82c0ef47 100644
--- a/src/imports/controls/imagine/Label.qml
+++ b/src/imports/controls/imagine/Label.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Label {
id: control
diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml
index bf7540fd..20a34467 100644
--- a/src/imports/controls/imagine/Menu.qml
+++ b/src/imports/controls/imagine/Menu.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
import QtQuick.Window 2.12
T.Menu {
diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/imports/controls/imagine/MenuItem.qml
index 58dc344a..f85fc657 100644
--- a/src/imports/controls/imagine/MenuItem.qml
+++ b/src/imports/controls/imagine/MenuItem.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.MenuItem {
id: control
diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/imports/controls/imagine/MenuSeparator.qml
index 3821a15a..9ed39087 100644
--- a/src/imports/controls/imagine/MenuSeparator.qml
+++ b/src/imports/controls/imagine/MenuSeparator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.MenuSeparator {
id: control
diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml
index 2fe6a01d..07ec0a75 100644
--- a/src/imports/controls/imagine/Page.qml
+++ b/src/imports/controls/imagine/Page.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Page {
id: control
diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/imports/controls/imagine/PageIndicator.qml
index 7e9f43fe..8da89f5a 100644
--- a/src/imports/controls/imagine/PageIndicator.qml
+++ b/src/imports/controls/imagine/PageIndicator.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.PageIndicator {
id: control
diff --git a/src/imports/controls/imagine/Pane.qml b/src/imports/controls/imagine/Pane.qml
index f794666e..970b22b9 100644
--- a/src/imports/controls/imagine/Pane.qml
+++ b/src/imports/controls/imagine/Pane.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Pane {
id: control
diff --git a/src/imports/controls/imagine/Popup.qml b/src/imports/controls/imagine/Popup.qml
index 12b8300b..8f69bef4 100644
--- a/src/imports/controls/imagine/Popup.qml
+++ b/src/imports/controls/imagine/Popup.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.Popup {
id: control
diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/imports/controls/imagine/ProgressBar.qml
index c809f308..2f78004e 100644
--- a/src/imports/controls/imagine/ProgressBar.qml
+++ b/src/imports/controls/imagine/ProgressBar.qml
@@ -35,10 +35,10 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
-import QtGraphicalEffects 1.0
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
+import QtGraphicalEffects 1.12
T.ProgressBar {
id: control
diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml
index 6ba36d8a..d431695f 100644
--- a/src/imports/controls/imagine/RadioButton.qml
+++ b/src/imports/controls/imagine/RadioButton.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.RadioButton {
id: control
diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/imports/controls/imagine/RadioDelegate.qml
index c3febde2..5a8356f8 100644
--- a/src/imports/controls/imagine/RadioDelegate.qml
+++ b/src/imports/controls/imagine/RadioDelegate.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.RadioDelegate {
id: control
diff --git a/src/imports/controls/imagine/RangeSlider.qml b/src/imports/controls/imagine/RangeSlider.qml
index 5461cf01..47d90cf3 100644
--- a/src/imports/controls/imagine/RangeSlider.qml
+++ b/src/imports/controls/imagine/RangeSlider.qml
@@ -35,9 +35,9 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.Imagine 2.12
+import QtQuick.Controls.Imagine.impl 2.12
T.RangeSlider {
id: control
diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml
index 718faad4..fe4cbb36 100644
--- a/src/imports/controls/imagine/RoundButton.qml
+++ b/src/imports/controls/imagine/RoundButton.qml
@@ -35,11 +35,11 @@
****************************************************************************/
import QtQuick 2.12
-import QtQuick.Templates 2.5 as T
-import QtQuick.Controls 2.5
-import QtQuick.Controls.impl 2.5
-import QtQuick.Controls.Imagine 2.5
-import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Templates 2.12 as T