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

Change-Id: I79759d4101b5267c5d9d74ccb81e994da002b0ef

4 files changed, 83 insertions, 8 deletions

diff --git a/src/imports/controls/fusion/SplitView.qml b/src/imports/controls/fusion/SplitView.qml
index 4050b28a..6a04b4da 100644
--- a/src/imports/controls/fusion/SplitView.qml
+++ b/src/imports/controls/fusion/SplitView.qml
@@ -34,11 +34,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 2.13
+import QtQuick.Templates 2.13 as T
+import QtQuick.Controls 2.13
+import QtQuick.Controls.impl 2.13
+import QtQuick.Controls.Fusion 2.13
 
 T.SplitView {
     id: control
diff --git a/src/imports/controls/fusion/dependencies.json b/src/imports/controls/fusion/dependencies.json
new file mode 100644
index 00000000..21ded052
--- /dev/null
+++ b/src/imports/controls/fusion/dependencies.json
@@ -0,0 +1,7 @@
+[
+    {
+        "name": "QtQuick.Controls",
+        "type": "module",
+        "version": "2.0"
+    }
+]
diff --git a/src/imports/controls/fusion/fusion.pro b/src/imports/controls/fusion/fusion.pro
index f2de422f..663636da 100644
--- a/src/imports/controls/fusion/fusion.pro
+++ b/src/imports/controls/fusion/fusion.pro
@@ -2,7 +2,7 @@ TARGET = qtquickcontrols2fusionstyleplugin
 TARGETPATH = QtQuick/Controls.2/Fusion
 
 IMPORT_NAME = QtQuick.Controls.Fusion
-IMPORT_VERSION = 2.5
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += qml quick
 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
diff --git a/src/imports/controls/fusion/plugins.qmltypes b/src/imports/controls/fusion/plugins.qmltypes
index e6c350d6..a70b4901 100644
--- a/src/imports/controls/fusion/plugins.qmltypes
+++ b/src/imports/controls/fusion/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Controls.Fusion 2.3'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Fusion 2.13'
 
 Module {
-    dependencies: [ ]
+    dependencies: ["QtQuick.Controls 2.0"]
     Component {
         name: "QQuickFusionBusyIndicator"
         defaultProperty: "data"
@@ -143,4 +143,72 @@ Module {
             Parameter { name: "palette"; type: "QPalette" }
         }
     }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Fusion.impl/ButtonPanel 2.3"
+        exports: ["QtQuick.Controls.Fusion.impl/ButtonPanel 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "highlighted"; type: "bool" }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Fusion.impl/CheckIndicator 2.3"
+        exports: ["QtQuick.Controls.Fusion.impl/CheckIndicator 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "pressedColor"; type: "QColor"; isReadonly: true }
+        Property { name: "checkMarkColor"; type: "QColor"; isReadonly: true }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Fusion.impl/RadioIndicator 2.3"
+        exports: ["QtQuick.Controls.Fusion.impl/RadioIndicator 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "pressedColor"; type: "QColor"; isReadonly: true }
+        Property { name: "checkMarkColor"; type: "QColor"; isReadonly: true }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Fusion.impl/SliderGroove 2.3"
+        exports: ["QtQuick.Controls.Fusion.impl/SliderGroove 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "offset"; type: "double" }
+        Property { name: "progress"; type: "double" }
+        Property { name: "visualProgress"; type: "double" }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Fusion.impl/SliderHandle 2.3"
+        exports: ["QtQuick.Controls.Fusion.impl/SliderHandle 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "palette"; type: "QVariant" }
+        Property { name: "pressed"; type: "bool" }
+        Property { name: "hovered"; type: "bool" }
+        Property { name: "vertical"; type: "bool" }
+        Property { name: "visualFocus"; type: "bool" }
+    }
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.Fusion.impl/SwitchIndicator 2.3"
+        exports: ["QtQuick.Controls.Fusion.impl/SwitchIndicator 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "pressedColor"; type: "QColor"; isReadonly: true }
+        Property { name: "checkMarkColor"; type: "QColor"; isReadonly: true }
+    }
 }