Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a

2 files changed, 26 insertions, 10 deletions

diff --git a/src/imports/qtqml/dependencies.json b/src/imports/qtqml/dependencies.json
new file mode 100644
index 0000000000..0d4f101c7a
--- /dev/null
+++ b/src/imports/qtqml/dependencies.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes
index d548a78dd0..63f5bada9b 100644
--- a/src/imports/qtqml/plugins.qmltypes
+++ b/src/imports/qtqml/plugins.qmltypes
@@ -4,14 +4,14 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.13'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQml 2.14'
 
 Module {
     dependencies: []
     Component {
         name: "QObject"
-        exports: ["QtQml/QtObject 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QML/QtObject 1.0", "QtQml/QtObject 2.0"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "objectName"; type: "string" }
         Signal {
             name: "objectNameChanged"
@@ -27,13 +27,27 @@ Module {
     Component {
         name: "QQmlBind"
         prototype: "QObject"
-        exports: ["QtQml/Binding 2.0", "QtQml/Binding 2.8"]
-        exportMetaObjectRevisions: [0, 8]
+        exports: [
+            "QtQml/Binding 2.0",
+            "QtQml/Binding 2.14",
+            "QtQml/Binding 2.8"
+        ]
+        exportMetaObjectRevisions: [0, 14, 8]
+        Enum {
+            name: "RestorationMode"
+            values: {
+                "RestoreNone": 0,
+                "RestoreBinding": 1,
+                "RestoreValue": 2,
+                "RestoreBindingOrValue": 3
+            }
+        }
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "property"; type: "string" }
         Property { name: "value"; type: "QVariant" }
         Property { name: "when"; type: "bool" }
         Property { name: "delayed"; revision: 8; type: "bool" }
+        Property { name: "restoreMode"; revision: 14; type: "RestorationMode" }
     }
     Component {
         name: "QQmlComponent"
@@ -94,11 +108,11 @@ Module {
         name: "QQmlConnections"
         prototype: "QObject"
         exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 3]
         Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "enabled"; revision: 1; type: "bool" }
+        Property { name: "enabled"; revision: 3; type: "bool" }
         Property { name: "ignoreUnknownSignals"; type: "bool" }
-        Signal { name: "enabledChanged"; revision: 1 }
+        Signal { name: "enabledChanged"; revision: 3 }
     }
     Component {
         name: "QQmlInstanceModel"
@@ -199,7 +213,7 @@ Module {
         name: "QQmlLoggingCategory"
         prototype: "QObject"
         exports: ["QtQml/LoggingCategory 2.12", "QtQml/LoggingCategory 2.8"]
-        exportMetaObjectRevisions: [1, 0]
+        exportMetaObjectRevisions: [12, 0]
         Enum {
             name: "DefaultLogLevel"
             values: {
@@ -211,7 +225,7 @@ Module {
             }
         }
         Property { name: "name"; type: "string" }
-        Property { name: "defaultLogLevel"; revision: 1; type: "DefaultLogLevel" }
+        Property { name: "defaultLogLevel"; revision: 12; type: "DefaultLogLevel" }
     }
     Component {
         name: "QQmlTimer"