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, 454 insertions, 400 deletions

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index c8cde812..0700e7bf 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -4,146 +4,48 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.0 -merge ..\templates\plugins.qmltypes -dependencies dep.json'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.1 -merge ../templates/plugins.qmltypes -dependencies dependencies.json'
 
 Module {
-    dependencies: ["QtQuick.Templates 2.0", "QtQuick.Window 2.2", "QtQuick 2.7"]
-    Component {
-        name: "QQuickAbstractAnimation"
-        prototype: "QObject"
-        Enum {
-            name: "Loops"
-            values: {
-                "Infinite": -2
-            }
-        }
-        Property { name: "running"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Property { name: "alwaysRunToEnd"; type: "bool" }
-        Property { name: "loops"; type: "int" }
-        Signal { name: "started" }
-        Signal { name: "stopped" }
-        Signal {
-            name: "runningChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "pausedChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "alwaysRunToEndChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "loopCountChanged"
-            Parameter { type: "int" }
-        }
-        Method { name: "restart" }
-        Method { name: "start" }
-        Method { name: "pause" }
-        Method { name: "resume" }
-        Method { name: "stop" }
-        Method { name: "complete" }
-    }
-    Component {
-        name: "QQuickAnimator"
-        prototype: "QQuickAbstractAnimation"
-        exports: [
-            "QtQuick.Controls.impl/BusyRingAnimator 2.0",
-            "QtQuick.Controls.impl/ProgressStripAnimator 2.0"
-        ]
-        exportMetaObjectRevisions: [0, 0]
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "easing"; type: "QEasingCurve" }
-        Property { name: "duration"; type: "int" }
-        Property { name: "to"; type: "double" }
-        Property { name: "from"; type: "double" }
-        Signal {
-            name: "targetItemChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "durationChanged"
-            Parameter { name: "duration"; type: "int" }
-        }
-        Signal {
-            name: "easingChanged"
-            Parameter { name: "curve"; type: "QEasingCurve" }
-        }
-        Signal {
-            name: "toChanged"
-            Parameter { name: "to"; type: "double" }
-        }
-        Signal {
-            name: "fromChanged"
-            Parameter { name: "from"; type: "double" }
-        }
-    }
+    dependencies: [
+        "QtQuick 2.8",
+        "QtQuick.Templates 2.1",
+        "QtQuick.Window 2.2"
+    ]
     Component {
         name: "QQuickBusyIndicatorRing"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtQuick.Controls.impl/BusyRing 2.0"]
+        exports: ["QtQuick.Controls.impl/BusyRing 2.1"]
         exportMetaObjectRevisions: [0]
     }
     Component {
-        name: "QQuickButtonGroup"
-        prototype: "QObject"
-        exports: ["QtQuick.Controls/ButtonGroup 2.0"]
-        exportMetaObjectRevisions: [0]
-        attachedType: "QQuickButtonGroupAttached"
-        Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true }
-        Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: 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: "QQuickDialRing"
         defaultProperty: "data"
         prototype: "QQuickPaintedItem"
-        exports: ["QtQuick.Controls.impl/DialRing 2.0"]
+        exports: ["QtQuick.Controls.impl/DialRing 2.1"]
         exportMetaObjectRevisions: [0]
         Property { name: "progress"; type: "double" }
         Property { name: "color"; type: "QColor" }
     }
     Component {
-        name: "QQuickPaintedItem"
+        name: "QQuickProgressStrip"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        Enum {
-            name: "RenderTarget"
-            values: {
-                "Image": 0,
-                "FramebufferObject": 1,
-                "InvertedYFramebufferObject": 2
-            }
-        }
-        Property { name: "contentsSize"; type: "QSize" }
-        Property { name: "fillColor"; type: "QColor" }
-        Property { name: "contentsScale"; type: "double" }
-        Property { name: "renderTarget"; type: "RenderTarget" }
-        Property { name: "textureSize"; type: "QSize" }
+        exports: ["QtQuick.Controls.impl/ProgressStrip 2.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "indeterminate"; type: "bool" }
+        Property { name: "progress"; type: "double" }
     }
     Component {
-        name: "QQuickProgressStrip"
+        name: "QQuickTumblerView"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtQuick.Controls.impl/ProgressStrip 2.0"]
+        exports: ["QtQuick.Controls.impl/TumblerView 2.1"]
         exportMetaObjectRevisions: [0]
-        Property { name: "indeterminate"; type: "bool" }
-        Property { name: "progress"; type: "double" }
+        Property { name: "model"; type: "QVariant" }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "path"; type: "QQuickPath"; isPointer: true }
     }
     Component {
         prototype: "QQuickApplicationWindow"
@@ -186,17 +88,13 @@ Module {
         defaultProperty: "data"
     }
     Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.Controls.impl/CheckIndicator 2.0"
-        exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
-        exportMetaObjectRevisions: [0]
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.impl/CheckIndicator 2.1"
+        exports: ["QtQuick.Controls.impl/CheckIndicator 2.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "gradient"; type: "QQuickGradient"; isPointer: true }
-        Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
-        Property { name: "radius"; type: "double" }
     }
     Component {
         prototype: "QQuickComboBox"
@@ -215,6 +113,22 @@ Module {
         defaultProperty: "data"
     }
     Component {
+        prototype: "QQuickDialog"
+        name: "QtQuick.Controls/Dialog 2.1"
+        exports: ["QtQuick.Controls/Dialog 2.1"]
+        exportMetaObjectRevisions: [1]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickDialogButtonBox"
+        name: "QtQuick.Controls/DialogButtonBox 2.1"
+        exports: ["QtQuick.Controls/DialogButtonBox 2.1"]
+        exportMetaObjectRevisions: [1]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
         prototype: "QQuickDrawer"
         name: "QtQuick.Controls/Drawer 2.0"
         exports: ["QtQuick.Controls/Drawer 2.0"]
@@ -327,17 +241,13 @@ Module {
         defaultProperty: "data"
     }
     Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.Controls.impl/RadioIndicator 2.0"
-        exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
-        exportMetaObjectRevisions: [0]
+        prototype: "QQuickRectangle"
+        name: "QtQuick.Controls.impl/RadioIndicator 2.1"
+        exports: ["QtQuick.Controls.impl/RadioIndicator 2.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "gradient"; type: "QQuickGradient"; isPointer: true }
-        Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
-        Property { name: "radius"; type: "double" }
     }
     Component {
         prototype: "QQuickRangeSlider"
@@ -421,9 +331,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.Controls.impl/SwitchIndicator 2.0"
-        exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.Controls.impl/SwitchIndicator 2.1"
+        exports: ["QtQuick.Controls.impl/SwitchIndicator 2.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
@@ -477,6 +387,14 @@ Module {
         defaultProperty: "data"
     }
     Component {
+        prototype: "QQuickToolSeparator"
+        name: "QtQuick.Controls/ToolSeparator 2.1"
+        exports: ["QtQuick.Controls/ToolSeparator 2.1"]
+        exportMetaObjectRevisions: [1]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
         prototype: "QQuickToolTip"
         name: "QtQuick.Controls/ToolTip 2.0"
         exports: ["QtQuick.Controls/ToolTip 2.0"]
@@ -492,6 +410,7 @@ Module {
         isComposite: true
         defaultProperty: "data"
     }
+
     Component {
         name: "QQuickAbstractButton"
         defaultProperty: "data"
@@ -559,6 +478,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"
@@ -625,8 +574,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 }
@@ -637,6 +589,8 @@ Module {
             name: "setCurrentIndex"
             Parameter { name: "index"; type: "int" }
         }
+        Method { name: "incrementCurrentIndex"; revision: 1 }
+        Method { name: "decrementCurrentIndex"; revision: 1 }
         Method {
             name: "itemAt"
             type: "QQuickItem*"
@@ -715,6 +669,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"
@@ -750,6 +756,172 @@ Module {
         Signal { name: "implicitHeightChanged2"; revision: 1 }
     }
     Component {
+        name: "QQuickItem"
+        defaultProperty: "data"
+        prototype: "QObject"
+        Enum {
+            name: "TransformOrigin"
+            values: {
+                "TopLeft": 0,
+                "Top": 1,
+                "TopRight": 2,
+                "Left": 3,
+                "Center": 4,
+                "Right": 5,
+                "BottomLeft": 6,
+                "Bottom": 7,
+                "BottomRight": 8
+            }
+        }
+        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "x"; type: "double" }
+        Property { name: "y"; type: "double" }
+        Property { name: "z"; type: "double" }
+        Property { name: "width"; type: "double" }
+        Property { name: "height"; type: "double" }
+        Property { name: "opacity"; type: "double" }
+        Property { name: "enabled"; type: "bool" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
+        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
+        Property { name: "state"; type: "string" }
+        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
+        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "baselineOffset"; type: "double" }
+        Property { name: "clip"; type: "bool" }
+        Property { name: "focus"; type: "bool" }
+        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
+        Property { name: "rotation"; type: "double" }
+        Property { name: "scale"; type: "double" }
+        Property { name: "transformOrigin"; type: "TransformOrigin" }
+        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
+        Property { name: "smooth"; type: "bool" }
+        Property { name: "antialiasing"; type: "bool" }
+        Property { name: "implicitWidth"; type: "double" }
+        Property { name: "implicitHeight"; type: "double" }
+        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
+        Signal {
+            name: "childrenRectChanged"
+            Parameter { type: "QRectF" }
+        }
+        Signal {
+            name: "baselineOffsetChanged"
+            Parameter { type: "double" }
+        }
+        Signal {
+            name: "stateChanged"
+            Parameter { type: "string" }
+        }
+        Signal {
+            name: "focusChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "activeFocusChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "activeFocusOnTabChanged"
+            revision: 1
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "parentChanged"
+            Parameter { type: "QQuickItem"; isPointer: true }
+        }
+        Signal {
+            name: "transformOriginChanged"
+            Parameter { type: "TransformOrigin" }
+        }
+        Signal {
+            name: "smoothChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "antialiasingChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "clipChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "windowChanged"
+            revision: 1
+            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+        }
+        Method { name: "update" }
+        Method {
+            name: "grabToImage"
+            revision: 2
+            type: "bool"
+            Parameter { name: "callback"; type: "QJSValue" }
+            Parameter { name: "targetSize"; type: "QSize" }
+        }
+        Method {
+            name: "grabToImage"
+            revision: 2
+            type: "bool"
+            Parameter { name: "callback"; type: "QJSValue" }
+        }
+        Method {
+            name: "contains"
+            type: "bool"
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
+            name: "mapToGlobal"
+            revision: 7
+            type: "QPointF"
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
+            name: "mapFromGlobal"
+            revision: 7
+            type: "QPointF"
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
+            name: "mapFromItem"
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "mapToItem"
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method { name: "forceActiveFocus" }
+        Method {
+            name: "forceActiveFocus"
+            Parameter { name: "reason"; type: "Qt::FocusReason" }
+        }
+        Method {
+            name: "nextItemInFocusChain"
+            revision: 1
+            type: "QQuickItem*"
+            Parameter { name: "forward"; type: "bool" }
+        }
+        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
+        Method {
+            name: "childAt"
+            type: "QQuickItem*"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+    }
+    Component {
         name: "QQuickItemDelegate"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
@@ -813,8 +985,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" }
     }
@@ -856,8 +1028,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: {
@@ -904,6 +1079,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 }
@@ -923,6 +1100,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 }
@@ -933,6 +1112,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"
@@ -965,8 +1149,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: {
@@ -996,6 +1183,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" }
     }
@@ -1072,8 +1261,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: {
@@ -1094,13 +1286,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" }
@@ -1118,7 +1319,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"
@@ -1126,13 +1329,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"
@@ -1153,8 +1363,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 }
@@ -1214,28 +1427,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: "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 {
@@ -1459,8 +1691,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" }
@@ -1468,12 +1703,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"
@@ -1554,6 +1803,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 }
@@ -1623,6 +1873,10 @@ Module {
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
         Signal {
+            name: "overwriteModeChanged"
+            Parameter { name: "overwriteMode"; type: "bool" }
+        }
+        Signal {
             name: "activeFocusOnPressChanged"
             Parameter { name: "activeFocusOnPressed"; type: "bool" }
         }
@@ -1748,19 +2002,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 {
@@ -1838,6 +2109,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 }
@@ -1891,6 +2163,10 @@ Module {
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
         Signal {
+            name: "overwriteModeChanged"
+            Parameter { name: "overwriteMode"; type: "bool" }
+        }
+        Signal {
             name: "maximumLengthChanged"
             Parameter { name: "maximumLength"; type: "int" }
         }
@@ -2000,7 +2276,7 @@ Module {
     Component {
         name: "QQuickToolBar"
         defaultProperty: "contentData"
-        prototype: "QQuickFrame"
+        prototype: "QQuickPane"
         exports: ["QtQuick.Templates/ToolBar 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
@@ -2020,6 +2296,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"
@@ -2055,8 +2341,11 @@ Module {
         name: "QQuickTumbler"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["QtQuick.Templates/Tumbler 2.1"]
-        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 }
@@ -2064,7 +2353,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"; type: "bool" }
+        Property { name: "wrap"; revision: 1; type: "bool" }
+        Signal { name: "wrapChanged"; revision: 1 }
     }
     Component {
         name: "QQuickTumblerAttached"
@@ -2072,240 +2362,4 @@ Module {
         Property { name: "tumbler"; type: "QQuickTumbler"; isReadonly: true; isPointer: true }
         Property { name: "displacement"; type: "double"; isReadonly: true }
     }
-
-        Component {
-        name: "QQuickWindowQmlImpl"
-        defaultProperty: "data"
-        prototype: "QQuickWindow"
-        exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"]
-        exportMetaObjectRevisions: [0, 1]
-        attachedType: "QQuickWindowAttached"
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibility"; type: "Visibility" }
-        Signal {
-            name: "visibleChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "visibilityChanged"
-            Parameter { name: "visibility"; type: "QWindow::Visibility" }
-        }
-    }
-
-    Component {
-        name: "QQuickWindow"
-        defaultProperty: "data"
-        prototype: "QWindow"
-        exports: ["QtQuick.Window/Window 2.0"]
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "SceneGraphError"
-            values: {
-                "ContextNotAvailable": 1
-            }
-        }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property {
-            name: "activeFocusItem"
-            revision: 1
-            type: "QQuickItem"
-            isReadonly: true
-            isPointer: true
-        }
-        Signal { name: "frameSwapped" }
-        Signal {
-            name: "openglContextCreated"
-            revision: 2
-            Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true }
-        }
-        Signal { name: "sceneGraphInitialized" }
-        Signal { name: "sceneGraphInvalidated" }
-        Signal { name: "beforeSynchronizing" }
-        Signal { name: "afterSynchronizing"; revision: 2 }
-        Signal { name: "beforeRendering" }
-        Signal { name: "afterRendering" }
-        Signal { name: "afterAnimating"; revision: 2 }
-        Signal { name: "sceneGraphAboutToStop"; revision: 2 }
-        Signal {
-            name: "closing"
-            revision: 1
-            Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "colorChanged"
-            Parameter { type: "QColor" }
-        }
-        Signal { name: "activeFocusItemChanged"; revision: 1 }
-        Signal {
-            name: "sceneGraphError"
-            revision: 2
-            Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" }
-            Parameter { name: "message"; type: "string" }
-        }
-        Method { name: "update" }
-        Method { name: "releaseResources" }
-    }
-
-    Component {
-        name: "QWindow"
-        prototype: "QObject"
-        Enum {
-            name: "Visibility"
-            values: {
-                "Hidden": 0,
-                "AutomaticVisibility": 1,
-                "Windowed": 2,
-                "Minimized": 3,
-                "Maximized": 4,
-                "FullScreen": 5
-            }
-        }
-        Property { name: "title"; type: "string" }
-        Property { name: "modality"; type: "Qt::WindowModality" }
-        Property { name: "flags"; type: "Qt::WindowFlags" }
-        Property { name: "x"; type: "int" }
-        Property { name: "y"; type: "int" }
-        Property { name: "width"; type: "int" }
-        Property { name: "height"; type: "int" }
-        Property { name: "minimumWidth"; type: "int" }
-        Property { name: "minimumHeight"; type: "int" }
-        Property { name: "maximumWidth"; type: "int" }
-        Property { name: "maximumHeight"; type: "int" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "active"; revision: 1; type: "bool"; isReadonly: true }
-        Property { name: "visibility"; revision: 1; type: "Visibility" }
-        Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" }
-        Property { name: "opacity"; revision: 1; type: "double" }
-        Signal {
-            name: "screenChanged"
-            Parameter { name: "screen"; type: "QScreen"; isPointer: true }
-        }
-        Signal {
-            name: "modalityChanged"
-            Parameter { name: "modality"; type: "Qt::WindowModality" }
-        }
-        Signal {
-            name: "windowStateChanged"
-            Parameter { name: "windowState"; type: "Qt::WindowState" }
-        }
-        Signal {
-            name: "windowTitleChanged"
-            revision: 2
-            Parameter { name: "title"; type: "string" }
-        }
-        Signal {
-            name: "xChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "yChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "widthChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "heightChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "minimumWidthChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "minimumHeightChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "maximumWidthChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "maximumHeightChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "visibleChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "visibilityChanged"
-            revision: 1
-            Parameter { name: "visibility"; type: "QWindow::Visibility" }
-        }
-        Signal { name: "activeChanged"; revision: 1 }
-        Signal {
-            name: "contentOrientationChanged"
-            Parameter { name: "orientation"; type: "Qt::ScreenOrientation" }
-        }
-        Signal {
-            name: "focusObjectChanged"
-            Parameter { name: "object"; type: "QObject"; isPointer: true }
-        }
-        Signal {
-            name: "opacityChanged"
-            revision: 1
-            Parameter { name: "opacity"; type: "double" }
-        }
-        Method { name: "requestActivate"; revision: 1 }
-        Method {
-            name: "setVisible"
-            Parameter { name: "visible"; type: "bool" }
-        }
-        Method { name: "show" }
-        Method { name: "hide" }
-        Method { name: "showMinimized" }
-        Method { name: "showMaximized" }
-        Method { name: "showFullScreen" }
-        Method { name: "showNormal" }
-        Method { name: "close"; type: "bool" }
-        Method { name: "raise" }
-        Method { name: "lower" }
-        Method {
-            name: "setTitle"
-            Parameter { type: "string" }
-        }
-        Method {
-            name: "setX"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setY"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setWidth"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setHeight"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setMinimumWidth"
-            Parameter { name: "w"; type: "int" }
-        }
-        Method {
-            name: "setMinimumHeight"
-            Parameter { name: "h"; type: "int" }
-        }
-        Method {
-            name: "setMaximumWidth"
-            Parameter { name: "w"; type: "int" }
-        }
-        Method {
-            name: "setMaximumHeight"
-            Parameter { name: "h"; type: "int" }
-        }
-        Method {
-            name: "alert"
-            revision: 1
-            Parameter { name: "msec"; type: "int" }
-        }
-        Method { name: "requestUpdate"; revision: 3 }
-    }
-
 }