Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e

1 files changed, 16 insertions, 4 deletions

diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes
index 82333627a0..d548a78dd0 100644
--- a/src/imports/qtqml/plugins.qmltypes
+++ b/src/imports/qtqml/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.3'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.13'
 
 Module {
     dependencies: []
@@ -96,7 +96,7 @@ Module {
         exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"]
         exportMetaObjectRevisions: [0, 1]
         Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "enabled"; type: "bool" }
+        Property { name: "enabled"; revision: 1; type: "bool" }
         Property { name: "ignoreUnknownSignals"; type: "bool" }
         Signal { name: "enabledChanged"; revision: 1 }
     }
@@ -198,9 +198,20 @@ Module {
     Component {
         name: "QQmlLoggingCategory"
         prototype: "QObject"
-        exports: ["QtQml/LoggingCategory 2.8"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQml/LoggingCategory 2.12", "QtQml/LoggingCategory 2.8"]
+        exportMetaObjectRevisions: [1, 0]
+        Enum {
+            name: "DefaultLogLevel"
+            values: {
+                "Debug": 0,
+                "Info": 4,
+                "Warning": 1,
+                "Critical": 2,
+                "Fatal": 3
+            }
+        }
         Property { name: "name"; type: "string" }
+        Property { name: "defaultLogLevel"; revision: 1; type: "DefaultLogLevel" }
     }
     Component {
         name: "QQmlTimer"
@@ -229,5 +240,6 @@ Module {
         Property { name: "wasHeld"; type: "bool"; isReadonly: true }
         Property { name: "isClick"; type: "bool"; isReadonly: true }
         Property { name: "accepted"; type: "bool" }
+        Property { name: "flags"; revision: 11; type: "int"; isReadonly: true }
     }
 }