QmlJs: update plugins.qmltypes

Change-Id: I3df1210088f877d4fe1d7953982e0fd2fa6ad3db
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

5 files changed, 78 insertions, 9 deletions

diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index c2f8f5b521..5fb68d15d9 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -461,7 +461,10 @@ Module {
                 "AA_CompressHighFrequencyEvents": 25,
                 "AA_DontCheckOpenGLContextThreadAffinity": 26,
                 "AA_DisableShaderDiskCache": 27,
-                "AA_AttributeCount": 28
+                "AA_DontShowShortcutsInContextMenus": 28,
+                "AA_CompressTabletEvents": 29,
+                "AA_DisableWindowContextHelpButton": 30,
+                "AA_AttributeCount": 31
             }
         }
         Enum {
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index d23d6cc311..0fce98a212 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -1808,6 +1808,7 @@ Module {
         Property { name: "wordSpacing"; type: "double" }
         Property { name: "hintingPreference"; type: "HintingPreference" }
         Property { name: "kerning"; type: "bool" }
+        Property { name: "preferShaping"; type: "bool" }
         Method { name: "toString"; type: "string" }
     }
     Component {
@@ -3994,12 +3995,13 @@ Module {
         prototype: "QQuickImplicitSizeItem"
         exports: [
             "QtQuick/Text 2.0",
+            "QtQuick/Text 2.10",
             "QtQuick/Text 2.2",
             "QtQuick/Text 2.3",
             "QtQuick/Text 2.6",
             "QtQuick/Text 2.9"
         ]
-        exportMetaObjectRevisions: [0, 2, 3, 6, 9]
+        exportMetaObjectRevisions: [0, 10, 2, 3, 6, 9]
         Enum {
             name: "HAlignment"
             values: {
@@ -4185,12 +4187,13 @@ Module {
         exports: [
             "QtQuick/TextEdit 2.0",
             "QtQuick/TextEdit 2.1",
+            "QtQuick/TextEdit 2.10",
             "QtQuick/TextEdit 2.2",
             "QtQuick/TextEdit 2.3",
             "QtQuick/TextEdit 2.6",
             "QtQuick/TextEdit 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3, 6, 7]
+        exportMetaObjectRevisions: [0, 1, 10, 2, 3, 6, 7]
         Enum {
             name: "HAlignment"
             values: {
@@ -4292,6 +4295,7 @@ Module {
         Property { name: "rightPadding"; revision: 6; type: "double" }
         Property { name: "bottomPadding"; revision: 6; type: "double" }
         Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
+        Property { name: "tabStopDistance"; revision: 10; type: "double" }
         Signal { name: "preeditTextChanged"; revision: 7 }
         Signal { name: "contentSizeChanged" }
         Signal {
@@ -4374,6 +4378,11 @@ Module {
         Signal { name: "leftPaddingChanged"; revision: 6 }
         Signal { name: "rightPaddingChanged"; revision: 6 }
         Signal { name: "bottomPaddingChanged"; revision: 6 }
+        Signal {
+            name: "tabStopDistanceChanged"
+            revision: 10
+            Parameter { name: "distance"; type: "double" }
+        }
         Method { name: "selectAll" }
         Method { name: "selectWord" }
         Method {
diff --git a/src/imports/shapes/plugins.qmltypes b/src/imports/shapes/plugins.qmltypes
index b8a7c532e0..39aab42401 100644
--- a/src/imports/shapes/plugins.qmltypes
+++ b/src/imports/shapes/plugins.qmltypes
@@ -36,6 +36,17 @@ Module {
         Property { name: "vendorExtensionsEnabled"; type: "bool" }
         Property { name: "status"; type: "Status"; isReadonly: true }
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Signal { name: "rendererChanged" }
+    }
+    Component {
+        name: "QQuickShapeConicalGradient"
+        defaultProperty: "stops"
+        prototype: "QQuickShapeGradient"
+        exports: ["QtQuick.Shapes/ConicalGradient 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "centerX"; type: "double" }
+        Property { name: "centerY"; type: "double" }
+        Property { name: "angle"; type: "double" }
     }
     Component {
         name: "QQuickShapeGradient"
@@ -114,4 +125,17 @@ Module {
         Property { name: "fillGradient"; type: "QQuickShapeGradient"; isPointer: true }
         Signal { name: "shapePathChanged" }
     }
+    Component {
+        name: "QQuickShapeRadialGradient"
+        defaultProperty: "stops"
+        prototype: "QQuickShapeGradient"
+        exports: ["QtQuick.Shapes/RadialGradient 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "centerX"; type: "double" }
+        Property { name: "centerY"; type: "double" }
+        Property { name: "centerRadius"; type: "double" }
+        Property { name: "focalX"; type: "double" }
+        Property { name: "focalY"; type: "double" }
+        Property { name: "focalRadius"; type: "double" }
+    }
 }
diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index 5d7ca51adc..7f3140d86b 100644
--- a/src/imports/testlib/plugins.qmltypes
+++ b/src/imports/testlib/plugins.qmltypes
@@ -7,7 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable -noforceqtquick QtTest 1.2'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.0", "QtQuick.Window 2.0"]
     Component {
         name: "QQuickTouchEventSequence"
         prototype: "QObject"
@@ -45,8 +45,8 @@ Module {
     Component {
         name: "QuickTestEvent"
         prototype: "QObject"
-        exports: ["QtTest/TestEvent 1.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtTest/TestEvent 1.0", "QtTest/TestEvent 1.2"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "defaultMouseDelay"; type: "int"; isReadonly: true }
         Method {
             name: "keyPress"
@@ -91,6 +91,12 @@ Module {
             Parameter { name: "delay"; type: "int" }
         }
         Method {
+            name: "keySequence"
+            revision: 2
+            type: "bool"
+            Parameter { name: "keySequence"; type: "QVariant" }
+        }
+        Method {
             name: "mousePress"
             type: "bool"
             Parameter { name: "item"; type: "QObject"; isPointer: true }
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index cea2a910a7..4ae23a093e 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/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 QtQuick.Window 2.3'
+// 'qmlplugindump -nonrelocatable QtQuick.Window 2.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -43,10 +43,16 @@ Module {
     Component {
         name: "QQuickScreenInfo"
         prototype: "QObject"
-        exports: ["QtQuick.Window/ScreenInfo 2.3"]
+        exports: [
+            "QtQuick.Window/ScreenInfo 2.10",
+            "QtQuick.Window/ScreenInfo 2.3"
+        ]
         isCreatable: false
-        exportMetaObjectRevisions: [2]
+        exportMetaObjectRevisions: [10, 2]
         Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "manufacturer"; revision: 10; type: "string"; isReadonly: true }
+        Property { name: "model"; revision: 10; type: "string"; isReadonly: true }
+        Property { name: "serialNumber"; revision: 10; type: "string"; isReadonly: true }
         Property { name: "width"; type: "int"; isReadonly: true }
         Property { name: "height"; type: "int"; isReadonly: true }
         Property { name: "desktopAvailableWidth"; type: "int"; isReadonly: true }
@@ -58,6 +64,9 @@ Module {
         Property { name: "orientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
         Property { name: "virtualX"; revision: 1; type: "int"; isReadonly: true }
         Property { name: "virtualY"; revision: 1; type: "int"; isReadonly: true }
+        Signal { name: "manufacturerChanged"; revision: 10 }
+        Signal { name: "modelChanged"; revision: 10 }
+        Signal { name: "serialNumberChanged"; revision: 10 }
         Signal { name: "desktopGeometryChanged" }
         Signal { name: "virtualXChanged"; revision: 1 }
         Signal { name: "virtualYChanged"; revision: 1 }
@@ -74,6 +83,13 @@ Module {
                 "ContextNotAvailable": 1
             }
         }
+        Enum {
+            name: "TextRenderType"
+            values: {
+                "QtTextRendering": 0,
+                "NativeTextRendering": 1
+            }
+        }
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "color"; type: "QColor" }
         Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -296,6 +312,17 @@ Module {
             Parameter { name: "arg"; type: "int" }
         }
         Method {
+            name: "setGeometry"
+            Parameter { name: "posx"; type: "int" }
+            Parameter { name: "posy"; type: "int" }
+            Parameter { name: "w"; type: "int" }
+            Parameter { name: "h"; type: "int" }
+        }
+        Method {
+            name: "setGeometry"
+            Parameter { name: "rect"; type: "QRect" }
+        }
+        Method {
             name: "setMinimumWidth"
             Parameter { name: "w"; type: "int" }
         }