diff options
Diffstat (limited to 'src/imports/controls')
418 files changed, 1297 insertions, 1284 deletions
diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml index f3dda0af00..50ddb933a7 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 fe86213a64..996e9086a0 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 ae8772d680..89e72c8fcf 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 4ad9708296..4686a298e8 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 a79e26201f..ff5c191cbc 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 4132e3260a..a9e7fce63b 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 50d3b840db..cf0355ba7b 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 be4e62a6d3..c58399f759 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 3e58ffbb2f..71b390acb1 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 5cef9e5549..6b7fe0087e 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 1f30de4209..83ab957d33 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 ff1c0b08b1..a963a56330 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 024ebcfe21..1c545a71e6 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 37a9edbeb4..b6324db5e5 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 5f8d74c4a0..6c2e4b1b19 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 aa0353c03c..1b783b3bfc 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 0b882f901d..17465fd44c 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 9ada5273b6..2fe461040e 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 e16148bcfd..96f776f292 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 a7cc499dde..8cc12caba4 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 6c3c05d4ea..9a42635fcf 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 cebca827a2..041942f5c3 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 9e145b6aaa..122cdc5310 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 e1ba4a41f6..f6835412a8 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 7af280a396..22cdf3ea4a 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 43c421a3f2..cc5c2b6e8f 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 844f44d1e7..4b3cf3d26e 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 6985919bff..78f9e3cf76 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 ee715c8603..47b916e321 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 13de88a31f..ee243c10cd 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 c6b773ce10..61cdea43e3 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 02251239ca..726e88624c 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 3846cd34a6..a7e7dec004 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 6de74a9f5d..c3e7c96464 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 1164909437..825d52529a 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 c16b435623..1cff0afc5f 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 96099bf162..795c20ee73 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 572995755f..f775d62462 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 3d95cae9f0..6d532389ba 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 14a6ea524c..824ce061fd 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 5da0c54110..3e416b8716 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 146c357bf5..37d66bb664 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 9665b5ca0c..ad242e1acb 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 e798738521..522d9980fe 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 4d4602e8de..0abf764198 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 eb4c0ae2ba..83f6b3b277 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 b6a6317c7f..34a5a115c8 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 ff252bbaff..45790e67b2 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 aa57da8140..4d9cb6916e 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 1e73c0d6d3..1e07b6bf79 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 1c5b46625f..63aaf893e2 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 f2de5aa952..188d075835 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 e3af2ade42..ae903e4c98 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 0229dcf3f9..621f4113ad 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 3cc509257c..e8aa39c2ac 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 cf51efd2b6..7ae927fcc6 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 038abab7d0..fef460715e 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 7b5d0a2479..e094b9dfc9 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 f11c55a1fb..f76aa21590 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 d5c92d8751..1df55e1134 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 283538749e..76cde03eeb 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 c5fc678122..8a5e33b687 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 9a31069ade..896804c042 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 90dd381618..7c53ac7386 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 1eef1c6809..ccfd8853bc 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 3821edc2a6..40b673a13a 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 6c9bda34fc..c338fa9458 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 8b2cd97d2e..f17b6399d1 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 59b3299d83..3a705bcc00 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 6f46643921..a337bcee9a 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 6efb1bdc7b..5806398054 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 48cf8d0527..c832f894ba 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 2e24bd4293..a7dee28e57 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 f8bf09d48a..042672a9c2 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 32feedd707..2dca1100a3 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 57aa53aef7..80d154c93c 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 8b2cd97d2e..f17b6399d1 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 fb1eb838ac..c24d71db57 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 671218a82b..6137ad8cd4 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 6efb1bdc7b..5806398054 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 d1a815120c..79d2404f24 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 1c1eed4375..2da4cda6a3 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 4ce7668a2f..0f3d56d2bf 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 08a3f868ae..076d8a1c34 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 335b15db71..d6375d7cc4 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 1eef1c6809..ccfd8853bc 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 6efb1bdc7b..5806398054 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 ac91880ce9..02cc900ec5 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 c71cb13d58..f8c0dcc6da 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 671218a82b..6137ad8cd4 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 7a4984a1a3..f17e8e9ab3 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 671218a82b..6137ad8cd4 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 e8bed83d6d..a14584e796 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 5faeb914aa..67a63ec4e2 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 9c0a3da134..acf02e7b59 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 7b5d0a2479..e094b9dfc9 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 0bf088c78b..d0ebd57c96 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 0f1b2a748e..04507ef62e 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 1913e13178..11c7e80248 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 ad92acfcc7..93ba9c447a 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 f1cd4fb979..3145a6effa 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 32b0797aa5..f65593765d 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 870da26221..bc99bba7ad 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 fe87163914..1ff1f0a8ff 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 ed2a66213a..806655a340 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 985e6219b9..a32e9f5fa6 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 aa19ff1401..b8fbbf69b5 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 68e7ddad46..1bb68bdf2d 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 66b1fa770b..86c6a0b763 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 434386f1c7..0221350dc3 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 af03744d7f..c8a71e5b37 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 b43ce50600..be0e6f023c 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 f71371f829..2953c3712e 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 8e437957ac..f71f91cbc3 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 248de50dda..adfd803561 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 2c57ef1332..0e90f0aacc 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 d91d684e28..8f8f9c233c 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 bf5d4556fd..5f6ee59130 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 afefd3d823..7ccb55c3a3 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 90d34bde5e..67c68cf316 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 e19d28f309..d6ec5f788c 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 7965776b8d..8f483ed910 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 4d9607088f..e984fc71c3 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 baa43f53e1..fb68bb0430 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 a9107b1cbc..5191efce2f 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 472b2b39b6..cdbc16cceb 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 0bf01a4603..e15bc21636 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 01d2a1df73..003b562424 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 717491a264..955290fd8a 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 fc2be17920..ce8a0356c0 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 2d05b74aa0..5a702b9f62 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 513ad44093..ea27acf6fc 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 550680f694..87371877ee 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 ba2c59a8c0..ea2d6ae767 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 d59b337e3d..0712c5faa5 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 211697e0b0..8913e5bdb7 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 783f611e16..96fb606f27 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 ff97aa2fb6..7f828d9328 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 9f14cc0b8c..0a40c8b06b 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 7018227616..0eeec4d857 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 b2bb7ad491..dfe2eaa402 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 baedbb5314..9ed7a5b42a 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 8c1976d48c..9408cd66b3 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 593058c614..6d46b81008 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 0538484507..e23c14382c 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 6d77772d29..1361f09e43 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 d486943dbd..27ad9da23c 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 d66850c688..1c5db214ef 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 5506512507..4f727344c4 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 64a3a44bed..a4a66e9336 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 611e8f19c4..5efcb4610e 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 ff02a3440f..43e2853e40 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 fdcef9873d..942722a593 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 ce26e4a34d..6cb749e654 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 dba2f566e9..616c877d28 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 f4dcc21a9b..f1b99bca47 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 0d5686f3f5..9010f0aff8 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 9770de3391..26b0b5c4d8 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 b3eff14ff7..6907d67437 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 efd23100fb..f5c3397584 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 74c0e85c31..cbdf9eb8ec 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 26c7346246..7745892dfd 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 ab5ee1f379..ad05d46343 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 d8ae971ded..6f1bb55bf8 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 1943746aab..daa5496763 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 9eeb9017e2..32d39b9f41 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 5faff67bb1..cfeab812d2 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 c80b6e4d78..a9298460d6 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 4159e7f789..432fcc874d 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 a6936fe8de..6b71a5f0ba 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 7fa76f13d7..6e02c057de 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 d0303f9f47..40833ddeb0 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 6a61276748..1869a03270 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 51e6b0c21a..a7dd2eea40 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 726614d80a..1906082409 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 0aa275a721..c06c44c702 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 611195eaa2..01f0d87572 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 0c175f3bb7..628aef8027 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 bf8595b139..cbf6d72813 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 bfc8ac3439..0aae7d15e3 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 dc89d9cdb9..3ce856acaf 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 3a9aa2c554..e16c6bbf0b 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 b7987abd00..e48e0d6581 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 d7b06ab13f..18634d5e03 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 f66a92458e..5d8e067bc5 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 0ff83b671a..b0a04674e7 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 cbb08f23ed..3d26e510b3 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 baa970f912..e1c8c58037 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 e49c6dfecf..cf5bc70e4e 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 7071a31b4e..e26986cc3b 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 52300550d5..2ccfb43956 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 d53e3f9ee0..6a0a5b38c2 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 06af3f6040..812b5ba2c5 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 a571d72857..927d29c3c2 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 9e5d991a1e..508a417edb 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 fe96cea687..a4e92f880a 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 cc37d541d8..ee054106ca 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 b46aa12986..7d16d1393e 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 627806d27f..61e4ce01fd 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 52c3efdd2e..13130f971e 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 322dbf42ec..c54a18a00a 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 d73f98a95b..f22b53089a 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 8b71f25fb8..8c5b99a350 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 1885876d40..1f0d6bd02d 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 cabeb528d4..d50e4c83db 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 afe5611f55..cfcfa149f6 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 4708a4be9b..043aaed22a 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 fe3f27a904..fecad9279c 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 f24f82a98f..c7ad71cf51 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 a9916f60c5..6fed48669a 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 fa7874e50b..d9e34a5fb3 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 5f0f704cbd..db8a37a3c4 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 80bf9ef78a..f1bfb1c8a3 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 6abe832fce..9079403ec5 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 7afff2df4e..554c3368de 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 ca6d81a92b..7822634de3 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 fc1af2deaa..3250044b52 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 9b9dba185b..f90c80fb09 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 40f681642a..1b97b1fd38 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 8c49e6b2f5..314a6798b4 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 cafbdb022a..012dbbd0c5 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 c150bb2ef2..622de111df 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 fb248d5edb..423087c9f1 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 a079d09fd6..79e179d9e8 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 49446c3157..a0b0f243c2 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 f0ee02008b..5a23dde1ff 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 ffe816b42e..c2df635198 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 113725568e..3df3e1e60d 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 407078dde6..4c15ae6889 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 23e337e2e2..9821f71c98 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 fd64ed452a..e06b70fd66 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 81aaf9b589..4ba71feed6 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 85330a73df..9fa685dcc0 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 b8ebd5e62b..a428fbc8d2 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 904a15ef10..522ada150e 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 13f92c7a2f..796dff1c0a 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 fb3a5b89fd..5679b14f29 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 53d51bf7a0..69fbdca091 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 93c7afd3ca..25a8c5ae07 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 4e31d61187..5deade587d 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 ef5742015e..fed6fa7c4b 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 ddcb12179f..e8555a17e1 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 790a5e249b..4b67d24eff 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 17f4c62b4c..7edbed5763 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 a38d123f42..59bf4c16d2 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 154f540b77..e4fb794936 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 3f8668c554..efe0b2fa81 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 67ee73ccb1..d212a233b0 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 678ac8c260..c34217a899 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 9bfa45a12d..c53af57e6a 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 5ef01d8f03..fd77f9f38e 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 c5de54a8d7..48c531ea44 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 6406ba64ac..edcb36506e 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 6f07731e3e..0db13b41a5 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 7948a794a9..f89388c7af 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 3797e5739f..233a2acdfc 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 201e776380..136503b6b3 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 d2469d284f..c7107ac444 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 6f5f49b31b..d5b5788d2b 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 d569899de0..fa069c0b75 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 f198a18bfc..4c00b40275 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 f8047b817c..5d36665214 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 922789dd14..73f561e497 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 fd0d7ef3d3..6abf7b5aa0 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 107b4a2d4a..dcba73fe06 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 00922f63d8..7bfcc3f9fc 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 bd90d21a49..652365b16d 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 c8962a6b5b..e7171eb14b 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 3f0b768496..b91ceb40f2 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 2336131fa4..1997515282 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 530fa37894..6cae167a06 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 ef1f6511c7..f60b5eaeee 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 ac7a4645c4..f10634e69f 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 968f70abfa..730b7f573b 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 ec1cbde819..c24b29fc48 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 ea4f7337d7..2c93ba751f 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 b049715b10..2bef3c88a9 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 816e0c8c4b..7abdb6f05c 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 7ec07f5532..0b3edeaff9 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 f9a5bdb641..82c0ef475f 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 bf7540fd68..20a344670d 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 58dc344a17..f85fc657f2 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 3821a15aa5..9ed3908736 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 2fe6a01d72..07ec0a758f 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 7e9f43fef7..8da89f5a16 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 f794666ebe..970b22b94d 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 12b8300b06..8f69bef463 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 c809f308d3..2f78004ed0 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 6ba36d8a96..d431695f88 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 c3febde234..5a8356f878 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 5461cf0125..47d90cf3e1 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 718faad4b2..fe4cbb3663 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 +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.RoundButton { id: control diff --git a/src/imports/controls/imagine/ScrollBar.qml b/src/imports/controls/imagine/ScrollBar.qml index b7acf4163b..787ea66306 100644 --- a/src/imports/controls/imagine/ScrollBar.qml +++ b/src/imports/controls/imagine/ScrollBar.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.ScrollBar { id: control diff --git a/src/imports/controls/imagine/ScrollIndicator.qml b/src/imports/controls/imagine/ScrollIndicator.qml index fd1effa304..2fd578efd8 100644 --- a/src/imports/controls/imagine/ScrollIndicator.qml +++ b/src/imports/controls/imagine/ScrollIndicator.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.ScrollIndicator { id: control diff --git a/src/imports/controls/imagine/ScrollView.qml b/src/imports/controls/imagine/ScrollView.qml index 64fd3ac5b4..9d469ba535 100644 --- a/src/imports/controls/imagine/ScrollView.qml +++ b/src/imports/controls/imagine/ScrollView.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.ScrollView { id: control diff --git a/src/imports/controls/imagine/Slider.qml b/src/imports/controls/imagine/Slider.qml index f39bab701f..fe9c338880 100644 --- a/src/imports/controls/imagine/Slider.qml +++ b/src/imports/controls/imagine/Slider.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.Slider { id: control diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/imports/controls/imagine/SpinBox.qml index 866db7fc89..6113580676 100644 --- a/src/imports/controls/imagine/SpinBox.qml +++ b/src/imports/controls/imagine/SpinBox.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.SpinBox { id: control diff --git a/src/imports/controls/imagine/StackView.qml b/src/imports/controls/imagine/StackView.qml index 302816d744..407b1d15dd 100644 --- a/src/imports/controls/imagine/StackView.qml +++ b/src/imports/controls/imagine/StackView.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.StackView { id: control diff --git a/src/imports/controls/imagine/SwipeDelegate.qml b/src/imports/controls/imagine/SwipeDelegate.qml index be1a378eea..3850253f63 100644 --- a/src/imports/controls/imagine/SwipeDelegate.qml +++ b/src/imports/controls/imagine/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.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.SwipeDelegate { id: control diff --git a/src/imports/controls/imagine/SwipeView.qml b/src/imports/controls/imagine/SwipeView.qml index 6c94671557..4998edb7d8 100644 --- a/src/imports/controls/imagine/SwipeView.qml +++ b/src/imports/controls/imagine/SwipeView.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.SwipeView { id: control diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml index 2a144c855a..7d1f3a2a6d 100644 --- a/src/imports/controls/imagine/Switch.qml +++ b/src/imports/controls/imagine/Switch.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.Switch { id: control diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/imports/controls/imagine/SwitchDelegate.qml index a4f7e93e2b..e95023fb70 100644 --- a/src/imports/controls/imagine/SwitchDelegate.qml +++ b/src/imports/controls/imagine/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.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.SwitchDelegate { id: control diff --git a/src/imports/controls/imagine/TabBar.qml b/src/imports/controls/imagine/TabBar.qml index 20802da097..69516e03e4 100644 --- a/src/imports/controls/imagine/TabBar.qml +++ b/src/imports/controls/imagine/TabBar.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.TabBar { id: control diff --git a/src/imports/controls/imagine/TabButton.qml b/src/imports/controls/imagine/TabButton.qml index 71cd021f2f..1cdcfc4bd4 100644 --- a/src/imports/controls/imagine/TabButton.qml +++ b/src/imports/controls/imagine/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.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.TabButton { id: control diff --git a/src/imports/controls/imagine/TextArea.qml b/src/imports/controls/imagine/TextArea.qml index 94fe237c07..c7505b5209 100644 --- a/src/imports/controls/imagine/TextArea.qml +++ b/src/imports/controls/imagine/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.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.TextArea { id: control diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml index 2943396ea4..3ff0ad4431 100644 --- a/src/imports/controls/imagine/TextField.qml +++ b/src/imports/controls/imagine/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.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.TextField { id: control diff --git a/src/imports/controls/imagine/ToolBar.qml b/src/imports/controls/imagine/ToolBar.qml index f1cb3768ec..99bcd3ba97 100644 --- a/src/imports/controls/imagine/ToolBar.qml +++ b/src/imports/controls/imagine/ToolBar.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.ToolBar { id: control diff --git a/src/imports/controls/imagine/ToolButton.qml b/src/imports/controls/imagine/ToolButton.qml index e41c2cf844..cc22f88d29 100644 --- a/src/imports/controls/imagine/ToolButton.qml +++ b/src/imports/controls/imagine/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.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.ToolButton { id: control diff --git a/src/imports/controls/imagine/ToolSeparator.qml b/src/imports/controls/imagine/ToolSeparator.qml index 8961b25918..c0887e4d62 100644 --- a/src/imports/controls/imagine/ToolSeparator.qml +++ b/src/imports/controls/imagine/ToolSeparator.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.ToolSeparator { id: control diff --git a/src/imports/controls/imagine/ToolTip.qml b/src/imports/controls/imagine/ToolTip.qml index 2bcb4fa874..250452d8a4 100644 --- a/src/imports/controls/imagine/ToolTip.qml +++ b/src/imports/controls/imagine/ToolTip.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.ToolTip { id: control diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml index 80e8eb1f80..d49966b0ef 100644 --- a/src/imports/controls/imagine/Tumbler.qml +++ b/src/imports/controls/imagine/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.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.Tumbler { id: control diff --git a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp index 490825fff2..71c013d593 100644 --- a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp +++ b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp @@ -67,11 +67,11 @@ QtQuickControls2ImagineStylePlugin::QtQuickControls2ImagineStylePlugin(QObject * void QtQuickControls2ImagineStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.10 -> 2.3, 5.11 -> 2.4, ... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickImagineStyle>(uri, 2, 3, "Imagine", tr("Imagine is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.10 -> 2.3, 5.11 -> 2.4, ... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickAnimatedImageSelector>(import, 2, 3, "AnimatedImageSelector"); qmlRegisterType<QQuickImageSelector>(import, 2, 3, "ImageSelector"); diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 94aaeff3d5..6a10ed7fe1 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/material/BoxShadow.qml b/src/imports/controls/material/BoxShadow.qml index 5004c7f68e..5a746c0f9b 100644 --- a/src/imports/controls/material/BoxShadow.qml +++ b/src/imports/controls/material/BoxShadow.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 /* A implementation of CSS's box-shadow, used by ElevationEffect for a Material Design diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 1888766945..8173248cd2 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 62afe2cb0f..6f7d6c7011 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Button { id: control diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 3ba8c8878f..cad5ae9714 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index caf0f8e1b4..34495e2d8f 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index 67f4655167..673d6f484f 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Rectangle { id: indicatorItem diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 5db53d1c85..223f8fca2b 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -35,12 +35,12 @@ ****************************************************************************/ 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.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ComboBox { id: control diff --git a/src/imports/controls/material/CursorDelegate.qml b/src/imports/controls/material/CursorDelegate.qml index ffb3b3ddbf..f472e8ae59 100644 --- a/src/imports/controls/material/CursorDelegate.qml +++ b/src/imports/controls/material/CursorDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 +import QtQuick.Controls.Material 2.12 Rectangle { id: cursor diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml index fddd49e4e1..6b5ef3ad00 100644 --- a/src/imports/controls/material/DelayButton.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.DelayButton { id: control diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index ce6bbc4bfa..1148dd25db 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Dial { id: control diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 9426096e94..364c0e570d 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index eee9b88da5..c53b821034 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index 6721e10f2f..3d64cdef47 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Drawer { id: control diff --git a/src/imports/controls/material/ElevationEffect.qml b/src/imports/controls/material/ElevationEffect.qml index 7e5d79aad4..06b654a834 100644 --- a/src/imports/controls/material/ElevationEffect.qml +++ b/src/imports/controls/material/ElevationEffect.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 /* An effect for standard Material Design elevation shadows. Useful for using as \c layer.effect. diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 7af59ca100..0001825ea4 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Frame { id: control diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index b07bb12d51..e18a5949ec 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index b4839dd37d..2078ce6cb5 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index 49333e863f..ad923a24d5 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.Label { id: control diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 8f7c797ca8..d28713a712 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/material/MenuBar.qml b/src/imports/controls/material/MenuBar.qml index 74c5083de5..66252d6edb 100644 --- a/src/imports/controls/material/MenuBar.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/imports/controls/material/MenuBarItem.qml index eeb93fe4ce..588d6fbb7a 100644 --- a/src/imports/controls/material/MenuBarItem.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 1f9caf8d83..069ad21688 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/imports/controls/material/MenuSeparator.qml index 6eb597c3ed..6d80c04906 100644 --- a/src/imports/controls/material/MenuSeparator.qml +++ b/src/imports/controls/material/MenuSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 6e09f44fde..4da0ecc6e0 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.Page { id: control diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 5cfcce0412..5e6ca24520 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index af2c2642a4..988e225aae 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Pane { id: control diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 3d7039bbc9..1b576385c0 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Popup { id: control diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index 269ac65702..2848f0371f 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index 108ddbadd4..47bbbd808f 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 5cc238292d..edc93c2c24 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml index f69f31cca0..4be816ad49 100644 --- a/src/imports/controls/material/RadioIndicator.qml +++ b/src/imports/controls/material/RadioIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index 8c8a88b150..d735573a31 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index fafc92c765..13d0f9dbe4 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 01a33f9ef0..a376742dbc 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 5578f29ec3..19f23ad2d4 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index 33b333fee9..cc6a1413a8 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Slider { id: control diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml index 2ebbcccd7b..b3bdb80245 100644 --- a/src/imports/controls/material/SliderHandle.qml +++ b/src/imports/controls/material/SliderHandle.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Item { id: root diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index d0a09a100d..23c86bc3d5 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml index 6f76e2e337..dd5d6ce657 100644 --- a/src/imports/controls/material/StackView.qml +++ b/src/imports/controls/material/StackView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.StackView { id: control diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index fe03648623..d06799be02 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml index 62d8b1a9e5..12ea36aed0 100644 --- a/src/imports/controls/material/SwipeView.qml +++ b/src/imports/controls/material/SwipeView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.SwipeView { id: control diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index 677a57e8eb..fd0db9256c 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 +import QtQuick.Templates 2.12 as T T.Switch { id: control diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index 1f1e5ffab3..bae5171b69 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/material/SwitchIndicator.qml b/src/imports/controls/material/SwitchIndicator.qml index f75670596a..7fef407ce0 100644 --- a/src/imports/controls/material/SwitchIndicator.qml +++ b/src/imports/controls/material/SwitchIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Item { id: indicator diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 1e9444fbe0..98c9132ae5 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TabBar { id: control diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index c5cd8f9b15..5245652c23 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TabButton { id: control diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index ce49af5362..249b64017c 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TextArea { id: control diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 7aa612eb26..ed42b295d4 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TextField { id: control diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 9c09778b72..5b887598eb 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 55f1bd5239..69c424414e 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/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.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml index 8120ac5495..9436765733 100644 --- a/src/imports/controls/material/ToolSeparator.qml +++ b/src/imports/controls/material/ToolSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index ced62f475c..fb70536785 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index c35b771a9e..92e24430dd 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Material 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index d407af9406..eb0e6c878e 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -68,11 +68,11 @@ QtQuickControls2MaterialStylePlugin::QtQuickControls2MaterialStylePlugin(QObject void QtQuickControls2MaterialStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 2, 0, "Material", tr("Material is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickMaterialBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType<QQuickMaterialProgressBar>(import, 2, 0, "ProgressBarImpl"); diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 754e76ab1b..5bbbe422ed 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -119,7 +119,13 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) stylePlugin->initializeTheme(theme); qDeleteAll(stylePlugins); - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // Register the latest version, even if there are no new types or new revisions for existing types yet. + // Before Qt 5.12, we would do the following: + // + // qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // + // However, we want to align with the rest of Qt Quick which uses Qt's minor version. + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // QtQuick.Controls 2.0 (originally introduced in Qt 5.7) qmlRegisterType(resolvedUrl(QStringLiteral("AbstractButton.qml")), uri, 2, 0, "AbstractButton"); @@ -186,8 +192,14 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) qmlRegisterType(resolvedUrl(QStringLiteral("MenuBarItem.qml")), uri, 2, 3, "MenuBarItem"); qmlRegisterUncreatableType<QQuickOverlay>(uri, 2, 3, "Overlay", QStringLiteral("Overlay is only available as an attached property.")); + // Register the latest version, even if there are no new types or new revisions for existing types yet. + // Before Qt 5.12, we would do the following: + // + // qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // + // However, we want to align with the rest of Qt Quick which uses Qt's minor version. const QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // QtQuick.Controls.impl 2.0 (Qt 5.7) qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index 313b980e48..153b9e8e31 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index cc6f241d87..2ad21b4691 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 648b29506d..657b283532 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.Button { id: control diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index b0632da13a..b726339a59 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index 9809291953..7847f459e1 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/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.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml index cf8ce3c69f..0f535ea6aa 100644 --- a/src/imports/controls/universal/CheckIndicator.qml +++ b/src/imports/controls/universal/CheckIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 37b008bad6..2b6506823d 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ 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.Controls.Universal 2.5 +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ComboBox { id: control diff --git a/src/imports/controls/universal/DelayButton.qml b/src/imports/controls/universal/DelayButton.qml index 2df2e0b4dd..2a3a3b3a02 100644 --- a/src/imports/controls/universal/DelayButton.qml +++ b/src/imports/controls/universal/DelayButton.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.DelayButton { id: control diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index ae163cabb0..276c87d617 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Dial { id: control diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index bf7b274c24..6151d0908b 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 T.Dialog { id: control diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 84393a79aa..ac2dc5413e 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 6c824c8f65..7ec1d7f88a 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Drawer { id: control diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index e82c07734f..8bb4484996 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Frame { id: control diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index 792fcb9308..dc156dd798 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 656aa338d3..ed98540597 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml index 2e6bb1c38b..c66435c376 100644 --- a/src/imports/controls/universal/Label.qml +++ b/src/imports/controls/universal/Label.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Label { id: control diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 567b13aff2..619cfa4045 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/universal/MenuBar.qml b/src/imports/controls/universal/MenuBar.qml index f2a26a4603..2317f50581 100644 --- a/src/imports/controls/universal/MenuBar.qml +++ b/src/imports/controls/universal/MenuBar.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/universal/MenuBarItem.qml b/src/imports/controls/universal/MenuBarItem.qml index 34d9ad29df..30f1fc57f7 100644 --- a/src/imports/controls/universal/MenuBarItem.qml +++ b/src/imports/controls/universal/MenuBarItem.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 7b52300c8e..23d0ee3c52 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/imports/controls/universal/MenuSeparator.qml index 9e3b1d89ae..72f9f6f7f2 100644 --- a/src/imports/controls/universal/MenuSeparator.qml +++ b/src/imports/controls/universal/MenuSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index e09225e481..347d6d9a82 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Page { id: control diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index a89a7d07c6..3dcc84ab4a 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index d643bb7fc1..63a5ecec45 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Pane { id: control diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index 739fab68dd..e39134e12f 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Popup { id: control diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index 7403f74cb6..ce79bd5470 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index 7c8fdcc990..5a61c3f73c 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 2e068c4b96..d56cef3358 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/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.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/RadioIndicator.qml index 71cb7098d2..68d53d4525 100644 --- a/src/imports/controls/universal/RadioIndicator.qml +++ b/src/imports/controls/universal/RadioIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Controls.Universal 2.12 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index 57b30ea980..f2e4d71e9f 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 06455e0ce6..2eedf96eae 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 6cb7724519..d6a525f75f 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index b2dd6bbd22..ab66ee7c97 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 5ccf83b656..8f427b1ed3 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Slider { id: control diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 0ef08538e9..dfe927f582 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index c4cf70e7ab..5a3f7751ea 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.StackView { id: control diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 492e2e3acc..066049a789 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 538562bc44..962d515711 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 32e63cf5ff..bf6069f52a 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/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.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml index 12a71f1636..ad9a23e9ee 100644 --- a/src/imports/controls/universal/SwitchIndicator.qml +++ b/src/imports/controls/universal/SwitchIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 Item { implicitWidth: 44 diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index d2bdcfa16b..ab660c9329 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.TabBar { id: control diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index b512026a67..66e3d72556 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.TabButton { id: control diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 2d5934dffe..03ad4a89ea 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.TextArea { id: control diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 04e40fa5b0..ba5bf685f8 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.TextField { id: control diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index 539dcd2ebc..5a385e8e44 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 627464613e..f36dac2286 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ 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.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index 630fa8676d..ee8e6e1cbd 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 528d49b5ab..cf7325b653 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index cccd4224d5..f7338c2bec 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp index 1265f6362a..7a999b79a7 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp @@ -65,11 +65,11 @@ QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObje void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 2, 0, "Universal", tr("Universal is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle"); qmlRegisterType<QQuickUniversalBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); |