Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf
	src/imports/controls/qtquickcontrols2plugin.cpp

Change-Id: I27f1260b539354e084beb28be78385e57fda63e1

50 files changed, 150 insertions, 149 deletions

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..3ec7e98b 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
@@ -58,6 +58,7 @@ T.ComboBox {
     delegate: ItemDelegate {
         width: parent.width
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
+        font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
         highlighted: control.highlightedIndex === index
         hoverEnabled: control.hoverEnabled
     }
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");