Update plugins.qmltypes

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

1 files changed, 110 insertions, 30 deletions

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 5011365c..8fbe7312 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.4 -merge ../templates/plugins.qmltypes -dependencies dependencies.json'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.5 -merge ../templates/plugins.qmltypes -dependencies dependencies.json'
 
 Module {
     dependencies: [
         "QtQuick 2.11",
-        "QtQuick.Templates 2.4",
+        "QtQuick.Templates 2.5",
         "QtQuick.Window 2.2"
     ]
     Component {
@@ -1021,15 +1021,17 @@ Module {
             Parameter { name: "index"; type: "int" }
         }
     }
+    Component { name: "QQuickContentItem"; defaultProperty: "data"; prototype: "QQuickItem" }
     Component {
         name: "QQuickControl"
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: [
             "QtQuick.Templates/Control 2.0",
-            "QtQuick.Templates/Control 2.3"
+            "QtQuick.Templates/Control 2.3",
+            "QtQuick.Templates/Control 2.5"
         ]
-        exportMetaObjectRevisions: [0, 3]
+        exportMetaObjectRevisions: [0, 3, 5]
         Property { name: "font"; type: "QFont" }
         Property { name: "availableWidth"; type: "double"; isReadonly: true }
         Property { name: "availableHeight"; type: "double"; isReadonly: true }
@@ -1049,8 +1051,13 @@ Module {
         Property { name: "wheelEnabled"; type: "bool" }
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+        Property { name: "baselineOffset"; type: "double" }
         Property { name: "palette"; revision: 3; type: "QPalette" }
+        Property { name: "horizontalPadding"; revision: 5; type: "double" }
+        Property { name: "verticalPadding"; revision: 5; type: "double" }
         Signal { name: "paletteChanged"; revision: 3 }
+        Signal { name: "horizontalPaddingChanged"; revision: 5 }
+        Signal { name: "verticalPaddingChanged"; revision: 5 }
     }
     Component {
         name: "QQuickDelayButton"
@@ -1140,9 +1147,10 @@ Module {
         prototype: "QQuickContainer"
         exports: [
             "QtQuick.Templates/DialogButtonBox 2.1",
-            "QtQuick.Templates/DialogButtonBox 2.3"
+            "QtQuick.Templates/DialogButtonBox 2.3",
+            "QtQuick.Templates/DialogButtonBox 2.5"
         ]
-        exportMetaObjectRevisions: [0, 3]
+        exportMetaObjectRevisions: [0, 3, 5]
         attachedType: "QQuickDialogButtonBoxAttached"
         Enum {
             name: "Position"
@@ -1151,10 +1159,23 @@ Module {
                 "Footer": 1
             }
         }
+        Enum {
+            name: "ButtonLayout"
+            values: {
+                "UnknownLayout": -1,
+                "WinLayout": 0,
+                "MacLayout": 1,
+                "KdeLayout": 2,
+                "GnomeLayout": 3,
+                "MacModelessLayout": 4,
+                "AndroidLayout": 5
+            }
+        }
         Property { name: "position"; type: "Position" }
         Property { name: "alignment"; type: "Qt::Alignment" }
         Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "buttonLayout"; revision: 5; type: "ButtonLayout" }
         Signal { name: "accepted" }
         Signal { name: "rejected" }
         Signal { name: "helpRequested" }
@@ -1165,6 +1186,7 @@ Module {
         Signal { name: "applied"; revision: 3 }
         Signal { name: "reset"; revision: 3 }
         Signal { name: "discarded"; revision: 3 }
+        Signal { name: "buttonLayoutChanged"; revision: 5 }
         Method {
             name: "standardButton"
             type: "QQuickAbstractButton*"
@@ -1208,7 +1230,6 @@ Module {
         Property { name: "title"; type: "string" }
         Property { name: "label"; type: "QQuickItem"; isPointer: true }
     }
-
     Component {
         name: "QQuickIcon"
         Property { name: "name"; type: "string" }
@@ -1217,7 +1238,6 @@ Module {
         Property { name: "height"; type: "int" }
         Property { name: "color"; type: "QColor" }
     }
-
     Component {
         name: "QQuickItemDelegate"
         defaultProperty: "data"
@@ -1455,18 +1475,14 @@ Module {
     Component {
         name: "QQuickPage"
         defaultProperty: "contentData"
-        prototype: "QQuickControl"
+        prototype: "QQuickPane"
         exports: ["QtQuick.Templates/Page 2.0", "QtQuick.Templates/Page 2.1"]
         exportMetaObjectRevisions: [0, 1]
         Property { name: "title"; type: "string" }
         Property { name: "header"; type: "QQuickItem"; isPointer: true }
         Property { name: "footer"; type: "QQuickItem"; isPointer: true }
-        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
         Property { name: "contentWidth"; revision: 1; type: "double" }
         Property { name: "contentHeight"; revision: 1; type: "double" }
-        Signal { name: "contentWidthChanged"; revision: 1 }
-        Signal { name: "contentHeightChanged"; revision: 1 }
     }
     Component {
         name: "QQuickPageIndicator"
@@ -1497,9 +1513,10 @@ Module {
         exports: [
             "QtQuick.Templates/Popup 2.0",
             "QtQuick.Templates/Popup 2.1",
-            "QtQuick.Templates/Popup 2.3"
+            "QtQuick.Templates/Popup 2.3",
+            "QtQuick.Templates/Popup 2.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 3]
+        exportMetaObjectRevisions: [0, 1, 3, 5]
         Enum {
             name: "ClosePolicy"
             values: {
@@ -1570,6 +1587,15 @@ Module {
         Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "enabled"; revision: 3; type: "bool" }
         Property { name: "palette"; revision: 3; type: "QPalette" }
+        Property { name: "horizontalPadding"; type: "double" }
+        Property { name: "verticalPadding"; type: "double" }
+        Property {
+            name: "anchors"
+            revision: 5
+            type: "QQuickPopupAnchors"
+            isReadonly: true
+            isPointer: true
+        }
         Signal { name: "opened" }
         Signal { name: "closed" }
         Signal { name: "aboutToShow" }
@@ -1583,6 +1609,8 @@ Module {
         Signal { name: "mirroredChanged"; revision: 3 }
         Signal { name: "enabledChanged"; revision: 3 }
         Signal { name: "paletteChanged"; revision: 3 }
+        Signal { name: "horizontalPaddingChanged"; revision: 5 }
+        Signal { name: "verticalPaddingChanged"; revision: 5 }
         Method { name: "open" }
         Method { name: "close" }
         Method {
@@ -1592,6 +1620,11 @@ Module {
         Method { name: "forceActiveFocus" }
     }
     Component {
+        name: "QQuickPopupAnchors"
+        prototype: "QObject"
+        Property { name: "centerIn"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
         name: "QQuickProgressBar"
         defaultProperty: "data"
         prototype: "QQuickControl"
@@ -1626,9 +1659,10 @@ Module {
             "QtQuick.Templates/RangeSlider 2.0",
             "QtQuick.Templates/RangeSlider 2.1",
             "QtQuick.Templates/RangeSlider 2.2",
-            "QtQuick.Templates/RangeSlider 2.3"
+            "QtQuick.Templates/RangeSlider 2.3",
+            "QtQuick.Templates/RangeSlider 2.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3]
+        exportMetaObjectRevisions: [0, 1, 2, 3, 5]
         Enum {
             name: "SnapMode"
             values: {
@@ -1647,12 +1681,20 @@ Module {
         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 }
+        Property { name: "touchDragThreshold"; revision: 5; type: "double" }
         Signal { name: "liveChanged"; revision: 2 }
+        Signal { name: "touchDragThresholdChanged"; revision: 5 }
         Method {
             name: "setValues"
             Parameter { name: "firstValue"; type: "double" }
             Parameter { name: "secondValue"; type: "double" }
         }
+        Method {
+            name: "valueAt"
+            revision: 5
+            type: "double"
+            Parameter { name: "position"; type: "double" }
+        }
     }
     Component {
         name: "QQuickRangeSliderNode"
@@ -1664,6 +1706,7 @@ Module {
         Property { name: "pressed"; type: "bool" }
         Property { name: "hovered"; revision: 1; type: "bool" }
         Signal { name: "hoveredChanged"; revision: 1 }
+        Signal { name: "moved" }
         Method { name: "increase" }
         Method { name: "decrease" }
     }
@@ -1781,13 +1824,9 @@ Module {
     Component {
         name: "QQuickScrollView"
         defaultProperty: "contentData"
-        prototype: "QQuickControl"
+        prototype: "QQuickPane"
         exports: ["QtQuick.Templates/ScrollView 2.2"]
         exportMetaObjectRevisions: [0]
-        Property { name: "contentWidth"; type: "double" }
-        Property { name: "contentHeight"; type: "double" }
-        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
     }
     Component {
         name: "QQuickSlider"
@@ -1797,9 +1836,10 @@ Module {
             "QtQuick.Templates/Slider 2.0",
             "QtQuick.Templates/Slider 2.1",
             "QtQuick.Templates/Slider 2.2",
-            "QtQuick.Templates/Slider 2.3"
+            "QtQuick.Templates/Slider 2.3",
+            "QtQuick.Templates/Slider 2.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3]
+        exportMetaObjectRevisions: [0, 1, 2, 3, 5]
         Enum {
             name: "SnapMode"
             values: {
@@ -1821,8 +1861,10 @@ Module {
         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 }
+        Property { name: "touchDragThreshold"; revision: 5; type: "double" }
         Signal { name: "moved"; revision: 2 }
         Signal { name: "liveChanged"; revision: 2 }
+        Signal { name: "touchDragThresholdChanged"; revision: 5 }
         Method { name: "increase" }
         Method { name: "decrease" }
         Method {
@@ -2113,9 +2155,10 @@ Module {
         exports: [
             "QtQuick.Templates/TextArea 2.0",
             "QtQuick.Templates/TextArea 2.1",
-            "QtQuick.Templates/TextArea 2.3"
+            "QtQuick.Templates/TextArea 2.3",
+            "QtQuick.Templates/TextArea 2.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 3]
+        exportMetaObjectRevisions: [0, 1, 3, 5]
         attachedType: "QQuickTextAreaAttached"
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
@@ -2126,6 +2169,7 @@ Module {
         Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true }
         Property { name: "hoverEnabled"; revision: 1; type: "bool" }
         Property { name: "palette"; revision: 3; type: "QPalette" }
+        Property { name: "placeholderTextColor"; revision: 5; type: "QColor" }
         Signal { name: "implicitWidthChanged3" }
         Signal { name: "implicitHeightChanged3" }
         Signal {
@@ -2145,6 +2189,7 @@ Module {
         Signal { name: "hoveredChanged"; revision: 1 }
         Signal { name: "hoverEnabledChanged"; revision: 1 }
         Signal { name: "paletteChanged"; revision: 3 }
+        Signal { name: "placeholderTextColorChanged"; revision: 5 }
     }
     Component {
         name: "QQuickTextAreaAttached"
@@ -2158,9 +2203,10 @@ Module {
         exports: [
             "QtQuick.Templates/TextField 2.0",
             "QtQuick.Templates/TextField 2.1",
-            "QtQuick.Templates/TextField 2.3"
+            "QtQuick.Templates/TextField 2.3",
+            "QtQuick.Templates/TextField 2.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 3]
+        exportMetaObjectRevisions: [0, 1, 3, 5]
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
         Property { name: "implicitHeight"; type: "double" }
@@ -2170,6 +2216,7 @@ Module {
         Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true }
         Property { name: "hoverEnabled"; revision: 1; type: "bool" }
         Property { name: "palette"; revision: 3; type: "QPalette" }
+        Property { name: "placeholderTextColor"; revision: 5; type: "QColor" }
         Signal { name: "implicitWidthChanged3" }
         Signal { name: "implicitHeightChanged3" }
         Signal {
@@ -2189,6 +2236,7 @@ Module {
         Signal { name: "hoveredChanged"; revision: 1 }
         Signal { name: "hoverEnabledChanged"; revision: 1 }
         Signal { name: "paletteChanged"; revision: 3 }
+        Signal { name: "placeholderTextColorChanged"; revision: 5 }
     }
     Component {
         name: "QQuickToolBar"
@@ -2226,12 +2274,27 @@ Module {
         name: "QQuickToolTip"
         defaultProperty: "contentData"
         prototype: "QQuickPopup"
-        exports: ["QtQuick.Templates/ToolTip 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/ToolTip 2.0",
+            "QtQuick.Templates/ToolTip 2.5"
+        ]
+        exportMetaObjectRevisions: [0, 5]
         attachedType: "QQuickToolTipAttached"
         Property { name: "delay"; type: "int" }
         Property { name: "timeout"; type: "int" }
         Property { name: "text"; type: "string" }
+        Method {
+            name: "show"
+            revision: 5
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "ms"; type: "int" }
+        }
+        Method {
+            name: "show"
+            revision: 5
+            Parameter { name: "text"; type: "string" }
+        }
+        Method { name: "hide"; revision: 5 }
     }
     Component {
         name: "QQuickToolTipAttached"
@@ -2263,6 +2326,17 @@ Module {
         ]
         exportMetaObjectRevisions: [0, 1, 2]
         attachedType: "QQuickTumblerAttached"
+        Enum {
+            name: "PositionMode"
+            values: {
+                "Beginning": 0,
+                "Center": 1,
+                "End": 2,
+                "Visible": 3,
+                "Contain": 4,
+                "SnapPosition": 5
+            }
+        }
         Property { name: "model"; type: "QVariant" }
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "currentIndex"; type: "int" }
@@ -2273,6 +2347,12 @@ Module {
         Property { name: "moving"; revision: 2; type: "bool"; isReadonly: true }
         Signal { name: "wrapChanged"; revision: 1 }
         Signal { name: "movingChanged"; revision: 2 }
+        Method {
+            name: "positionViewAtIndex"
+            revision: 5
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "mode"; type: "PositionMode" }
+        }
     }
     Component {
         name: "QQuickTumblerAttached"