Update plugins.qmltypes

Change-Id: I38729bb888c4a8df797dfac056c5b025a6d9a67f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 318 insertions, 52 deletions

diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index 6237f9be..cae452d4 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 Qt.labs.templates 1.0'
+// 'qmlplugindump -nonrelocatable QtQuick.Templates 2.0'
 
 Module {
     dependencies: ["QtQuick.Window 2.2"]
@@ -12,12 +12,12 @@ Module {
         name: "QQuickAbstractButton"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/AbstractButton 1.0"]
+        exports: ["QtQuick.Templates/AbstractButton 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "text"; type: "string" }
-        Property { name: "pressed"; type: "bool" }
+        Property { name: "down"; type: "bool" }
+        Property { name: "pressed"; type: "bool"; isReadonly: true }
         Property { name: "checked"; type: "bool" }
-        Property { name: "checkable"; type: "bool" }
         Property { name: "highlighted"; type: "bool" }
         Property { name: "autoExclusive"; type: "bool" }
         Property { name: "autoRepeat"; type: "bool" }
@@ -34,7 +34,7 @@ Module {
         name: "QQuickApplicationWindow"
         defaultProperty: "data"
         prototype: "QQuickWindowQmlImpl"
-        exports: ["Qt.labs.templates/ApplicationWindow 1.0"]
+        exports: ["QtQuick.Templates/ApplicationWindow 2.0"]
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickApplicationWindowAttached"
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
@@ -61,7 +61,7 @@ Module {
         name: "QQuickBusyIndicator"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/BusyIndicator 1.0"]
+        exports: ["QtQuick.Templates/BusyIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "running"; type: "bool" }
     }
@@ -69,14 +69,24 @@ Module {
         name: "QQuickButton"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["Qt.labs.templates/Button 1.0"]
+        exports: ["QtQuick.Templates/Button 2.0"]
         exportMetaObjectRevisions: [0]
+        Property { name: "checkable"; type: "bool" }
     }
     Component {
         name: "QQuickCheckBox"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["Qt.labs.templates/CheckBox 1.0"]
+        exports: ["QtQuick.Templates/CheckBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "tristate"; type: "bool" }
+        Property { name: "checkState"; type: "Qt::CheckState" }
+    }
+    Component {
+        name: "QQuickCheckDelegate"
+        defaultProperty: "data"
+        prototype: "QQuickItemDelegate"
+        exports: ["QtQuick.Templates/CheckDelegate 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "tristate"; type: "bool" }
         Property { name: "checkState"; type: "Qt::CheckState" }
@@ -85,7 +95,7 @@ Module {
         name: "QQuickComboBox"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/ComboBox 1.0"]
+        exports: ["QtQuick.Templates/ComboBox 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "model"; type: "QVariant" }
@@ -106,6 +116,8 @@ Module {
             name: "highlighted"
             Parameter { name: "index"; type: "int" }
         }
+        Method { name: "increase" }
+        Method { name: "decrease" }
         Method {
             name: "textAt"
             type: "string"
@@ -127,7 +139,7 @@ Module {
         name: "QQuickContainer"
         defaultProperty: "contentData"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Container 1.0"]
+        exports: ["QtQuick.Templates/Container 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
@@ -167,7 +179,7 @@ Module {
         name: "QQuickControl"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["Qt.labs.templates/Control 1.0"]
+        exports: ["QtQuick.Templates/Control 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "font"; type: "QFont" }
         Property { name: "availableWidth"; type: "double"; isReadonly: true }
@@ -182,6 +194,7 @@ Module {
         Property { name: "mirrored"; type: "bool"; isReadonly: true }
         Property { name: "focusPolicy"; type: "Qt::FocusPolicy" }
         Property { name: "focusReason"; type: "Qt::FocusReason" }
+        Property { name: "activeKeyFocus"; type: "bool"; isReadonly: true }
         Property { name: "hovered"; type: "bool"; isReadonly: true }
         Property { name: "hoverEnabled"; type: "bool" }
         Property { name: "wheelEnabled"; type: "bool" }
@@ -192,7 +205,7 @@ Module {
         name: "QQuickDial"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Dial 1.0"]
+        exports: ["QtQuick.Templates/Dial 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "SnapMode"
@@ -209,6 +222,7 @@ Module {
         Property { name: "angle"; type: "double"; isReadonly: true }
         Property { name: "stepSize"; type: "double" }
         Property { name: "snapMode"; type: "SnapMode" }
+        Property { name: "wrap"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
         Property { name: "handle"; type: "QQuickItem"; isPointer: true }
         Method { name: "increase" }
@@ -216,30 +230,26 @@ Module {
     }
     Component {
         name: "QQuickDrawer"
-        defaultProperty: "contentItem"
-        prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Drawer 1.0"]
+        defaultProperty: "contentData"
+        prototype: "QQuickPopup"
+        exports: ["QtQuick.Templates/Drawer 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "edge"; type: "Qt::Edge" }
         Property { name: "position"; type: "double" }
-        Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "animation"; type: "QQuickPropertyAnimation"; isPointer: true }
-        Signal { name: "clicked" }
-        Method { name: "open" }
-        Method { name: "close" }
+        Property { name: "dragMargin"; type: "double" }
     }
     Component {
         name: "QQuickFrame"
         defaultProperty: "contentData"
         prototype: "QQuickPane"
-        exports: ["Qt.labs.templates/Frame 1.0"]
+        exports: ["QtQuick.Templates/Frame 2.0"]
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickGroupBox"
         defaultProperty: "contentData"
         prototype: "QQuickFrame"
-        exports: ["Qt.labs.templates/GroupBox 1.0"]
+        exports: ["QtQuick.Templates/GroupBox 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "title"; type: "string" }
         Property { name: "label"; type: "QQuickItem"; isPointer: true }
@@ -254,17 +264,183 @@ 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"
-        exports: ["Qt.labs.templates/ItemDelegate 1.0"]
+        exports: ["QtQuick.Templates/ItemDelegate 2.0"]
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickLabel"
         defaultProperty: "data"
         prototype: "QQuickText"
-        exports: ["Qt.labs.templates/Label 1.0"]
+        exports: ["QtQuick.Templates/Label 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "font"; type: "QFont" }
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
@@ -273,7 +449,7 @@ Module {
         name: "QQuickMenu"
         defaultProperty: "contentData"
         prototype: "QQuickPopup"
-        exports: ["Qt.labs.templates/Menu 1.0"]
+        exports: ["QtQuick.Templates/Menu 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
@@ -306,8 +482,9 @@ Module {
         name: "QQuickMenuItem"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["Qt.labs.templates/MenuItem 1.0"]
+        exports: ["QtQuick.Templates/MenuItem 2.0"]
         exportMetaObjectRevisions: [0]
+        Property { name: "checkable"; type: "bool" }
         Signal { name: "triggered" }
     }
     Component {
@@ -322,7 +499,7 @@ Module {
         name: "QQuickPage"
         defaultProperty: "contentData"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Page 1.0"]
+        exports: ["QtQuick.Templates/Page 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "header"; type: "QQuickItem"; isPointer: true }
         Property { name: "footer"; type: "QQuickItem"; isPointer: true }
@@ -333,7 +510,7 @@ Module {
         name: "QQuickPageIndicator"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/PageIndicator 1.0"]
+        exports: ["QtQuick.Templates/PageIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "count"; type: "int" }
         Property { name: "currentIndex"; type: "int" }
@@ -344,7 +521,7 @@ Module {
         name: "QQuickPane"
         defaultProperty: "contentData"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Pane 1.0"]
+        exports: ["QtQuick.Templates/Pane 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "contentWidth"; type: "double" }
         Property { name: "contentHeight"; type: "double" }
@@ -355,17 +532,17 @@ Module {
         name: "QQuickPopup"
         defaultProperty: "contentData"
         prototype: "QObject"
-        exports: ["Qt.labs.templates/Popup 1.0"]
+        exports: ["QtQuick.Templates/Popup 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "ClosePolicy"
             values: {
                 "NoAutoClose": 0,
-                "OnPressOutside": 1,
-                "OnPressOutsideParent": 2,
-                "OnReleaseOutside": 4,
-                "OnReleaseOutsideParent": 8,
-                "OnEscape": 16
+                "CloseOnPressOutside": 1,
+                "CloseOnPressOutsideParent": 2,
+                "CloseOnReleaseOutside": 4,
+                "CloseOnReleaseOutsideParent": 8,
+                "CloseOnEscape": 16
             }
         }
         Enum {
@@ -403,6 +580,8 @@ Module {
         Property { name: "leftPadding"; type: "double" }
         Property { name: "rightPadding"; type: "double" }
         Property { name: "bottomPadding"; type: "double" }
+        Property { name: "locale"; type: "QLocale" }
+        Property { name: "font"; type: "QFont" }
         Property { name: "parent"; type: "QQuickItem"; isPointer: true }
         Property { name: "background"; type: "QQuickItem"; isPointer: true }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
@@ -419,8 +598,14 @@ Module {
         Property { name: "transformOrigin"; type: "TransformOrigin" }
         Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
         Property { name: "exit"; type: "QQuickTransition"; isPointer: true }
+        Signal {
+            name: "windowChanged"
+            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+        }
         Signal { name: "aboutToShow" }
         Signal { name: "aboutToHide" }
+        Signal { name: "opened" }
+        Signal { name: "closed" }
         Method { name: "open" }
         Method { name: "close" }
     }
@@ -428,7 +613,7 @@ Module {
         name: "QQuickProgressBar"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/ProgressBar 1.0"]
+        exports: ["QtQuick.Templates/ProgressBar 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "from"; type: "double" }
         Property { name: "to"; type: "double" }
@@ -441,14 +626,21 @@ Module {
         name: "QQuickRadioButton"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["Qt.labs.templates/RadioButton 1.0"]
+        exports: ["QtQuick.Templates/RadioButton 2.0"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQuickRadioDelegate"
+        defaultProperty: "data"
+        prototype: "QQuickItemDelegate"
+        exports: ["QtQuick.Templates/RadioDelegate 2.0"]
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickRangeSlider"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/RangeSlider 1.0"]
+        exports: ["QtQuick.Templates/RangeSlider 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "SnapMode"
@@ -483,10 +675,23 @@ Module {
         Method { name: "decrease" }
     }
     Component {
+        name: "QQuickRootItem"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Method {
+            name: "setWidth"
+            Parameter { name: "w"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "h"; type: "int" }
+        }
+    }
+    Component {
         name: "QQuickScrollBar"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/ScrollBar 1.0"]
+        exports: ["QtQuick.Templates/ScrollBar 2.0"]
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickScrollBarAttached"
         Property { name: "size"; type: "double" }
@@ -516,7 +721,7 @@ Module {
         name: "QQuickScrollIndicator"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/ScrollIndicator 1.0"]
+        exports: ["QtQuick.Templates/ScrollIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickScrollIndicatorAttached"
         Property { name: "size"; type: "double" }
@@ -542,7 +747,7 @@ Module {
         name: "QQuickSlider"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Slider 1.0"]
+        exports: ["QtQuick.Templates/Slider 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "SnapMode"
@@ -569,7 +774,7 @@ Module {
         name: "QQuickSpinBox"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/SpinBox 1.0"]
+        exports: ["QtQuick.Templates/SpinBox 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "from"; type: "int" }
         Property { name: "to"; type: "int" }
@@ -601,7 +806,7 @@ Module {
         name: "QQuickStackView"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/StackView 1.0"]
+        exports: ["QtQuick.Templates/StackView 2.0"]
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickStackAttached"
         Enum {
@@ -674,10 +879,30 @@ Module {
         }
     }
     Component {
+        name: "QQuickSwipeDelegate"
+        defaultProperty: "data"
+        prototype: "QQuickItemDelegate"
+        exports: ["QtQuick.Templates/SwipeDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "exposure"; type: "QQuickSwipeExposure"; isReadonly: true; isPointer: true }
+    }
+    Component {
+        name: "QQuickSwipeExposure"
+        prototype: "QObject"
+        Property { name: "position"; type: "double"; isReadonly: true }
+        Property { name: "active"; type: "bool"; isReadonly: true }
+        Property { name: "left"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "behind"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "right"; type: "QQmlComponent"; isPointer: true }
+        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 }
+    }
+    Component {
         name: "QQuickSwipeView"
         defaultProperty: "contentData"
         prototype: "QQuickContainer"
-        exports: ["Qt.labs.templates/SwipeView 1.0"]
+        exports: ["QtQuick.Templates/SwipeView 2.0"]
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickSwipeViewAttached"
     }
@@ -692,7 +917,16 @@ Module {
         name: "QQuickSwitch"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["Qt.labs.templates/Switch 1.0"]
+        exports: ["QtQuick.Templates/Switch 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "position"; type: "double" }
+        Property { name: "visualPosition"; type: "double"; isReadonly: true }
+    }
+    Component {
+        name: "QQuickSwitchDelegate"
+        defaultProperty: "data"
+        prototype: "QQuickItemDelegate"
+        exports: ["QtQuick.Templates/SwitchDelegate 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "position"; type: "double" }
         Property { name: "visualPosition"; type: "double"; isReadonly: true }
@@ -701,7 +935,7 @@ Module {
         name: "QQuickTabBar"
         defaultProperty: "contentData"
         prototype: "QQuickContainer"
-        exports: ["Qt.labs.templates/TabBar 1.0"]
+        exports: ["QtQuick.Templates/TabBar 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "Position"
@@ -716,7 +950,7 @@ Module {
         name: "QQuickTabButton"
         defaultProperty: "data"
         prototype: "QQuickAbstractButton"
-        exports: ["Qt.labs.templates/TabButton 1.0"]
+        exports: ["QtQuick.Templates/TabButton 2.0"]
         exportMetaObjectRevisions: [0]
     }
     Component {
@@ -900,7 +1134,7 @@ Module {
         name: "QQuickTextArea"
         defaultProperty: "data"
         prototype: "QQuickTextEdit"
-        exports: ["Qt.labs.templates/TextArea 1.0"]
+        exports: ["QtQuick.Templates/TextArea 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
@@ -1181,7 +1415,7 @@ Module {
         name: "QQuickTextField"
         defaultProperty: "data"
         prototype: "QQuickTextInput"
-        exports: ["Qt.labs.templates/TextField 1.0"]
+        exports: ["QtQuick.Templates/TextField 2.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "font"; type: "QFont" }
         Property { name: "implicitWidth"; type: "double" }
@@ -1432,7 +1666,7 @@ Module {
         name: "QQuickToolBar"
         defaultProperty: "contentData"
         prototype: "QQuickFrame"
-        exports: ["Qt.labs.templates/ToolBar 1.0"]
+        exports: ["QtQuick.Templates/ToolBar 2.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "Position"
@@ -1447,14 +1681,46 @@ Module {
         name: "QQuickToolButton"
         defaultProperty: "data"
         prototype: "QQuickButton"
-        exports: ["Qt.labs.templates/ToolButton 1.0"]
+        exports: ["QtQuick.Templates/ToolButton 2.0"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQuickToolTip"
+        defaultProperty: "contentData"
+        prototype: "QQuickPopup"
+        exports: ["QtQuick.Templates/ToolTip 2.0"]
         exportMetaObjectRevisions: [0]
+        attachedType: "QQuickToolTipAttached"
+        Property { name: "delay"; type: "int" }
+        Property { name: "timeout"; type: "int" }
+        Property { name: "text"; type: "string" }
+        Method { name: "open" }
+        Method { name: "close" }
+    }
+    Component {
+        name: "QQuickToolTipAttached"
+        prototype: "QObject"
+        Property { name: "text"; type: "string" }
+        Property { name: "delay"; type: "int" }
+        Property { name: "timeout"; type: "int" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "toolTip"; type: "QQuickToolTip"; isReadonly: true; isPointer: true }
+        Method {
+            name: "show"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "ms"; type: "int" }
+        }
+        Method {
+            name: "show"
+            Parameter { name: "text"; type: "string" }
+        }
+        Method { name: "hide" }
     }
     Component {
         name: "QQuickTumbler"
         defaultProperty: "data"
         prototype: "QQuickControl"
-        exports: ["Qt.labs.templates/Tumbler 1.0"]
+        exports: ["QtQuick.Templates/Tumbler 2.0"]
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickTumblerAttached"
         Property { name: "model"; type: "QVariant" }