Update plugins.qmltypes

Change-Id: I3b98e4c2159ba37b0b8d0ef5099b93308c84db11
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 103 insertions, 40 deletions

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index d5593246..8b2be4a1 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -4,12 +4,12 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.3 -merge ../templates/plugins.qmltypes -dependencies dependencies.json'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.4 -merge ../templates/plugins.qmltypes -dependencies dependencies.json'
 
 Module {
     dependencies: [
-        "QtQuick 2.9",
-        "QtQuick.Templates 2.3",
+        "QtQuick 2.11",
+        "QtQuick.Templates 2.4",
         "QtQuick.Window 2.2"
     ]
     Component {
@@ -20,6 +20,17 @@ Module {
         exportMetaObjectRevisions: [0]
     }
     Component {
+        name: "QQuickClippedText"
+        defaultProperty: "data"
+        prototype: "QQuickText"
+        exports: ["QtQuick.Controls.impl/ClippedText 2.2"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "clipX"; type: "double" }
+        Property { name: "clipY"; type: "double" }
+        Property { name: "clipWidth"; type: "double" }
+        Property { name: "clipHeight"; type: "double" }
+    }
+    Component {
         name: "QQuickColor"
         prototype: "QObject"
         exports: ["QtQuick.Controls.impl/Color 2.3"]
@@ -57,6 +68,7 @@ Module {
         exportMetaObjectRevisions: [0]
         Property { name: "pen"; type: "QColor" }
         Property { name: "fill"; type: "QColor" }
+        Property { name: "running"; type: "bool" }
     }
     Component {
         name: "QQuickDefaultDial"
@@ -163,6 +175,13 @@ Module {
         Property { name: "bottomPadding"; type: "double" }
     }
     Component {
+        name: "QQuickItemGroup"
+        defaultProperty: "data"
+        prototype: "QQuickImplicitSizeItem"
+        exports: ["QtQuick.Controls.impl/ItemGroup 2.2"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QQuickMnemonicLabel"
         defaultProperty: "data"
         prototype: "QQuickText"
@@ -638,9 +657,10 @@ Module {
         exports: [
             "QtQuick.Templates/AbstractButton 2.0",
             "QtQuick.Templates/AbstractButton 2.2",
-            "QtQuick.Templates/AbstractButton 2.3"
+            "QtQuick.Templates/AbstractButton 2.3",
+            "QtQuick.Templates/AbstractButton 2.4"
         ]
-        exportMetaObjectRevisions: [0, 2, 3]
+        exportMetaObjectRevisions: [0, 2, 3, 4]
         Enum {
             name: "Display"
             values: {
@@ -656,10 +676,15 @@ Module {
         Property { name: "checked"; type: "bool" }
         Property { name: "checkable"; type: "bool" }
         Property { name: "autoExclusive"; type: "bool" }
+        Property { name: "autoRepeat"; type: "bool" }
         Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
         Property { name: "icon"; revision: 3; type: "QQuickIcon" }
         Property { name: "display"; revision: 3; type: "Display" }
         Property { name: "action"; revision: 3; type: "QQuickAction"; isPointer: true }
+        Property { name: "autoRepeatDelay"; revision: 4; type: "int" }
+        Property { name: "autoRepeatInterval"; revision: 4; type: "int" }
+        Property { name: "pressX"; revision: 4; type: "double"; isReadonly: true }
+        Property { name: "pressY"; revision: 4; type: "double"; isReadonly: true }
         Signal { name: "pressed" }
         Signal { name: "released" }
         Signal { name: "canceled" }
@@ -670,6 +695,10 @@ Module {
         Signal { name: "iconChanged"; revision: 3 }
         Signal { name: "displayChanged"; revision: 3 }
         Signal { name: "actionChanged"; revision: 3 }
+        Signal { name: "autoRepeatDelayChanged"; revision: 4 }
+        Signal { name: "autoRepeatIntervalChanged"; revision: 4 }
+        Signal { name: "pressXChanged"; revision: 4 }
+        Signal { name: "pressYChanged"; revision: 4 }
         Method { name: "toggle" }
     }
     Component {
@@ -806,7 +835,6 @@ Module {
         prototype: "QQuickAbstractButton"
         exports: ["QtQuick.Templates/Button 2.0"]
         exportMetaObjectRevisions: [0]
-        Property { name: "autoRepeat"; type: "bool" }
         Property { name: "highlighted"; type: "bool" }
         Property { name: "flat"; type: "bool" }
     }
@@ -816,19 +844,22 @@ Module {
         exports: [
             "QtQuick.Templates/ButtonGroup 2.0",
             "QtQuick.Templates/ButtonGroup 2.1",
-            "QtQuick.Templates/ButtonGroup 2.3"
+            "QtQuick.Templates/ButtonGroup 2.3",
+            "QtQuick.Templates/ButtonGroup 2.4"
         ]
-        exportMetaObjectRevisions: [0, 1, 3]
+        exportMetaObjectRevisions: [0, 1, 3, 4]
         attachedType: "QQuickButtonGroupAttached"
         Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true }
         Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true }
         Property { name: "exclusive"; revision: 3; type: "bool" }
+        Property { name: "checkState"; revision: 4; type: "Qt::CheckState" }
         Signal {
             name: "clicked"
             revision: 1
             Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
         }
         Signal { name: "exclusiveChanged"; revision: 3 }
+        Signal { name: "checkStateChanged"; revision: 4 }
         Method {
             name: "addButton"
             Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
@@ -847,19 +878,29 @@ Module {
         name: "QQuickCheckBox"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["QtQuick.Templates/CheckBox 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/CheckBox 2.0",
+            "QtQuick.Templates/CheckBox 2.4"
+        ]
+        exportMetaObjectRevisions: [0, 4]
         Property { name: "tristate"; type: "bool" }
         Property { name: "checkState"; type: "Qt::CheckState" }
+        Property { name: "nextCheckState"; revision: 4; type: "QJSValue" }
+        Signal { name: "nextCheckStateChanged"; revision: 4 }
     }
     Component {
         name: "QQuickCheckDelegate"
         defaultProperty: "data"
         prototype: "QQuickItemDelegate"
-        exports: ["QtQuick.Templates/CheckDelegate 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/CheckDelegate 2.0",
+            "QtQuick.Templates/CheckDelegate 2.4"
+        ]
+        exportMetaObjectRevisions: [0, 4]
         Property { name: "tristate"; type: "bool" }
         Property { name: "checkState"; type: "Qt::CheckState" }
+        Property { name: "nextCheckState"; revision: 4; type: "QJSValue" }
+        Signal { name: "nextCheckStateChanged"; revision: 4 }
     }
     Component {
         name: "QQuickComboBox"
@@ -1117,13 +1158,13 @@ Module {
         Signal { name: "accepted" }
         Signal { name: "rejected" }
         Signal { name: "helpRequested" }
-        Signal { name: "applied"; revision: 3 }
-        Signal { name: "reset"; revision: 3 }
-        Signal { name: "discarded"; revision: 3 }
         Signal {
             name: "clicked"
             Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
         }
+        Signal { name: "applied"; revision: 3 }
+        Signal { name: "reset"; revision: 3 }
+        Signal { name: "discarded"; revision: 3 }
         Method {
             name: "standardButton"
             type: "QQuickAbstractButton*"
@@ -1179,8 +1220,11 @@ Module {
         name: "QQuickLabel"
         defaultProperty: "data"
         prototype: "QQuickText"
-        exports: ["QtQuick.Templates/Label 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/Label 2.0",
+            "QtQuick.Templates/Label 2.3"
+        ]
+        exportMetaObjectRevisions: [0, 3]
         Property { name: "font"; type: "QFont" }
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
         Property { name: "palette"; revision: 3; type: "QPalette" }
@@ -1192,19 +1236,19 @@ Module {
         prototype: "QQuickPopup"
         exports: ["QtQuick.Templates/Menu 2.0", "QtQuick.Templates/Menu 2.3"]
         exportMetaObjectRevisions: [0, 3]
-        Property { name: "count"; revision: 3; type: "int"; isReadonly: true }
         Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "title"; type: "string" }
+        Property { name: "count"; revision: 3; type: "int"; isReadonly: true }
         Property { name: "cascade"; revision: 3; type: "bool" }
         Property { name: "overlap"; revision: 3; type: "double" }
         Property { name: "delegate"; revision: 3; type: "QQmlComponent"; isPointer: true }
         Property { name: "currentIndex"; revision: 3; type: "int" }
-        Signal { name: "countChanged"; revision: 3 }
         Signal {
             name: "titleChanged"
             Parameter { name: "title"; type: "string" }
         }
+        Signal { name: "countChanged"; revision: 3 }
         Signal {
             name: "cascadeChanged"
             revision: 3
@@ -1493,9 +1537,7 @@ Module {
         Property { name: "rightPadding"; type: "double" }
         Property { name: "bottomPadding"; type: "double" }
         Property { name: "locale"; type: "QLocale" }
-        Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "font"; type: "QFont" }
-        Property { name: "palette"; revision: 3; type: "QPalette" }
         Property { name: "parent"; type: "QQuickItem"; isPointer: true }
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
@@ -1507,8 +1549,6 @@ Module {
         Property { name: "modal"; type: "bool" }
         Property { name: "dim"; type: "bool" }
         Property { name: "visible"; type: "bool" }
-        Property { name: "enabled"; revision: 3; type: "bool" }
-        Property { name: "opened"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "opacity"; type: "double" }
         Property { name: "scale"; type: "double" }
         Property { name: "closePolicy"; type: "ClosePolicy" }
@@ -1516,19 +1556,23 @@ Module {
         Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
         Property { name: "exit"; type: "QQuickTransition"; isPointer: true }
         Property { name: "spacing"; revision: 1; type: "double" }
+        Property { name: "opened"; revision: 3; type: "bool"; isReadonly: true }
+        Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true }
+        Property { name: "enabled"; revision: 3; type: "bool" }
+        Property { name: "palette"; revision: 3; type: "QPalette" }
         Signal { name: "opened" }
         Signal { name: "closed" }
         Signal { name: "aboutToShow" }
         Signal { name: "aboutToHide" }
-        Signal { name: "mirroredChanged"; revision: 3 }
-        Signal { name: "paletteChanged"; revision: 3 }
-        Signal { name: "enabledChanged"; revision: 3 }
-        Signal { name: "openedChanged"; revision: 3 }
         Signal {
             name: "windowChanged"
             Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
         }
         Signal { name: "spacingChanged"; revision: 1 }
+        Signal { name: "openedChanged"; revision: 3 }
+        Signal { name: "mirroredChanged"; revision: 3 }
+        Signal { name: "enabledChanged"; revision: 3 }
+        Signal { name: "paletteChanged"; revision: 3 }
         Method { name: "open" }
         Method { name: "close" }
         Method {
@@ -1618,7 +1662,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickButton"
         exports: ["QtQuick.Templates/RoundButton 2.1"]
-        exportMetaObjectRevisions: [1]
+        exportMetaObjectRevisions: [0]
         Property { name: "radius"; type: "double" }
     }
     Component {
@@ -1628,9 +1672,10 @@ Module {
         exports: [
             "QtQuick.Templates/ScrollBar 2.0",
             "QtQuick.Templates/ScrollBar 2.2",
-            "QtQuick.Templates/ScrollBar 2.3"
+            "QtQuick.Templates/ScrollBar 2.3",
+            "QtQuick.Templates/ScrollBar 2.4"
         ]
-        exportMetaObjectRevisions: [0, 2, 3]
+        exportMetaObjectRevisions: [0, 2, 3, 4]
         attachedType: "QQuickScrollBarAttached"
         Enum {
             name: "SnapMode"
@@ -1659,9 +1704,15 @@ Module {
         Property { name: "policy"; revision: 2; type: "Policy" }
         Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true }
+        Property { name: "minimumSize"; revision: 4; type: "double" }
+        Property { name: "visualSize"; revision: 4; type: "double"; isReadonly: true }
+        Property { name: "visualPosition"; revision: 4; type: "double"; isReadonly: true }
         Signal { name: "snapModeChanged"; revision: 2 }
         Signal { name: "interactiveChanged"; revision: 2 }
         Signal { name: "policyChanged"; revision: 2 }
+        Signal { name: "minimumSizeChanged"; revision: 4 }
+        Signal { name: "visualSizeChanged"; revision: 4 }
+        Signal { name: "visualPositionChanged"; revision: 4 }
         Method { name: "increase" }
         Method { name: "decrease" }
         Method {
@@ -1685,9 +1736,10 @@ Module {
         prototype: "QQuickControl"
         exports: [
             "QtQuick.Templates/ScrollIndicator 2.0",
-            "QtQuick.Templates/ScrollIndicator 2.3"
+            "QtQuick.Templates/ScrollIndicator 2.3",
+            "QtQuick.Templates/ScrollIndicator 2.4"
         ]
-        exportMetaObjectRevisions: [0, 3]
+        exportMetaObjectRevisions: [0, 3, 4]
         attachedType: "QQuickScrollIndicatorAttached"
         Property { name: "size"; type: "double" }
         Property { name: "position"; type: "double" }
@@ -1695,6 +1747,12 @@ Module {
         Property { name: "orientation"; type: "Qt::Orientation" }
         Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true }
+        Property { name: "minimumSize"; revision: 4; type: "double" }
+        Property { name: "visualSize"; revision: 4; type: "double"; isReadonly: true }
+        Property { name: "visualPosition"; revision: 4; type: "double"; isReadonly: true }
+        Signal { name: "minimumSizeChanged"; revision: 4 }
+        Signal { name: "visualSizeChanged"; revision: 4 }
+        Signal { name: "visualPositionChanged"; revision: 4 }
         Method {
             name: "setSize"
             Parameter { name: "size"; type: "double" }
@@ -1748,11 +1806,11 @@ Module {
         Property { name: "stepSize"; type: "double" }
         Property { name: "snapMode"; type: "SnapMode" }
         Property { name: "pressed"; type: "bool" }
-        Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true }
-        Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "orientation"; type: "Qt::Orientation" }
         Property { name: "handle"; type: "QQuickItem"; isPointer: true }
         Property { name: "live"; revision: 2; type: "bool" }
+        Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true }
+        Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true }
         Signal { name: "moved"; revision: 2 }
         Signal { name: "liveChanged"; revision: 2 }
         Method { name: "increase" }
@@ -1772,9 +1830,10 @@ Module {
             "QtQuick.Templates/SpinBox 2.0",
             "QtQuick.Templates/SpinBox 2.1",
             "QtQuick.Templates/SpinBox 2.2",
-            "QtQuick.Templates/SpinBox 2.3"
+            "QtQuick.Templates/SpinBox 2.3",
+            "QtQuick.Templates/SpinBox 2.4"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3]
+        exportMetaObjectRevisions: [0, 1, 2, 3, 4]
         Property { name: "from"; type: "int" }
         Property { name: "to"; type: "int" }
         Property { name: "value"; type: "int" }
@@ -1788,10 +1847,12 @@ Module {
         Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" }
         Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true }
         Property { name: "wrap"; revision: 3; type: "bool" }
+        Property { name: "displayText"; revision: 4; type: "string"; isReadonly: true }
         Signal { name: "valueModified"; revision: 2 }
         Signal { name: "inputMethodHintsChanged"; revision: 2 }
         Signal { name: "inputMethodComposingChanged"; revision: 2 }
         Signal { name: "wrapChanged"; revision: 3 }
+        Signal { name: "displayTextChanged"; revision: 4 }
         Method { name: "increase" }
         Method { name: "decrease" }
     }
@@ -2041,9 +2102,10 @@ Module {
         prototype: "QQuickTextEdit"
         exports: [
             "QtQuick.Templates/TextArea 2.0",
-            "QtQuick.Templates/TextArea 2.1"
+            "QtQuick.Templates/TextArea 2.1",
+            "QtQuick.Templates/TextArea 2.3"
         ]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 1, 3]
         attachedType: "QQuickTextAreaAttached"
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
@@ -2085,9 +2147,10 @@ Module {
         prototype: "QQuickTextInput"
         exports: [
             "QtQuick.Templates/TextField 2.0",
-            "QtQuick.Templates/TextField 2.1"
+            "QtQuick.Templates/TextField 2.1",
+            "QtQuick.Templates/TextField 2.3"
         ]
-        exportMetaObjectRevisions: [0, 1]
+        exportMetaObjectRevisions: [0, 1, 3]
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
         Property { name: "implicitHeight"; type: "double" }