Update plugins.qmltypes for templates and controls

For src/imports/templates, simply running 'make qmltypes' does the job.
With src/imports/controls, we must help qmlplugindump a bit:

- pass the correct dependencies in a JSON file (or else qmlimportscanner
  will find .impl imports, which qmlplugindump will fail to import as
  stand-alone modules)
- merge with the plugins.qmltypes from templates to achieve proper type
  hierarchy

The full command for dumping QtQuick.Controls 2.1 types, also seen at
the top of src/imports/controls/plugins.qmltypes:

    qmlplugindump -nonrelocatable QtQuick.Controls 2.1 \
                  -merge ../templates/plugins.qmltypes \
                  -dependencies dependencies.json

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

1 files changed, 235 insertions, 31 deletions

diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index bd4fa353..f32f4664 100644
--- a/src/imports/templates/plugins.qmltypes
+++ b/src/imports/templates/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.Templates 2.0'
+// 'qmlplugindump -nonrelocatable QtQuick.Templates 2.1'
 
 Module {
     dependencies: ["QtQuick.Window 2.2"]
@@ -75,6 +75,36 @@ Module {
         Property { name: "flat"; type: "bool" }
     }
     Component {
+        name: "QQuickButtonGroup"
+        prototype: "QObject"
+        exports: [
+            "QtQuick.Templates/ButtonGroup 2.0",
+            "QtQuick.Templates/ButtonGroup 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
+        attachedType: "QQuickButtonGroupAttached"
+        Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true }
+        Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true }
+        Signal {
+            name: "clicked"
+            revision: 1
+            Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
+        }
+        Method {
+            name: "addButton"
+            Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
+        }
+        Method {
+            name: "removeButton"
+            Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QQuickButtonGroupAttached"
+        prototype: "QObject"
+        Property { name: "group"; type: "QQuickButtonGroup"; isPointer: true }
+    }
+    Component {
         name: "QQuickCheckBox"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
@@ -141,8 +171,11 @@ Module {
         name: "QQuickContainer"
         defaultProperty: "contentData"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/Container 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/Container 2.0",
+            "QtQuick.Templates/Container 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
@@ -153,6 +186,8 @@ Module {
             name: "setCurrentIndex"
             Parameter { name: "index"; type: "int" }
         }
+        Method { name: "incrementCurrentIndex"; revision: 1 }
+        Method { name: "decrementCurrentIndex"; revision: 1 }
         Method {
             name: "itemAt"
             type: "QQuickItem*"
@@ -231,6 +266,58 @@ Module {
         Method { name: "decrease" }
     }
     Component {
+        name: "QQuickDialog"
+        defaultProperty: "contentData"
+        prototype: "QQuickPopup"
+        exports: ["QtQuick.Templates/Dialog 2.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "header"; type: "QQuickItem"; isPointer: true }
+        Property { name: "footer"; type: "QQuickItem"; isPointer: true }
+        Property { name: "buttonBox"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" }
+        Signal { name: "accepted" }
+        Signal { name: "rejected" }
+        Method { name: "accept" }
+        Method { name: "reject" }
+    }
+    Component {
+        name: "QQuickDialogButtonBox"
+        defaultProperty: "contentData"
+        prototype: "QQuickContainer"
+        exports: ["QtQuick.Templates/DialogButtonBox 2.1"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickDialogButtonBoxAttached"
+        Enum {
+            name: "Position"
+            values: {
+                "Header": 0,
+                "Footer": 1
+            }
+        }
+        Property { name: "position"; type: "Position" }
+        Property { name: "alignment"; type: "Qt::Alignment" }
+        Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Signal { name: "accepted" }
+        Signal { name: "rejected" }
+        Signal { name: "helpRequested" }
+        Signal {
+            name: "clicked"
+            Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true }
+        }
+        Method {
+            name: "standardButton"
+            type: "QQuickAbstractButton*"
+            Parameter { name: "button"; type: "QPlatformDialogHelper::StandardButton" }
+        }
+    }
+    Component {
+        name: "QQuickDialogButtonBoxAttached"
+        prototype: "QObject"
+        Property { name: "buttonBox"; type: "QQuickDialogButtonBox"; isReadonly: true; isPointer: true }
+        Property { name: "buttonRole"; type: "QPlatformDialogHelper::ButtonRole" }
+    }
+    Component {
         name: "QQuickDrawer"
         defaultProperty: "contentData"
         prototype: "QQuickPopup"
@@ -495,8 +582,8 @@ Module {
         name: "QQuickOverlay"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        Property { name: "modal"; type: "QQuickItem"; isPointer: true }
-        Property { name: "modeless"; type: "QQuickItem"; isPointer: true }
+        Property { name: "modal"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "modeless"; type: "QQmlComponent"; isPointer: true }
         Signal { name: "pressed" }
         Signal { name: "released" }
     }
@@ -538,8 +625,11 @@ Module {
         name: "QQuickPopup"
         defaultProperty: "contentData"
         prototype: "QObject"
-        exports: ["QtQuick.Templates/Popup 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/Popup 2.0",
+            "QtQuick.Templates/Popup 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "ClosePolicy"
             values: {
@@ -586,6 +676,8 @@ Module {
         Property { name: "leftPadding"; type: "double" }
         Property { name: "rightPadding"; type: "double" }
         Property { name: "bottomPadding"; type: "double" }
+        Property { name: "allowVerticalFlip"; revision: 1; type: "bool" }
+        Property { name: "allowHorizontalFlip"; revision: 1; type: "bool" }
         Property { name: "locale"; type: "QLocale" }
         Property { name: "font"; type: "QFont" }
         Property { name: "parent"; type: "QQuickItem"; isPointer: true }
@@ -605,6 +697,8 @@ Module {
         Property { name: "transformOrigin"; type: "TransformOrigin" }
         Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
         Property { name: "exit"; type: "QQuickTransition"; isPointer: true }
+        Signal { name: "allowVerticalFlipChanged"; revision: 1 }
+        Signal { name: "allowHorizontalFlipChanged"; revision: 1 }
         Signal {
             name: "windowChanged"
             Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
@@ -615,6 +709,11 @@ Module {
         Signal { name: "closed" }
         Method { name: "open" }
         Method { name: "close" }
+        Method {
+            name: "forceActiveFocus"
+            Parameter { name: "reason"; type: "Qt::FocusReason" }
+        }
+        Method { name: "forceActiveFocus" }
     }
     Component {
         name: "QQuickProgressBar"
@@ -647,8 +746,11 @@ Module {
         name: "QQuickRangeSlider"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/RangeSlider 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/RangeSlider 2.0",
+            "QtQuick.Templates/RangeSlider 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "SnapMode"
             values: {
@@ -678,6 +780,8 @@ Module {
         Property { name: "visualPosition"; type: "double"; isReadonly: true }
         Property { name: "handle"; type: "QQuickItem"; isPointer: true }
         Property { name: "pressed"; type: "bool" }
+        Property { name: "hovered"; revision: 1; type: "bool" }
+        Signal { name: "hoveredChanged"; revision: 1 }
         Method { name: "increase" }
         Method { name: "decrease" }
     }
@@ -754,8 +858,11 @@ Module {
         name: "QQuickSlider"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/Slider 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/Slider 2.0",
+            "QtQuick.Templates/Slider 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "SnapMode"
             values: {
@@ -776,13 +883,22 @@ Module {
         Property { name: "handle"; type: "QQuickItem"; isPointer: true }
         Method { name: "increase" }
         Method { name: "decrease" }
+        Method {
+            name: "valueAt"
+            revision: 1
+            type: "double"
+            Parameter { name: "position"; type: "double" }
+        }
     }
     Component {
         name: "QQuickSpinBox"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/SpinBox 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/SpinBox 2.0",
+            "QtQuick.Templates/SpinBox 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "from"; type: "int" }
         Property { name: "to"; type: "int" }
         Property { name: "value"; type: "int" }
@@ -800,7 +916,9 @@ Module {
         name: "QQuickSpinButton"
         prototype: "QObject"
         Property { name: "pressed"; type: "bool" }
+        Property { name: "hovered"; revision: 1; type: "bool" }
         Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+        Signal { name: "hoveredChanged"; revision: 1 }
     }
     Component {
         name: "QQuickStackAttached"
@@ -808,13 +926,20 @@ Module {
         Property { name: "index"; type: "int"; isReadonly: true }
         Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true }
         Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true }
+        Signal { name: "activated" }
+        Signal { name: "activating" }
+        Signal { name: "deactivated" }
+        Signal { name: "deactivating" }
     }
     Component {
         name: "QQuickStackView"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/StackView 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/StackView 2.0",
+            "QtQuick.Templates/StackView 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         attachedType: "QQuickStackAttached"
         Enum {
             name: "Status"
@@ -835,8 +960,11 @@ Module {
         Enum {
             name: "Operation"
             values: {
-                "Transition": 0,
-                "Immediate": 1
+                "Transition": -1,
+                "Immediate": 0,
+                "PushTransition": 1,
+                "ReplaceTransition": 2,
+                "PopTransition": 3
             }
         }
         Property { name: "busy"; type: "bool"; isReadonly: true }
@@ -896,30 +1024,47 @@ Module {
         Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Signal { name: "completed"; revision: 1 }
+        Method { name: "close"; revision: 1 }
     }
     Component {
         name: "QQuickSwipeDelegate"
         defaultProperty: "data"
         prototype: "QQuickItemDelegate"
-        exports: ["QtQuick.Templates/SwipeDelegate 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/SwipeDelegate 2.0",
+            "QtQuick.Templates/SwipeDelegate 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
+        attachedType: "QQuickSwipeDelegateAttached"
         Property { name: "swipe"; type: "QQuickSwipe"; isReadonly: true; isPointer: true }
     }
     Component {
+        name: "QQuickSwipeDelegateAttached"
+        prototype: "QObject"
+        Property { name: "pressed"; type: "bool"; isReadonly: true }
+        Signal { name: "clicked" }
+    }
+    Component {
         name: "QQuickSwipeView"
         defaultProperty: "contentData"
         prototype: "QQuickContainer"
-        exports: ["QtQuick.Templates/SwipeView 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/SwipeView 2.0",
+            "QtQuick.Templates/SwipeView 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         attachedType: "QQuickSwipeViewAttached"
+        Property { name: "interactive"; revision: 1; type: "bool" }
+        Signal { name: "interactiveChanged"; revision: 1 }
     }
     Component {
         name: "QQuickSwipeViewAttached"
         prototype: "QObject"
         Property { name: "index"; type: "int"; isReadonly: true }
         Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
-        Property { name: "isPreviousItem"; type: "bool"; isReadonly: true }
-        Property { name: "isNextItem"; type: "bool"; isReadonly: true }
+        Property { name: "isNextItem"; revision: 1; type: "bool"; isReadonly: true }
+        Property { name: "isPreviousItem"; revision: 1; type: "bool"; isReadonly: true }
         Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true }
     }
     Component {
@@ -1143,8 +1288,11 @@ Module {
         name: "QQuickTextArea"
         defaultProperty: "data"
         prototype: "QQuickTextEdit"
-        exports: ["QtQuick.Templates/TextArea 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/TextArea 2.0",
+            "QtQuick.Templates/TextArea 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         attachedType: "QQuickTextAreaAttached"
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
@@ -1152,12 +1300,26 @@ Module {
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
         Property { name: "placeholderText"; type: "string" }
         Property { name: "focusReason"; type: "Qt::FocusReason" }
+        Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true }
+        Property { name: "hoverEnabled"; revision: 1; type: "bool" }
         Signal { name: "implicitWidthChanged3" }
         Signal { name: "implicitHeightChanged3" }
+        Signal { name: "hoveredChanged"; revision: 1 }
+        Signal { name: "hoverEnabledChanged"; revision: 1 }
         Signal {
             name: "pressAndHold"
             Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
         }
+        Signal {
+            name: "pressed"
+            revision: 1
+            Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "released"
+            revision: 1
+            Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+        }
     }
     Component {
         name: "QQuickTextAreaAttached"
@@ -1238,6 +1400,7 @@ Module {
         Property { name: "cursorPosition"; type: "int" }
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "overwriteMode"; type: "bool" }
         Property { name: "selectionStart"; type: "int"; isReadonly: true }
         Property { name: "selectionEnd"; type: "int"; isReadonly: true }
         Property { name: "selectedText"; type: "string"; isReadonly: true }
@@ -1307,6 +1470,10 @@ Module {
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
         Signal {
+            name: "overwriteModeChanged"
+            Parameter { name: "overwriteMode"; type: "bool" }
+        }
+        Signal {
             name: "activeFocusOnPressChanged"
             Parameter { name: "activeFocusOnPressed"; type: "bool" }
         }
@@ -1432,19 +1599,36 @@ Module {
         name: "QQuickTextField"
         defaultProperty: "data"
         prototype: "QQuickTextInput"
-        exports: ["QtQuick.Templates/TextField 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/TextField 2.0",
+            "QtQuick.Templates/TextField 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
         Property { name: "implicitHeight"; type: "double" }
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
         Property { name: "placeholderText"; type: "string" }
         Property { name: "focusReason"; type: "Qt::FocusReason" }
+        Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true }
+        Property { name: "hoverEnabled"; revision: 1; type: "bool" }
         Signal { name: "implicitWidthChanged3" }
         Signal { name: "implicitHeightChanged3" }
+        Signal { name: "hoveredChanged"; revision: 1 }
+        Signal { name: "hoverEnabledChanged"; revision: 1 }
         Signal {
             name: "pressAndHold"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "pressed"
+            revision: 1
+            Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "released"
+            revision: 1
+            Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
         }
     }
     Component {
@@ -1522,6 +1706,7 @@ Module {
         Property { name: "cursorPosition"; type: "int" }
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "overwriteMode"; type: "bool" }
         Property { name: "selectionStart"; type: "int"; isReadonly: true }
         Property { name: "selectionEnd"; type: "int"; isReadonly: true }
         Property { name: "selectedText"; type: "string"; isReadonly: true }
@@ -1575,6 +1760,10 @@ Module {
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
         Signal {
+            name: "overwriteModeChanged"
+            Parameter { name: "overwriteMode"; type: "bool" }
+        }
+        Signal {
             name: "maximumLengthChanged"
             Parameter { name: "maximumLength"; type: "int" }
         }
@@ -1684,7 +1873,7 @@ Module {
     Component {
         name: "QQuickToolBar"
         defaultProperty: "contentData"
-        prototype: "QQuickFrame"
+        prototype: "QQuickPane"
         exports: ["QtQuick.Templates/ToolBar 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
@@ -1704,6 +1893,16 @@ Module {
         exportMetaObjectRevisions: [0]
     }
     Component {
+        name: "QQuickToolSeparator"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/ToolSeparator 2.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "orientation"; type: "Qt::Orientation" }
+        Property { name: "horizontal"; type: "bool"; isReadonly: true }
+        Property { name: "vertical"; type: "bool"; isReadonly: true }
+    }
+    Component {
         name: "QQuickToolTip"
         defaultProperty: "contentData"
         prototype: "QQuickPopup"
@@ -1739,8 +1938,11 @@ Module {
         name: "QQuickTumbler"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/Tumbler 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtQuick.Templates/Tumbler 2.0",
+            "QtQuick.Templates/Tumbler 2.1"
+        ]
+        exportMetaObjectRevisions: [0, 1]
         attachedType: "QQuickTumblerAttached"
         Property { name: "model"; type: "QVariant" }
         Property { name: "count"; type: "int"; isReadonly: true }
@@ -1748,6 +1950,8 @@ Module {
         Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
         Property { name: "visibleItemCount"; type: "int" }
+        Property { name: "wrap"; revision: 1; type: "bool" }
+        Signal { name: "wrapChanged"; revision: 1 }
     }
     Component {
         name: "QQuickTumblerAttached"