diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-10-23 15:23:58 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-02 16:45:04 +0000 |
| commit | 3c7bfc156797b2f3ef08a8cf620b79da80e4b061 (patch) | |
| tree | 8eb2cc945b9dab6792df6f8df59472440d998457 /src/imports | |
| parent | 70fe6a67e8fdff5bc5486c4fe5c0e44242e10427 (diff) | |
Tie minor version of all imports to Qt's minor version
This change makes all Qt Quick Controls 2 imports match the current
Qt minor version, which is 12 as of this patch.
It also updates all other Qt Quick imports to match.
This will also make future version bumps easier as all version numbers
in existing code/docs will match.
The following commands were used to verify that no old versions remain:
for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done
for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done
[ChangeLog] From Qt 5.12 onwards, all import versions in
Qt Quick Controls 2 follow the same minor version as Qt's
minor version number. For example, the import version for Qt 5.12 is:
"import QtQuick.Controls 2.12".
Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3
Fixes: QTBUG-71095
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports')
430 files changed, 1319 insertions, 1300 deletions
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 23e3c30e..2fc0d6f7 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractDayOfWeekRow { diff --git a/src/imports/calendar/MonthGrid.qml b/src/imports/calendar/MonthGrid.qml index 95e2a801..884ce65f 100644 --- a/src/imports/calendar/MonthGrid.qml +++ b/src/imports/calendar/MonthGrid.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractMonthGrid { diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index c46e25ae..e2c9d98b 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractWeekNumberColumn { diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml index 0a7f1688..6f6e8f2e 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml index d7e56384..2de76098 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml index c98372b4..e52ebb2d 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml index fed2cc5a..5710b4dd 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml index 4427d343..cdb7201e 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml index a8e5717b..18613f12 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml index 1d42c1c3..f086468b 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml index f3dda0af..50ddb933 100644 --- a/src/imports/controls/AbstractButton.qml +++ b/src/imports/controls/AbstractButton.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.AbstractButton { id: control diff --git a/src/imports/controls/Action.qml b/src/imports/controls/Action.qml index fe86213a..996e9086 100644 --- a/src/imports/controls/Action.qml +++ b/src/imports/controls/Action.qml @@ -35,6 +35,6 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.Action { } diff --git a/src/imports/controls/ActionGroup.qml b/src/imports/controls/ActionGroup.qml index ae8772d6..89e72c8f 100644 --- a/src/imports/controls/ActionGroup.qml +++ b/src/imports/controls/ActionGroup.qml @@ -35,6 +35,6 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.ActionGroup { } diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 4ad97082..4686a298 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ApplicationWindow { id: window diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index a79e2620..ff5c191c 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.BusyIndicator { id: control diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 4132e326..a9e7fce6 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Button { id: control diff --git a/src/imports/controls/ButtonGroup.qml b/src/imports/controls/ButtonGroup.qml index 50d3b840..cf0355ba 100644 --- a/src/imports/controls/ButtonGroup.qml +++ b/src/imports/controls/ButtonGroup.qml @@ -35,6 +35,6 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.ButtonGroup { } diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index be4e62a6..c58399f7 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index 3e58ffbb..71b390ac 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 5cef9e55..6b7fe008 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ComboBox { id: control diff --git a/src/imports/controls/Container.qml b/src/imports/controls/Container.qml index 1f30de42..83ab957d 100644 --- a/src/imports/controls/Container.qml +++ b/src/imports/controls/Container.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.Container { id: control diff --git a/src/imports/controls/Control.qml b/src/imports/controls/Control.qml index ff1c0b08..a963a563 100644 --- a/src/imports/controls/Control.qml +++ b/src/imports/controls/Control.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.Control { id: control diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml index 024ebcfe..1c545a71 100644 --- a/src/imports/controls/DelayButton.qml +++ b/src/imports/controls/DelayButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.DelayButton { id: control diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index 37a9edbe..b6324db5 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Dial { id: control diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml index 5f8d74c4..6c2e4b1b 100644 --- a/src/imports/controls/Dialog.qml +++ b/src/imports/controls/Dialog.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml index aa0353c0..1b783b3b 100644 --- a/src/imports/controls/DialogButtonBox.qml +++ b/src/imports/controls/DialogButtonBox.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.DialogButtonBox { id: control diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 0b882f90..17465fd4 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Drawer { id: control diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 9ada5273..2fe46104 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Frame { id: control diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index e16148bc..96f776f2 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.GroupBox { id: control diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index a7cc499d..8cc12cab 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ItemDelegate { id: control diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index 6c3c05d4..9a42635f 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Label { id: control diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index cebca827..041942f5 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/MenuBar.qml b/src/imports/controls/MenuBar.qml index 9e145b6a..122cdc53 100644 --- a/src/imports/controls/MenuBar.qml +++ b/src/imports/controls/MenuBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml index e1ba4a41..f6835412 100644 --- a/src/imports/controls/MenuBarItem.qml +++ b/src/imports/controls/MenuBarItem.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 7af280a3..22cdf3ea 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.MenuItem { id: control diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml index 43c421a3..cc5c2b6e 100644 --- a/src/imports/controls/MenuSeparator.qml +++ b/src/imports/controls/MenuSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.MenuSeparator { id: control diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index 844f44d1..4b3cf3d2 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Page { id: control diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 6985919b..78f9e3cf 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.PageIndicator { id: control diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml index ee715c86..47b916e3 100644 --- a/src/imports/controls/Pane.qml +++ b/src/imports/controls/Pane.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Pane { id: control diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml index 13de88a3..ee243c10 100644 --- a/src/imports/controls/Popup.qml +++ b/src/imports/controls/Popup.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Popup { id: control diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index c6b773ce..61cdea43 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 02251239..726e8862 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RadioButton { id: control diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index 3846cd34..a7e7dec0 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RadioDelegate { id: control diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 6de74a9f..c3e7c964 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RangeSlider { id: control diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml index 11649094..825d5252 100644 --- a/src/imports/controls/RoundButton.qml +++ b/src/imports/controls/RoundButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RoundButton { id: control diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index c16b4356..1cff0afc 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ScrollBar { id: control diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 96099bf1..795c20ee 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ScrollIndicator { id: control diff --git a/src/imports/controls/ScrollView.qml b/src/imports/controls/ScrollView.qml index 57299575..f775d624 100644 --- a/src/imports/controls/ScrollView.qml +++ b/src/imports/controls/ScrollView.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ScrollView { id: control diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 3d95cae9..6d532389 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Slider { id: control diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 14a6ea52..824ce061 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.SpinBox { id: control diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml index 5da0c541..3e416b87 100644 --- a/src/imports/controls/StackView.qml +++ b/src/imports/controls/StackView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T T.StackView { id: control diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index 146c357b..37d66bb6 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.SwipeDelegate { id: control diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index 9665b5ca..ad242e1a 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T T.SwipeView { id: control diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index e7987385..522d9980 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index 4d4602e8..0abf7641 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index eb4c0ae2..83f6b3b2 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.TabBar { id: control diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index b6a6317c..34a5a115 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.TabButton { id: control diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index ff252bba..45790e67 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.TextArea { id: control diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index aa57da81..4d9cb691 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.TextField { id: control diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index 1e73c0d6..1e07b6bf 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolBar { id: control diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 1c5b4662..63aaf893 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolButton { id: control diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml index f2de5aa9..188d0758 100644 --- a/src/imports/controls/ToolSeparator.qml +++ b/src/imports/controls/ToolSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolSeparator { id: control diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml index e3af2ade..ae903e4c 100644 --- a/src/imports/controls/ToolTip.qml +++ b/src/imports/controls/ToolTip.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolTip { id: control diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 0229dcf3..621f4113 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/imports/controls/designer/AbstractButtonSection.qml index 3cc50925..e8aa39c2 100644 --- a/src/imports/controls/designer/AbstractButtonSection.qml +++ b/src/imports/controls/designer/AbstractButtonSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("AbstractButton") diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/imports/controls/designer/BusyIndicatorSpecifics.qml index cf51efd2..7ae927fc 100644 --- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml +++ b/src/imports/controls/designer/BusyIndicatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml index 038abab7..fef46071 100644 --- a/src/imports/controls/designer/ButtonSection.qml +++ b/src/imports/controls/designer/ButtonSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { id: section diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/imports/controls/designer/ButtonSpecifics.qml index 7b5d0a24..e094b9df 100644 --- a/src/imports/controls/designer/ButtonSpecifics.qml +++ b/src/imports/controls/designer/ButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/imports/controls/designer/CheckBoxSpecifics.qml index f11c55a1..f76aa215 100644 --- a/src/imports/controls/designer/CheckBoxSpecifics.qml +++ b/src/imports/controls/designer/CheckBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/CheckDelegateSpecifics.qml b/src/imports/controls/designer/CheckDelegateSpecifics.qml index d5c92d87..1df55e11 100644 --- a/src/imports/controls/designer/CheckDelegateSpecifics.qml +++ b/src/imports/controls/designer/CheckDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/CheckSection.qml b/src/imports/controls/designer/CheckSection.qml index 28353874..76cde03e 100644 --- a/src/imports/controls/designer/CheckSection.qml +++ b/src/imports/controls/designer/CheckSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { SectionLayout { diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/imports/controls/designer/ComboBoxSpecifics.qml index c5fc6781..8a5e33b6 100644 --- a/src/imports/controls/designer/ComboBoxSpecifics.qml +++ b/src/imports/controls/designer/ComboBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ContainerSection.qml b/src/imports/controls/designer/ContainerSection.qml index 9a31069a..896804c0 100644 --- a/src/imports/controls/designer/ContainerSection.qml +++ b/src/imports/controls/designer/ContainerSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Container") diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml index 90dd3816..7c53ac73 100644 --- a/src/imports/controls/designer/ControlSection.qml +++ b/src/imports/controls/designer/ControlSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Control") diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/imports/controls/designer/ControlSpecifics.qml index 1eef1c68..ccfd8853 100644 --- a/src/imports/controls/designer/ControlSpecifics.qml +++ b/src/imports/controls/designer/ControlSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/DelayButtonSpecifics.qml b/src/imports/controls/designer/DelayButtonSpecifics.qml index 3821edc2..40b673a1 100644 --- a/src/imports/controls/designer/DelayButtonSpecifics.qml +++ b/src/imports/controls/designer/DelayButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/imports/controls/designer/DialSpecifics.qml index 6c9bda34..c338fa94 100644 --- a/src/imports/controls/designer/DialSpecifics.qml +++ b/src/imports/controls/designer/DialSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/imports/controls/designer/FrameSpecifics.qml index 8b2cd97d..f17b6399 100644 --- a/src/imports/controls/designer/FrameSpecifics.qml +++ b/src/imports/controls/designer/FrameSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/imports/controls/designer/GroupBoxSpecifics.qml index 59b3299d..3a705bcc 100644 --- a/src/imports/controls/designer/GroupBoxSpecifics.qml +++ b/src/imports/controls/designer/GroupBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ItemDelegateSection.qml b/src/imports/controls/designer/ItemDelegateSection.qml index 6f466439..a337bcee 100644 --- a/src/imports/controls/designer/ItemDelegateSection.qml +++ b/src/imports/controls/designer/ItemDelegateSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { id: section diff --git a/src/imports/controls/designer/ItemDelegateSpecifics.qml b/src/imports/controls/designer/ItemDelegateSpecifics.qml index 6efb1bdc..58063980 100644 --- a/src/imports/controls/designer/ItemDelegateSpecifics.qml +++ b/src/imports/controls/designer/ItemDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml index 48cf8d05..c832f894 100644 --- a/src/imports/controls/designer/LabelSpecifics.qml +++ b/src/imports/controls/designer/LabelSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/imports/controls/designer/PaddingSection.qml index 2e24bd42..a7dee28e 100644 --- a/src/imports/controls/designer/PaddingSection.qml +++ b/src/imports/controls/designer/PaddingSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Padding") diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml index f8bf09d4..042672a9 100644 --- a/src/imports/controls/designer/PageIndicatorSpecifics.qml +++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/PageSpecifics.qml b/src/imports/controls/designer/PageSpecifics.qml index 32feedd7..2dca1100 100644 --- a/src/imports/controls/designer/PageSpecifics.qml +++ b/src/imports/controls/designer/PageSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/PaneSection.qml b/src/imports/controls/designer/PaneSection.qml index 57aa53ae..80d154c9 100644 --- a/src/imports/controls/designer/PaneSection.qml +++ b/src/imports/controls/designer/PaneSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Pane") diff --git a/src/imports/controls/designer/PaneSpecifics.qml b/src/imports/controls/designer/PaneSpecifics.qml index 8b2cd97d..f17b6399 100644 --- a/src/imports/controls/designer/PaneSpecifics.qml +++ b/src/imports/controls/designer/PaneSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/imports/controls/designer/ProgressBarSpecifics.qml index fb1eb838..c24d71db 100644 --- a/src/imports/controls/designer/ProgressBarSpecifics.qml +++ b/src/imports/controls/designer/ProgressBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/imports/controls/designer/RadioButtonSpecifics.qml index 671218a8..6137ad8c 100644 --- a/src/imports/controls/designer/RadioButtonSpecifics.qml +++ b/src/imports/controls/designer/RadioButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RadioDelegateSpecifics.qml b/src/imports/controls/designer/RadioDelegateSpecifics.qml index 6efb1bdc..58063980 100644 --- a/src/imports/controls/designer/RadioDelegateSpecifics.qml +++ b/src/imports/controls/designer/RadioDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RangeSliderSpecifics.qml b/src/imports/controls/designer/RangeSliderSpecifics.qml index d1a81512..79d2404f 100644 --- a/src/imports/controls/designer/RangeSliderSpecifics.qml +++ b/src/imports/controls/designer/RangeSliderSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RoundButtonSpecifics.qml b/src/imports/controls/designer/RoundButtonSpecifics.qml index 1c1eed43..2da4cda6 100644 --- a/src/imports/controls/designer/RoundButtonSpecifics.qml +++ b/src/imports/controls/designer/RoundButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ScrollViewSpecifics.qml b/src/imports/controls/designer/ScrollViewSpecifics.qml index 4ce7668a..0f3d56d2 100644 --- a/src/imports/controls/designer/ScrollViewSpecifics.qml +++ b/src/imports/controls/designer/ScrollViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml index 08a3f868..076d8a1c 100644 --- a/src/imports/controls/designer/SliderSpecifics.qml +++ b/src/imports/controls/designer/SliderSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SpinBoxSpecifics.qml b/src/imports/controls/designer/SpinBoxSpecifics.qml index 335b15db..d6375d7c 100644 --- a/src/imports/controls/designer/SpinBoxSpecifics.qml +++ b/src/imports/controls/designer/SpinBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/StackViewSpecifics.qml b/src/imports/controls/designer/StackViewSpecifics.qml index 1eef1c68..ccfd8853 100644 --- a/src/imports/controls/designer/StackViewSpecifics.qml +++ b/src/imports/controls/designer/StackViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwipeDelegateSpecifics.qml b/src/imports/controls/designer/SwipeDelegateSpecifics.qml index 6efb1bdc..58063980 100644 --- a/src/imports/controls/designer/SwipeDelegateSpecifics.qml +++ b/src/imports/controls/designer/SwipeDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwipeViewSpecifics.qml b/src/imports/controls/designer/SwipeViewSpecifics.qml index ac91880c..02cc900e 100644 --- a/src/imports/controls/designer/SwipeViewSpecifics.qml +++ b/src/imports/controls/designer/SwipeViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwitchDelegateSpecifics.qml b/src/imports/controls/designer/SwitchDelegateSpecifics.qml index c71cb13d..f8c0dcc6 100644 --- a/src/imports/controls/designer/SwitchDelegateSpecifics.qml +++ b/src/imports/controls/designer/SwitchDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/imports/controls/designer/SwitchSpecifics.qml index 671218a8..6137ad8c 100644 --- a/src/imports/controls/designer/SwitchSpecifics.qml +++ b/src/imports/controls/designer/SwitchSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TabBarSpecifics.qml b/src/imports/controls/designer/TabBarSpecifics.qml index 7a4984a1..f17e8e9a 100644 --- a/src/imports/controls/designer/TabBarSpecifics.qml +++ b/src/imports/controls/designer/TabBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TabButtonSpecifics.qml b/src/imports/controls/designer/TabButtonSpecifics.qml index 671218a8..6137ad8c 100644 --- a/src/imports/controls/designer/TabButtonSpecifics.qml +++ b/src/imports/controls/designer/TabButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml index e8bed83d..a14584e7 100644 --- a/src/imports/controls/designer/TextAreaSpecifics.qml +++ b/src/imports/controls/designer/TextAreaSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml index 5faeb914..67a63ec4 100644 --- a/src/imports/controls/designer/TextFieldSpecifics.qml +++ b/src/imports/controls/designer/TextFieldSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/imports/controls/designer/ToolBarSpecifics.qml index 9c0a3da1..acf02e7b 100644 --- a/src/imports/controls/designer/ToolBarSpecifics.qml +++ b/src/imports/controls/designer/ToolBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/imports/controls/designer/ToolButtonSpecifics.qml index 7b5d0a24..e094b9df 100644 --- a/src/imports/controls/designer/ToolButtonSpecifics.qml +++ b/src/imports/controls/designer/ToolButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ToolSeparatorSpecifics.qml b/src/imports/controls/designer/ToolSeparatorSpecifics.qml index 0bf088c7..d0ebd57c 100644 --- a/src/imports/controls/designer/ToolSeparatorSpecifics.qml +++ b/src/imports/controls/designer/ToolSeparatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TumblerSpecifics.qml b/src/imports/controls/designer/TumblerSpecifics.qml index 0f1b2a74..04507ef6 100644 --- a/src/imports/controls/designer/TumblerSpecifics.qml +++ b/src/imports/controls/designer/TumblerSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml index 1913e131..11c7e802 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { //! [action] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml index ad92acfc..93ba9c44 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 BusyIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml index f1cd4fb9..3145a6ef 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml index 32b0797a..f6559376 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml index 870da262..bc99bba7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { text: "Button" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml index fe871639..1ff1f0a8 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { text: "Button" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml index ed2a6621..806655a3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml index 985e6219..a32e9f5f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Column { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml index aa19ff14..b8fbbf69 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml index 68e7ddad..1bb68bdf 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ComboBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml index 66b1fa77..86c6a0b7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 DelayButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml index 434386f1..0221350d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dial { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml index af03744d..c8a71e5b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml index b43ce506..be0e6f02 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml index f71371f8..2953c371 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml index 8e437957..f71f91cb 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] DialogButtonBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml index 248de50d..adfd8035 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] DialogButtonBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml index 2c57ef13..0e90f0aa 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Frame { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml index d91d684e..8f8f9c23 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] Frame { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml index bf5d4556..5f6ee591 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml index afefd3d8..7ccb55c3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 GroupBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml index 90d34bde..67c68cf3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml index e19d28f3..d6ec5f78 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ItemDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml index 7965776b..8f483ed9 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml index 4d960708..e984fc71 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Label { text: qsTr("Label") diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml index baa43f53..fb68bb04 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Label { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml index a9107b1c..5191efce 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml index 472b2b39..cdbc16cc 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml index 0bf01a46..e15bc216 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { contentWidth: 120 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml index 01d2a1df..003b5624 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml index 717491a2..955290fd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml index fc2be179..ce8a0356 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Layouts 1.12 Pane { implicitWidth: 400 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml index 2d05b74a..5a702b9f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml index 513ad440..ea27acf6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml index 550680f6..87371877 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [begin] ApplicationWindow { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml index ba2c59a8..ea2d6ae7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml index d59b337e..0712c5fa 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml index 211697e0..8913e5bd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.2 Item { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml index 783f611e..96fb606f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.2 Item { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml index ff97aa2f..7f828d93 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 PageIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml index 9f14cc0b..0a40c8b0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Pane { //! [1] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml index 70182276..0eeec4d8 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml @@ -24,8 +24,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] PageIndicator { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml index b2bb7ad4..dfe2eaa4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Pane { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml index baedbb53..9ed7a5b4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] Pane { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml index 8c1976d4..9408cd66 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.2 Item { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml index 593058c6..6d46b810 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick.Controls 2.12 Item { //! [centerIn] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml index 05384845..e23c1438 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ProgressBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml index 6d77772d..1361f09e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml index d486943d..27ad9da2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml index d66850c6..1c5db214 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RangeSlider { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml index 55065125..4f727344 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] RoundButton { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml index 64a3a44b..a4a66e93 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml index 611e8f19..5efcb461 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml index ff02a344..43e2853e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml index fdcef987..942722a5 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Flickable { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml index ce26e4a3..6cb749e6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml index dba2f566..616c877d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml index f4dcc21a..f1b99bca 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml index 0d5686f3..9010f0af 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml index 9770de33..26b0b5c4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [file] ScrollView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml index b3eff14f..6907d674 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml index efd23100..f5c33975 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [file] ScrollView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml index 74c0e85c..cbdf9eb8 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Rectangle { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml index 26c73462..7745892d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Slider { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml index ab5ee1f3..ad05d463 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SpinBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml index d8ae971d..6f1bb55b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml index 1943746a..daa54967 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml index 9eeb9017..32d39b9f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml index 5faff67b..cfeab812 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 StackView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml index c80b6e4d..a9298460 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] StackView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml index 4159e7f7..432fcc87 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml index a6936fe8..6b71a5f0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SwipeDelegate { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml index 7fa76f13..6e02c057 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml index d0303f9f..40833dde 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml index 6a612767..1869a032 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml index 51e6b0c2..a7dd2eea 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Switch { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml index 726614d8..19060824 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwitchDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml index 0aa275a7..c06c44c7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TabBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml index 611195ea..01f0d875 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 360 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml index 0c175f3b..628aef80 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 360 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml index bf8595b1..cbf6d728 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Column { width: 300 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml index bfc8ac34..0aae7d15 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] TabBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml index dc89d9cd..3ce856ac 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextArea { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml index 3a9aa2c5..e16c6bbf 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml index b7987abd..e48e0d65 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml index d7b06ab1..18634d5e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml index f66a9245..5d8e067b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml index 0ff83b67..b0a04674 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml index cbb08f23..3d26e510 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml index baa970f9..e1c8c580 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Item { width: children[0].implicitWidth * 2 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml index e49c6dfe..cf5bc70e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml index 7071a31b..e26986cc 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml index 52300550..2ccfb439 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [1] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml index d53e3f9e..6a0a5b38 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { ToolTip { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml index 06af3f60..812b5ba2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Button { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml index a571d728..927d29c3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Button { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml index 9e5d991a..508a417e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml index fe96cea6..a4e92f88 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml index cc37d541..ee054106 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Tumbler { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml index b46aa129..7d16d139 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [contentItem] Tumbler { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml index 627806d2..61e4ce01 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [contentItem] Tumbler { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml index 52c3efdd..13130f97 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml @@ -26,9 +26,9 @@ ****************************************************************************/ //! [tumbler] -import QtQuick 2.8 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Rectangle { width: frame.implicitWidth + 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml index 322dbf42..c54a18a0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml index d73f98a9..f22b5308 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml index 8b71f25f..8c5b99a3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml index 1885876d..1f0d6bd0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index cabeb528..d50e4c83 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -47,9 +47,9 @@ can override the \l {Control::}{background} item and set the radius property of Rectangle: - \qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { width: 400 @@ -91,8 +91,8 @@ module itself, we'll call the file \c MyButton.qml. To use the control in your application, refer to it by its filename: - \qml - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick.Controls 2.\1 ApplicationWindow { MyButton { @@ -107,8 +107,8 @@ subfolder in your project named (for example) \c controls. To use the control, first import the folder into a namespace: - \qml - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick.Controls 2.\1 import "controls" as MyControls ApplicationWindow { @@ -328,9 +328,9 @@ Next, we add a drop shadow to the \l {Control::}{background} delegate of the Button: - \code + \code \QtMinorVersion // ... - import QtGraphicalEffects 1.0 + import QtGraphicalEffects 1.\1 import MyStyle 1.0 // ... @@ -359,9 +359,9 @@ To try out the attached property, we create a \l Row with two Buttons in \c main.qml: - \qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 import MyStyle 1.0 @@ -416,9 +416,9 @@ to customize the \l {ApplicationWindow::overlay}{modal} and \l {ApplicationWindow::overlay}{modeless} items. - \code - import QtQuick 2.7 - import QtQuick.Controls 2.0 + \code \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { visible: true @@ -580,8 +580,8 @@ \image qtquickcontrols2-menu-custom.png \quotefromfile qtquickcontrols2-menu-custom.qml - \skipto import QtQuick 2.10 - \printuntil import QtQuick.Controls 2.3 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto Menu \printto eof @@ -595,8 +595,8 @@ \image qtquickcontrols2-menubar-custom.png \quotefromfile qtquickcontrols2-menubar-custom.qml - \skipto import QtQuick 2.10 - \printuntil import QtQuick.Controls 2.3 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto MenuBar \printto eof @@ -627,8 +627,8 @@ \image qtquickcontrols2-popup-custom.png \quotefromfile qtquickcontrols2-popup-custom.qml - \skipto import QtQuick 2.6 - \printuntil import QtQuick.Controls 2.0 + \skipto import QtQuick 2.12 + \printuntil import QtQuick.Controls 2.12 \codeline \skipto Popup \printuntil { @@ -853,8 +853,8 @@ and \l {Popup::contentItem}{content item}. \quotefromfile qtquickcontrols2-tooltip-custom.qml - \skipto import QtQuick 2.6 - \printuntil import QtQuick.Controls 2.1 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto ToolTip \printuntil } \printuntil } diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc index afe5611f..cfcfa149 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc @@ -59,10 +59,10 @@ \c material selector will be present and the \c +material/CustomButton.qml version will be used instead. - \code + \code \QtMinorVersion // main.qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { id: window @@ -78,10 +78,10 @@ The base implementation of the custom button is a simple rounded flat button. - \code + \code \QtMinorVersion // CustomButton.qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 Button { id: control @@ -99,12 +99,12 @@ Material style, requests a dark theme to get light text, and creates a drop shadow for the background. - \code + \code \QtMinorVersion // +material/CustomButton.qml - import QtQuick 2.6 - import QtGraphicalEffects 1.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Material 2.1 + import QtQuick 2.\1 + import QtGraphicalEffects 1.\1 + import QtQuick.Controls 2.\1 + import QtQuick.Controls.Material 2.\1 Button { id: control diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc index 4708a4be..043aaed2 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc @@ -62,8 +62,8 @@ \row \li \qml - import QtQuick 2.7 - import QtQuick.Controls 2.3 + import QtQuick 2.12 + import QtQuick.Controls 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc index fe3f27a9..fecad927 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc @@ -31,9 +31,9 @@ A basic example of a QML file that makes use of controls is shown here: - \qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { title: "My Application" diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc index f24f82a9..c7ad71cf 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc @@ -31,7 +31,7 @@ The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...} - \styleimport {QtQuick.Controls.Imagine 2.5} {Qt 5.10} + \styleimport {QtQuick.Controls.Imagine 2.12} {Qt 5.10} \section1 Attached Properties @@ -2431,9 +2431,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.3 - import QtQuick.Controls.Imagine 2.3 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Imagine 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index a9916f60..6fed4866 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -46,8 +46,8 @@ The \l{Qt Quick Controls 2 QML Types}{QML types} can be imported into your application using the following import statement in your \c {.qml} file: - \code - import QtQuick.Controls 2.5 + \code \QtMinorVersion + import QtQuick.Controls 2.\1 \endcode The \l{Qt Quick Controls 2 C++ Classes}{C++ classes} can be included into @@ -78,7 +78,8 @@ \section1 Versions Qt Quick Controls 2.0 was introduced in Qt 5.7. Subsequent minor Qt releases - increment the import version of the Qt Quick Controls 2 modules by one. The + increment the import version of the Qt Quick Controls 2 modules by one, + until Qt 5.12, where the import versions match Qt's minor version. The experimental Qt Labs modules use import version 1.0. \table @@ -119,7 +120,7 @@ \row \li 5.12 \li 2.12 - \li 2.5 + \li 2.12 \li 1.0 \row \li ... diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index fa7874e5..d9e34a5f 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -32,7 +32,7 @@ The Material Style is based on the Google Material Design Guidelines. \l{detailed-desc-material}{More...} - \styleimport {QtQuick.Controls.Material 2.5} {Qt 5.7} + \styleimport {QtQuick.Controls.Material 2.12} {Qt 5.7} \section1 Attached Properties @@ -93,9 +93,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Material 2.1 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Material 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index 5f0f704c..db8a37a3 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -39,8 +39,8 @@ Qt Quick Controls 2 QML types can be imported into your application using the following import statement in your .qml file: - \badcode - import QtQuick.Controls 2.5 + \badcode \QtMinorVersion + import QtQuick.Controls 2.\1 \endcode \section1 QML Types diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 80bf9ef7..f1bfb1c8 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -32,7 +32,7 @@ The Universal Style is based on the Microsoft Universal Design Guidelines. \l {detailed-desc-universal}{More...} - \styleimport {QtQuick.Controls.Universal 2.5} {Qt 5.7} + \styleimport {QtQuick.Controls.Universal 2.12} {Qt 5.7} \section1 Attached Properties @@ -92,9 +92,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Universal 2.1 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Universal 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/fusion/ApplicationWindow.qml b/src/imports/controls/fusion/ApplicationWindow.qml index 6abe832f..9079403e 100644 --- a/src/imports/controls/fusion/ApplicationWindow.qml +++ b/src/imports/controls/fusion/ApplicationWindow.qml @@ -36,9 +36,9 @@ import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/imports/controls/fusion/BusyIndicator.qml index 7afff2df..554c3368 100644 --- a/src/imports/controls/fusion/BusyIndicator.qml +++ b/src/imports/controls/fusion/BusyIndicator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/fusion/Button.qml b/src/imports/controls/fusion/Button.qml index ca6d81a9..7822634d 100644 --- a/src/imports/controls/fusion/Button.qml +++ b/src/imports/controls/fusion/Button.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Button { id: control diff --git a/src/imports/controls/fusion/ButtonPanel.qml b/src/imports/controls/fusion/ButtonPanel.qml index fc1af2de..3250044b 100644 --- a/src/imports/controls/fusion/ButtonPanel.qml +++ b/src/imports/controls/fusion/ButtonPanel.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: panel diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml index 9b9dba18..f90c80fb 100644 --- a/src/imports/controls/fusion/CheckBox.qml +++ b/src/imports/controls/fusion/CheckBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/fusion/CheckDelegate.qml b/src/imports/controls/fusion/CheckDelegate.qml index 40f68164..1b97b1fd 100644 --- a/src/imports/controls/fusion/CheckDelegate.qml +++ b/src/imports/controls/fusion/CheckDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/fusion/CheckIndicator.qml b/src/imports/controls/fusion/CheckIndicator.qml index 8c49e6b2..314a6798 100644 --- a/src/imports/controls/fusion/CheckIndicator.qml +++ b/src/imports/controls/fusion/CheckIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: indicator diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index cafbdb02..012dbbd0 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -35,12 +35,12 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ComboBox { id: control diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml index c150bb2e..622de111 100644 --- a/src/imports/controls/fusion/DelayButton.qml +++ b/src/imports/controls/fusion/DelayButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.DelayButton { id: control diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml index fb248d5e..423087c9 100644 --- a/src/imports/controls/fusion/Dial.qml +++ b/src/imports/controls/fusion/Dial.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Dial { id: control diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml index a079d09f..79e179d9 100644 --- a/src/imports/controls/fusion/Dialog.qml +++ b/src/imports/controls/fusion/Dialog.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/fusion/DialogButtonBox.qml b/src/imports/controls/fusion/DialogButtonBox.qml index 49446c31..a0b0f243 100644 --- a/src/imports/controls/fusion/DialogButtonBox.qml +++ b/src/imports/controls/fusion/DialogButtonBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/fusion/Drawer.qml b/src/imports/controls/fusion/Drawer.qml index f0ee0200..5a23dde1 100644 --- a/src/imports/controls/fusion/Drawer.qml +++ b/src/imports/controls/fusion/Drawer.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Drawer { id: control diff --git a/src/imports/controls/fusion/Frame.qml b/src/imports/controls/fusion/Frame.qml index ffe816b4..c2df6351 100644 --- a/src/imports/controls/fusion/Frame.qml +++ b/src/imports/controls/fusion/Frame.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Frame { id: control diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/imports/controls/fusion/GroupBox.qml index 11372556..3df3e1e6 100644 --- a/src/imports/controls/fusion/GroupBox.qml +++ b/src/imports/controls/fusion/GroupBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/fusion/ItemDelegate.qml b/src/imports/controls/fusion/ItemDelegate.qml index 407078dd..4c15ae68 100644 --- a/src/imports/controls/fusion/ItemDelegate.qml +++ b/src/imports/controls/fusion/ItemDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/fusion/Label.qml b/src/imports/controls/fusion/Label.qml index 23e337e2..9821f71c 100644 --- a/src/imports/controls/fusion/Label.qml +++ b/src/imports/controls/fusion/Label.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Label { id: control diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml index fd64ed45..e06b70fd 100644 --- a/src/imports/controls/fusion/Menu.qml +++ b/src/imports/controls/fusion/Menu.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/fusion/MenuBar.qml b/src/imports/controls/fusion/MenuBar.qml index 81aaf9b5..4ba71fee 100644 --- a/src/imports/controls/fusion/MenuBar.qml +++ b/src/imports/controls/fusion/MenuBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/fusion/MenuBarItem.qml b/src/imports/controls/fusion/MenuBarItem.qml index 85330a73..9fa685dc 100644 --- a/src/imports/controls/fusion/MenuBarItem.qml +++ b/src/imports/controls/fusion/MenuBarItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/fusion/MenuItem.qml b/src/imports/controls/fusion/MenuItem.qml index b8ebd5e6..a428fbc8 100644 --- a/src/imports/controls/fusion/MenuItem.qml +++ b/src/imports/controls/fusion/MenuItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/imports/controls/fusion/MenuSeparator.qml index 904a15ef..522ada15 100644 --- a/src/imports/controls/fusion/MenuSeparator.qml +++ b/src/imports/controls/fusion/MenuSeparator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml index 13f92c7a..796dff1c 100644 --- a/src/imports/controls/fusion/Page.qml +++ b/src/imports/controls/fusion/Page.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Page { id: control diff --git a/src/imports/controls/fusion/PageIndicator.qml b/src/imports/controls/fusion/PageIndicator.qml index fb3a5b89..5679b14f 100644 --- a/src/imports/controls/fusion/PageIndicator.qml +++ b/src/imports/controls/fusion/PageIndicator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/fusion/Pane.qml b/src/imports/controls/fusion/Pane.qml index 53d51bf7..69fbdca0 100644 --- a/src/imports/controls/fusion/Pane.qml +++ b/src/imports/controls/fusion/Pane.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Pane { id: control diff --git a/src/imports/controls/fusion/Popup.qml b/src/imports/controls/fusion/Popup.qml index 93c7afd3..25a8c5ae 100644 --- a/src/imports/controls/fusion/Popup.qml +++ b/src/imports/controls/fusion/Popup.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Popup { id: control diff --git a/src/imports/controls/fusion/ProgressBar.qml b/src/imports/controls/fusion/ProgressBar.qml index 4e31d611..5deade58 100644 --- a/src/imports/controls/fusion/ProgressBar.qml +++ b/src/imports/controls/fusion/ProgressBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml index ef574201..fed6fa7c 100644 --- a/src/imports/controls/fusion/RadioButton.qml +++ b/src/imports/controls/fusion/RadioButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/fusion/RadioDelegate.qml b/src/imports/controls/fusion/RadioDelegate.qml index ddcb1217..e8555a17 100644 --- a/src/imports/controls/fusion/RadioDelegate.qml +++ b/src/imports/controls/fusion/RadioDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/fusion/RadioIndicator.qml b/src/imports/controls/fusion/RadioIndicator.qml index 790a5e24..4b67d24e 100644 --- a/src/imports/controls/fusion/RadioIndicator.qml +++ b/src/imports/controls/fusion/RadioIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: indicator diff --git a/src/imports/controls/fusion/RangeSlider.qml b/src/imports/controls/fusion/RangeSlider.qml index 17f4c62b..7edbed57 100644 --- a/src/imports/controls/fusion/RangeSlider.qml +++ b/src/imports/controls/fusion/RangeSlider.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/imports/controls/fusion/RoundButton.qml index a38d123f..59bf4c16 100644 --- a/src/imports/controls/fusion/RoundButton.qml +++ b/src/imports/controls/fusion/RoundButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/imports/controls/fusion/ScrollBar.qml index 154f540b..e4fb7949 100644 --- a/src/imports/controls/fusion/ScrollBar.qml +++ b/src/imports/controls/fusion/ScrollBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/fusion/ScrollIndicator.qml b/src/imports/controls/fusion/ScrollIndicator.qml index 3f8668c5..efe0b2fa 100644 --- a/src/imports/controls/fusion/ScrollIndicator.qml +++ b/src/imports/controls/fusion/ScrollIndicator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/fusion/Slider.qml b/src/imports/controls/fusion/Slider.qml index 67ee73cc..d212a233 100644 --- a/src/imports/controls/fusion/Slider.qml +++ b/src/imports/controls/fusion/Slider.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Slider { id: control diff --git a/src/imports/controls/fusion/SliderGroove.qml b/src/imports/controls/fusion/SliderGroove.qml index 678ac8c2..c34217a8 100644 --- a/src/imports/controls/fusion/SliderGroove.qml +++ b/src/imports/controls/fusion/SliderGroove.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: groove diff --git a/src/imports/controls/fusion/SliderHandle.qml b/src/imports/controls/fusion/SliderHandle.qml index 9bfa45a1..c53af57e 100644 --- a/src/imports/controls/fusion/SliderHandle.qml +++ b/src/imports/controls/fusion/SliderHandle.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: handle diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/imports/controls/fusion/SpinBox.qml index 5ef01d8f..fd77f9f3 100644 --- a/src/imports/controls/fusion/SpinBox.qml +++ b/src/imports/controls/fusion/SpinBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/fusion/SwipeDelegate.qml b/src/imports/controls/fusion/SwipeDelegate.qml index c5de54a8..48c531ea 100644 --- a/src/imports/controls/fusion/SwipeDelegate.qml +++ b/src/imports/controls/fusion/SwipeDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml index 6406ba64..edcb3650 100644 --- a/src/imports/controls/fusion/Switch.qml +++ b/src/imports/controls/fusion/Switch.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/imports/controls/fusion/SwitchDelegate.qml index 6f07731e..0db13b41 100644 --- a/src/imports/controls/fusion/SwitchDelegate.qml +++ b/src/imports/controls/fusion/SwitchDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/fusion/SwitchIndicator.qml b/src/imports/controls/fusion/SwitchIndicator.qml index 7948a794..f89388c7 100644 --- a/src/imports/controls/fusion/SwitchIndicator.qml +++ b/src/imports/controls/fusion/SwitchIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: indicator diff --git a/src/imports/controls/fusion/TabBar.qml b/src/imports/controls/fusion/TabBar.qml index 3797e573..233a2acd 100644 --- a/src/imports/controls/fusion/TabBar.qml +++ b/src/imports/controls/fusion/TabBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TabBar { id: control diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml index 201e7763..136503b6 100644 --- a/src/imports/controls/fusion/TabButton.qml +++ b/src/imports/controls/fusion/TabButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TabButton { id: control diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml index d2469d28..c7107ac4 100644 --- a/src/imports/controls/fusion/TextArea.qml +++ b/src/imports/controls/fusion/TextArea.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TextArea { id: control diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml index 6f5f49b3..d5b5788d 100644 --- a/src/imports/controls/fusion/TextField.qml +++ b/src/imports/controls/fusion/TextField.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TextField { id: control diff --git a/src/imports/controls/fusion/ToolBar.qml b/src/imports/controls/fusion/ToolBar.qml index d569899d..fa069c0b 100644 --- a/src/imports/controls/fusion/ToolBar.qml +++ b/src/imports/controls/fusion/ToolBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/fusion/ToolButton.qml b/src/imports/controls/fusion/ToolButton.qml index f198a18b..4c00b402 100644 --- a/src/imports/controls/fusion/ToolButton.qml +++ b/src/imports/controls/fusion/ToolButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/imports/controls/fusion/ToolSeparator.qml index f8047b81..5d366652 100644 --- a/src/imports/controls/fusion/ToolSeparator.qml +++ b/src/imports/controls/fusion/ToolSeparator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/imports/controls/fusion/ToolTip.qml index 922789dd..73f561e4 100644 --- a/src/imports/controls/fusion/ToolTip.qml +++ b/src/imports/controls/fusion/ToolTip.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml index fd0d7ef3..6abf7b5a 100644 --- a/src/imports/controls/fusion/Tumbler.qml +++ b/src/imports/controls/fusion/Tumbler.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp index 107b4a2d..dcba73fe 100644 --- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp +++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp @@ -73,10 +73,10 @@ QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *pa void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri) { qmlRegisterModule(uri, 2, 3); // Qt 5.10->2.3 - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterSingletonType<QQuickFusionStyle>(import, 2, 3, "Fusion", styleSingleton); diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/imports/controls/imagine/ApplicationWindow.qml index 00922f63..7bfcc3f9 100644 --- a/src/imports/controls/imagine/ApplicationWindow.qml +++ b/src/imports/controls/imagine/ApplicationWindow.qml @@ -36,9 +36,9 @@ import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml index bd90d21a..652365b1 100644 --- a/src/imports/controls/imagine/BusyIndicator.qml +++ b/src/imports/controls/imagine/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml index c8962a6b..e7171eb1 100644 --- a/src/imports/controls/imagine/Button.qml +++ b/src/imports/controls/imagine/Button.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Button { id: control diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml index 3f0b7684..b91ceb40 100644 --- a/src/imports/controls/imagine/CheckBox.qml +++ b/src/imports/controls/imagine/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/imports/controls/imagine/CheckDelegate.qml index 2336131f..19975152 100644 --- a/src/imports/controls/imagine/CheckDelegate.qml +++ b/src/imports/controls/imagine/CheckDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index 530fa378..6cae167a 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ComboBox { id: control diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/imports/controls/imagine/DelayButton.qml index ef1f6511..f60b5eae 100644 --- a/src/imports/controls/imagine/DelayButton.qml +++ b/src/imports/controls/imagine/DelayButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 -import QtGraphicalEffects 1.0 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 +import QtGraphicalEffects 1.12 T.DelayButton { id: control diff --git a/src/imports/controls/imagine/Dial.qml b/src/imports/controls/imagine/Dial.qml index ac7a4645..f10634e6 100644 --- a/src/imports/controls/imagine/Dial.qml +++ b/src/imports/controls/imagine/Dial.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Dial { id: control diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml index 968f70ab..730b7f57 100644 --- a/src/imports/controls/imagine/Dialog.qml +++ b/src/imports/controls/imagine/Dialog.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml index ec1cbde8..c24b29fc 100644 --- a/src/imports/controls/imagine/DialogButtonBox.qml +++ b/src/imports/controls/imagine/DialogButtonBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/imagine/Drawer.qml b/src/imports/controls/imagine/Drawer.qml index ea4f7337..2c93ba75 100644 --- a/src/imports/controls/imagine/Drawer.qml +++ b/src/imports/controls/imagine/Drawer.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Drawer { id: control diff --git a/src/imports/controls/imagine/Frame.qml b/src/imports/controls/imagine/Frame.qml index b049715b..2bef3c88 100644 --- a/src/imports/controls/imagine/Frame.qml +++ b/src/imports/controls/imagine/Frame.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Frame { id: control diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml index 816e0c8c..7abdb6f0 100644 --- a/src/imports/controls/imagine/GroupBox.qml +++ b/src/imports/controls/imagine/GroupBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/imports/controls/imagine/ItemDelegate.qml index 7ec07f55..0b3edeaf 100644 --- a/src/imports/controls/imagine/ItemDelegate.qml +++ b/src/imports/controls/imagine/ItemDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/imagine/Label.qml b/src/imports/controls/imagine/Label.qml index f9a5bdb6..82c0ef47 100644 --- a/src/imports/controls/imagine/Label.qml +++ b/src/imports/controls/imagine/Label.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Label { id: control diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index bf7540fd..20a34467 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/imports/controls/imagine/MenuItem.qml index 58dc344a..f85fc657 100644 --- a/src/imports/controls/imagine/MenuItem.qml +++ b/src/imports/controls/imagine/MenuItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/imports/controls/imagine/MenuSeparator.qml index 3821a15a..9ed39087 100644 --- a/src/imports/controls/imagine/MenuSeparator.qml +++ b/src/imports/controls/imagine/MenuSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml index 2fe6a01d..07ec0a75 100644 --- a/src/imports/controls/imagine/Page.qml +++ b/src/imports/controls/imagine/Page.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Page { id: control diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/imports/controls/imagine/PageIndicator.qml index 7e9f43fe..8da89f5a 100644 --- a/src/imports/controls/imagine/PageIndicator.qml +++ b/src/imports/controls/imagine/PageIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/imagine/Pane.qml b/src/imports/controls/imagine/Pane.qml index f794666e..970b22b9 100644 --- a/src/imports/controls/imagine/Pane.qml +++ b/src/imports/controls/imagine/Pane.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Pane { id: control diff --git a/src/imports/controls/imagine/Popup.qml b/src/imports/controls/imagine/Popup.qml index 12b8300b..8f69bef4 100644 --- a/src/imports/controls/imagine/Popup.qml +++ b/src/imports/controls/imagine/Popup.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Popup { id: control diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/imports/controls/imagine/ProgressBar.qml index c809f308..2f78004e 100644 --- a/src/imports/controls/imagine/ProgressBar.qml +++ b/src/imports/controls/imagine/ProgressBar.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 -import QtGraphicalEffects 1.0 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 +import QtGraphicalEffects 1.12 T.ProgressBar { id: control diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml index 6ba36d8a..d431695f 100644 --- a/src/imports/controls/imagine/RadioButton.qml +++ b/src/imports/controls/imagine/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/imports/controls/imagine/RadioDelegate.qml index c3febde2..5a8356f8 100644 --- a/src/imports/controls/imagine/RadioDelegate.qml +++ b/src/imports/controls/imagine/RadioDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/imagine/RangeSlider.qml b/src/imports/controls/imagine/RangeSlider.qml index 5461cf01..47d90cf3 100644 --- a/src/imports/controls/imagine/RangeSlider.qml +++ b/src/imports/controls/imagine/RangeSlider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml index 718faad4..fe4cbb36 100644 --- a/src/imports/controls/imagine/RoundButton.qml +++ b/src/imports/controls/imagine/RoundButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +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 b7acf416..787ea663 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 fd1effa3..2fd578ef 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 64fd3ac5..9d469ba5 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 f39bab70..fe9c3388 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 866db7fc..61135806 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 302816d7..407b1d15 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 be1a378e..3850253f 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 6c946715..4998edb7 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 2a144c85..7d1f3a2a 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 a4f7e93e..e95023fb 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 20802da0..69516e03 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 71cd021f..1cdcfc4b 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 94fe237c..c7505b52 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 2943396e..3ff0ad44 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 f1cb3768..99bcd3ba 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 e41c2cf8..cc22f88d 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 8961b259..c0887e4d 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 2bcb4fa8..250452d8 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 80e8eb1f..d49966b0 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 490825ff..71c013d5 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 94aaeff3..6a10ed7f 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 5004c7f6..5a746c0f 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 18887669..8173248c 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 62afe2cb..6f7d6c70 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 3ba8c887..cad5ae97 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 caf0f8e1..34495e2d 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 67f46551..673d6f48 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 5db53d1c..223f8fca 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 ffb3b3dd..f472e8ae 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 fddd49e4..6b5ef3ad 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 ce6bbc4b..1148dd25 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 9426096e..364c0e57 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 eee9b88d..c53b8210 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 6721e10f..3d64cdef 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 7e5d79aa..06b654a8 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 7af59ca1..0001825e 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 b07bb12d..e18a5949 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 b4839dd3..2078ce6c 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 49333e86..ad923a24 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 8f7c797c..d28713a7 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 74c5083d..66252d6e 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 eeb93fe4..588d6fbb 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 1f9caf8d..069ad216 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 6eb597c3..6d80c049 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 6e09f44f..4da0ecc6 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 5cfcce04..5e6ca245 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 af2c2642..988e225a 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 3d7039bb..1b576385 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 269ac657..2848f037 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 108ddbad..47bbbd80 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 5cc23829..edc93c2c 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 f69f31cc..4be816ad 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 8c8a88b1..d735573a 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 fafc92c7..13d0f9db 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 01a33f9e..a376742d 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 5578f29e..19f23ad2 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 33b333fe..cc6a1413 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 2ebbcccd..b3bdb802 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 d0a09a10..23c86bc3 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 6f76e2e3..dd5d6ce6 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 fe036486..d06799be 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 62d8b1a9..12ea36ae 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 677a57e8..fd0db925 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 1f1e5ffa..bae5171b 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 f7567059..7fef407c 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 1e9444fb..98c9132a 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 c5cd8f9b..5245652c 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 ce49af53..249b6401 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 7aa612eb..ed42b295 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 9c09778b..5b887598 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 55f1bd52..69c42441 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 8120ac54..94367657 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 ced62f47..fb705367 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 c35b771a..92e24430 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 d407af94..eb0e6c87 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 754e76ab..5bbbe422 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 313b980e..153b9e8e 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 cc6f241d..2ad21b46 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 648b2950..657b2835 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 b0632da1..b726339a 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 98092919..7847f459 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 cf8ce3c6..0f535ea6 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 37b008ba..2b650682 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 2df2e0b4..2a3a3b3a 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 ae163cab..276c87d6 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 bf7b274c..6151d090 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 84393a79..ac2dc541 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 6c824c8f..7ec1d7f8 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 e82c0773..8bb44849 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 792fcb93..dc156dd7 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 656aa338..ed985405 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 2e6bb1c3..c66435c3 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 567b13af..619cfa40 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 f2a26a46..2317f505 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 34d9ad29..30f1fc57 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 7b52300c..23d0ee3c 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 9e3b1d89..72f9f6f7 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 e09225e4..347d6d9a 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 a89a7d07..3dcc84ab 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 d643bb7f..63a5ecec 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 739fab68..e39134e1 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 7403f74c..ce79bd54 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 7c8fdcc9..5a61c3f7 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 2e068c4b..d56cef33 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 71cb7098..68d53d45 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 57b30ea9..f2e4d71e 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 06455e0c..2eedf96e 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 6cb77245..d6a525f7 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 b2dd6bbd..ab66ee7c 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 5ccf83b6..8f427b1e 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 0ef08538..dfe927f5 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 c4cf70e7..5a3f7751 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 492e2e3a..066049a7 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 538562bc..962d5157 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 32e63cf5..bf6069f5 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 12a71f16..ad9a23e9 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 d2bdcfa1..ab660c93 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 b512026a..66e3d725 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 2d5934df..03ad4a89 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 04e40fa5..ba5bf685 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 539dcd2e..5a385e8e 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 62746461..f36dac22 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 630fa867..ee8e6e1c 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 528d49b5..cf7325b6 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 cccd4224..f7338c2b 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 1265f636..7a999b79 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"); diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc index 01e70bb2..33ee08d3 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc @@ -38,7 +38,7 @@ \c .qml file: \badcode - import QtQuick.Templates 2.5 as T + import QtQuick.Templates 2.12 as T \endcode For the sake of clarity, there is a one-to-one mapping between the types diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index ef7a646b..c4ff68fc 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -161,7 +161,13 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) registered = true; initProviders(); - 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.Templates 2.0 (originally introduced in Qt 5.7) qmlRegisterType<QQuickAbstractButton>(uri, 2, 0, "AbstractButton"); |