Update plugins.qmltypes

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

1 files changed, 165 insertions, 116 deletions

diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes
index 11994894..cb509bcb 100644
--- a/src/controls/plugins.qmltypes
+++ b/src/controls/plugins.qmltypes
@@ -9,7 +9,6 @@ import QtQuick.tooling 1.2
 Module {
     dependencies: [
         "QtGraphicalEffects 1.0",
-        "QtGraphicalEffects.private 1.0",
         "QtQml.Models 2.2",
         "QtQuick 2.6",
         "QtQuick.Controls.Styles 1.4",
@@ -19,16 +18,16 @@ Module {
         "QtQuick.Window 2.2"
     ]
     Component {
-        name: "QQuickAbstractStyle"
+        name: "QQuickAbstractStyle1"
         defaultProperty: "data"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/AbstractStyle 1.0"]
         exportMetaObjectRevisions: [0]
-        Property { name: "padding"; type: "QQuickPadding"; isReadonly: true; isPointer: true }
+        Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true }
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
-        name: "QQuickAction"
+        name: "QQuickAction1"
         prototype: "QObject"
         exports: ["QtQuick.Controls/Action 1.0"]
         exportMetaObjectRevisions: [0]
@@ -40,7 +39,7 @@ Module {
         Property { name: "enabled"; type: "bool" }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
         Property { name: "shortcut"; type: "QVariant" }
         Signal {
             name: "triggered"
@@ -67,7 +66,7 @@ Module {
         Method { name: "trigger" }
     }
     Component {
-        name: "QQuickCalendarModel"
+        name: "QQuickCalendarModel1"
         prototype: "QAbstractListModel"
         exports: ["QtQuick.Controls.Private/CalendarModel 1.0"]
         exportMetaObjectRevisions: [0]
@@ -103,7 +102,7 @@ Module {
         }
     }
     Component {
-        name: "QQuickControlSettings"
+        name: "QQuickControlSettings1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/Settings 1.0"]
         isCreatable: false
@@ -126,26 +125,26 @@ Module {
         }
     }
     Component {
-        name: "QQuickControlsPrivate"
+        name: "QQuickControlsPrivate1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/Controls 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
-        attachedType: "QQuickControlsPrivateAttached"
+        attachedType: "QQuickControlsPrivate1Attached"
     }
     Component {
-        name: "QQuickControlsPrivateAttached"
+        name: "QQuickControlsPrivate1Attached"
         prototype: "QObject"
         Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true }
     }
     Component {
-        name: "QQuickExclusiveGroup"
+        name: "QQuickExclusiveGroup1"
         defaultProperty: "__actions"
         prototype: "QObject"
         exports: ["QtQuick.Controls/ExclusiveGroup 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "current"; type: "QObject"; isPointer: true }
-        Property { name: "__actions"; type: "QQuickAction"; isList: true; isReadonly: true }
+        Property { name: "__actions"; type: "QQuickAction1"; isList: true; isReadonly: true }
         Method {
             name: "bindCheckable"
             Parameter { name: "o"; type: "QObject"; isPointer: true }
@@ -156,9 +155,9 @@ Module {
         }
     }
     Component {
-        name: "QQuickMenu"
+        name: "QQuickMenu1"
         defaultProperty: "items"
-        prototype: "QQuickMenuText"
+        prototype: "QQuickMenuText1"
         exports: ["QtQuick.Controls.Private/MenuPrivate 1.0"]
         exportMetaObjectRevisions: [0]
         Enum {
@@ -177,26 +176,28 @@ Module {
         Property { name: "__font"; type: "QFont" }
         Property { name: "__xOffset"; type: "double" }
         Property { name: "__yOffset"; type: "double" }
-        Property { name: "__action"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true }
+        Property { name: "__isProxy"; type: "bool" }
         Signal { name: "aboutToShow" }
         Signal { name: "aboutToHide" }
         Signal { name: "popupVisibleChanged" }
         Signal { name: "__menuPopupDestroyed" }
         Signal { name: "menuContentItemChanged" }
         Signal { name: "minimumWidthChanged" }
+        Signal { name: "__proxyChanged" }
         Method { name: "__dismissMenu" }
         Method { name: "__closeAndDestroy" }
         Method { name: "__dismissAndDestroy" }
         Method { name: "popup" }
         Method {
             name: "addItem"
-            type: "QQuickMenuItem*"
+            type: "QQuickMenuItem1*"
             Parameter { type: "string" }
         }
         Method {
             name: "insertItem"
-            type: "QQuickMenuItem*"
+            type: "QQuickMenuItem1*"
             Parameter { type: "int" }
             Parameter { type: "string" }
         }
@@ -208,11 +209,11 @@ Module {
         Method {
             name: "insertItem"
             Parameter { type: "int" }
-            Parameter { type: "QQuickMenuBase"; isPointer: true }
+            Parameter { type: "QQuickMenuBase1"; isPointer: true }
         }
         Method {
             name: "removeItem"
-            Parameter { type: "QQuickMenuBase"; isPointer: true }
+            Parameter { type: "QQuickMenuBase1"; isPointer: true }
         }
         Method { name: "clear" }
         Method {
@@ -232,12 +233,12 @@ Module {
         }
     }
     Component {
-        name: "QQuickMenuBar"
+        name: "QQuickMenuBar1"
         defaultProperty: "menus"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/MenuBarPrivate 1.0"]
         exportMetaObjectRevisions: [0]
-        Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true }
+        Property { name: "menus"; type: "QQuickMenu1"; isList: true; isReadonly: true }
         Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true }
         Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true }
         Property { name: "__isNative"; type: "bool" }
@@ -245,28 +246,28 @@ Module {
         Signal { name: "contentItemChanged" }
     }
     Component {
-        name: "QQuickMenuBase"
+        name: "QQuickMenuBase1"
         prototype: "QObject"
         exports: ["QtQuick.Controls/MenuBase 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "visible"; type: "bool" }
-        Property { name: "type"; type: "QQuickMenuItemType::MenuItemType"; isReadonly: true }
+        Property { name: "type"; type: "QQuickMenuItemType1::MenuItemType"; isReadonly: true }
         Property { name: "__parentMenu"; type: "QObject"; isReadonly: true; isPointer: true }
         Property { name: "__isNative"; type: "bool"; isReadonly: true }
         Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true }
     }
     Component {
-        name: "QQuickMenuItem"
-        prototype: "QQuickMenuText"
+        name: "QQuickMenuItem1"
+        prototype: "QQuickMenuText1"
         exports: ["QtQuick.Controls/MenuItem 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "text"; type: "string" }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
         Property { name: "shortcut"; type: "QVariant" }
-        Property { name: "action"; type: "QQuickAction"; isPointer: true }
+        Property { name: "action"; type: "QQuickAction1"; isPointer: true }
         Signal { name: "triggered" }
         Signal {
             name: "toggled"
@@ -275,7 +276,7 @@ Module {
         Method { name: "trigger" }
     }
     Component {
-        name: "QQuickMenuItemType"
+        name: "QQuickMenuItemType1"
         exports: ["QtQuick.Controls/MenuItemType 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
@@ -290,14 +291,14 @@ Module {
         }
     }
     Component {
-        name: "QQuickMenuSeparator"
-        prototype: "QQuickMenuBase"
+        name: "QQuickMenuSeparator1"
+        prototype: "QQuickMenuBase1"
         exports: ["QtQuick.Controls/MenuSeparator 1.0"]
         exportMetaObjectRevisions: [0]
     }
     Component {
-        name: "QQuickMenuText"
-        prototype: "QQuickMenuBase"
+        name: "QQuickMenuText1"
+        prototype: "QQuickMenuBase1"
         Property { name: "enabled"; type: "bool" }
         Property { name: "iconSource"; type: "QUrl" }
         Property { name: "iconName"; type: "string" }
@@ -305,7 +306,7 @@ Module {
         Signal { name: "__textChanged" }
     }
     Component {
-        name: "QQuickPadding"
+        name: "QQuickPadding1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/Padding 1.0"]
         exportMetaObjectRevisions: [0]
@@ -331,7 +332,7 @@ Module {
         }
     }
     Component {
-        name: "QQuickPopupWindow"
+        name: "QQuickPopupWindow1"
         defaultProperty: "popupContentItem"
         prototype: "QQuickWindow"
         exports: ["QtQuick.Controls.Private/PopupWindow 1.0"]
@@ -344,7 +345,7 @@ Module {
         Method { name: "dismissPopup" }
     }
     Component {
-        name: "QQuickRangeModel"
+        name: "QQuickRangeModel1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/RangeModel 1.0"]
         exportMetaObjectRevisions: [0]
@@ -412,7 +413,7 @@ Module {
         }
     }
     Component {
-        name: "QQuickRangedDate"
+        name: "QQuickRangedDate1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/RangedDate 1.0"]
         exportMetaObjectRevisions: [0]
@@ -421,7 +422,7 @@ Module {
         Property { name: "maximumDate"; type: "QDate" }
     }
     Component {
-        name: "QQuickScenePosListener"
+        name: "QQuickScenePosListener1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/ScenePosListener 1.0"]
         exportMetaObjectRevisions: [0]
@@ -430,7 +431,7 @@ Module {
         Property { name: "enabled"; type: "bool" }
     }
     Component {
-        name: "QQuickSelectionMode"
+        name: "QQuickSelectionMode1"
         exports: ["QtQuick.Controls/SelectionMode 1.1"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
@@ -446,7 +447,7 @@ Module {
         }
     }
     Component {
-        name: "QQuickSpinBoxValidator"
+        name: "QQuickSpinBoxValidator1"
         prototype: "QValidator"
         exports: ["QtQuick.Controls.Private/SpinBoxValidator 1.0"]
         exportMetaObjectRevisions: [0]
@@ -462,7 +463,7 @@ Module {
         Method { name: "decrement" }
     }
     Component {
-        name: "QQuickStack"
+        name: "QQuickStack1"
         prototype: "QObject"
         exports: ["QtQuick.Controls/Stack 1.0"]
         isCreatable: false
@@ -484,12 +485,12 @@ Module {
         Property { name: "__view"; type: "QQuickItem"; isPointer: true }
     }
     Component {
-        name: "QQuickStyleItem"
+        name: "QQuickStyleItem1"
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick.Controls.Private/StyleItem 1.0"]
         exportMetaObjectRevisions: [0]
-        Property { name: "border"; type: "QQuickPadding"; isReadonly: true; isPointer: true }
+        Property { name: "border"; type: "QQuickPadding1"; isReadonly: true; isPointer: true }
         Property { name: "sunken"; type: "bool" }
         Property { name: "raised"; type: "bool" }
         Property { name: "active"; type: "bool" }
@@ -583,7 +584,7 @@ Module {
         }
     }
     Component {
-        name: "QQuickTooltip"
+        name: "QQuickTooltip1"
         prototype: "QObject"
         exports: ["QtQuick.Controls.Private/Tooltip 1.0"]
         isCreatable: false
@@ -598,7 +599,7 @@ Module {
         Method { name: "hideText" }
     }
     Component {
-        name: "QQuickTreeModelAdaptor"
+        name: "QQuickTreeModelAdaptor1"
         prototype: "QAbstractListModel"
         exports: ["QtQuick.Controls.Private/TreeModelAdaptor 1.0"]
         exportMetaObjectRevisions: [0]
@@ -646,7 +647,7 @@ Module {
         }
     }
     Component {
-        name: "QQuickWheelArea"
+        name: "QQuickWheelArea1"
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick.Controls.Private/WheelArea 1.0"]
@@ -661,6 +662,7 @@ Module {
         Property { name: "verticalValue"; type: "double" }
         Property { name: "scrollSpeed"; type: "double" }
         Property { name: "active"; type: "bool" }
+        Property { name: "inverted"; type: "bool"; isReadonly: true }
         Signal { name: "verticalWheelMoved" }
         Signal { name: "horizontalWheelMoved" }
     }
@@ -711,11 +713,11 @@ Module {
         isComposite: true
         defaultProperty: "data"
         Property { name: "isDefault"; type: "bool" }
-        Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+        Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
-        Property { name: "action"; type: "QQuickAction"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
+        Property { name: "action"; type: "QQuickAction1"; isPointer: true }
         Property { name: "activeFocusOnPress"; type: "bool" }
         Property { name: "text"; type: "string" }
         Property { name: "tooltip"; type: "string" }
@@ -723,8 +725,8 @@ Module {
         Property { name: "iconName"; type: "string" }
         Property { name: "__position"; type: "string" }
         Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
-        Property { name: "__action"; type: "QQuickAction"; isPointer: true }
-        Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isPointer: true }
+        Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__behavior"; type: "QVariant" }
         Property { name: "__effectivePressed"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -751,7 +753,7 @@ Module {
         Property { name: "navigationBarVisible"; type: "bool" }
         Property { name: "dayOfWeekFormat"; type: "int" }
         Property { name: "__locale"; type: "QVariant" }
-        Property { name: "__model"; type: "QQuickCalendarModel"; isPointer: true }
+        Property { name: "__model"; type: "QQuickCalendarModel1"; isPointer: true }
         Property { name: "selectedDate"; type: "QDate" }
         Property { name: "minimumDate"; type: "QDate" }
         Property { name: "maximumDate"; type: "QDate" }
@@ -811,8 +813,9 @@ Module {
         Method { name: "__cycleCheckBoxStates"; type: "QVariant" }
         Property { name: "checked"; type: "bool" }
         Property { name: "activeFocusOnPress"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
         Property { name: "text"; type: "string" }
+        Property { name: "tooltip"; type: "string" }
         Property { name: "__cycleStatesHandler"; type: "QVariant" }
         Property { name: "pressed"; type: "bool" }
         Property { name: "hovered"; type: "bool"; isReadonly: true }
@@ -831,11 +834,11 @@ Module {
         isComposite: true
         defaultProperty: "data"
         Property { name: "isDefault"; type: "bool" }
-        Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+        Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
-        Property { name: "action"; type: "QQuickAction"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
+        Property { name: "action"; type: "QQuickAction1"; isPointer: true }
         Property { name: "activeFocusOnPress"; type: "bool" }
         Property { name: "text"; type: "string" }
         Property { name: "tooltip"; type: "string" }
@@ -843,8 +846,8 @@ Module {
         Property { name: "iconName"; type: "string" }
         Property { name: "__position"; type: "string" }
         Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
-        Property { name: "__action"; type: "QQuickAction"; isPointer: true }
-        Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isPointer: true }
+        Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__behavior"; type: "QVariant" }
         Property { name: "__effectivePressed"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -1015,11 +1018,11 @@ Module {
         Property { name: "progress"; type: "double"; isReadonly: true }
         Signal { name: "activated" }
         Property { name: "isDefault"; type: "bool" }
-        Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+        Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
-        Property { name: "action"; type: "QQuickAction"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
+        Property { name: "action"; type: "QQuickAction1"; isPointer: true }
         Property { name: "activeFocusOnPress"; type: "bool" }
         Property { name: "text"; type: "string" }
         Property { name: "tooltip"; type: "string" }
@@ -1027,8 +1030,8 @@ Module {
         Property { name: "iconName"; type: "string" }
         Property { name: "__position"; type: "string" }
         Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
-        Property { name: "__action"; type: "QQuickAction"; isPointer: true }
-        Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isPointer: true }
+        Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__behavior"; type: "QVariant" }
         Property { name: "__effectivePressed"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -1167,26 +1170,28 @@ Module {
         Property { name: "__font"; type: "QFont" }
         Property { name: "__xOffset"; type: "double" }
         Property { name: "__yOffset"; type: "double" }
-        Property { name: "__action"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true }
+        Property { name: "__isProxy"; type: "bool" }
         Signal { name: "aboutToShow" }
         Signal { name: "aboutToHide" }
         Signal { name: "popupVisibleChanged" }
         Signal { name: "__menuPopupDestroyed" }
         Signal { name: "menuContentItemChanged" }
         Signal { name: "minimumWidthChanged" }
+        Signal { name: "__proxyChanged" }
         Method { name: "__dismissMenu" }
         Method { name: "__closeAndDestroy" }
         Method { name: "__dismissAndDestroy" }
         Method { name: "popup" }
         Method {
             name: "addItem"
-            type: "QQuickMenuItem*"
+            type: "QQuickMenuItem1*"
             Parameter { type: "string" }
         }
         Method {
             name: "insertItem"
-            type: "QQuickMenuItem*"
+            type: "QQuickMenuItem1*"
             Parameter { type: "int" }
             Parameter { type: "string" }
         }
@@ -1197,7 +1202,7 @@ Module {
         }
         Method {
             name: "removeItem"
-            Parameter { type: "QQuickMenuBase"; isPointer: true }
+            Parameter { type: "QQuickMenuBase1"; isPointer: true }
         }
         Method { name: "clear" }
         Method {
@@ -1221,7 +1226,7 @@ Module {
         Property { name: "__icon"; type: "QVariant"; isReadonly: true }
         Signal { name: "__textChanged" }
         Property { name: "visible"; type: "bool" }
-        Property { name: "type"; type: "QQuickMenuItemType::MenuItemType"; isReadonly: true }
+        Property { name: "type"; type: "QQuickMenuItemType1::MenuItemType"; isReadonly: true }
         Property { name: "__parentMenu"; type: "QObject"; isReadonly: true; isPointer: true }
         Property { name: "__isNative"; type: "bool"; isReadonly: true }
         Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true }
@@ -1236,7 +1241,7 @@ Module {
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
         Property { name: "__style"; type: "QObject"; isPointer: true }
         Property { name: "__menuBarComponent"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true }
+        Property { name: "menus"; type: "QQuickMenu1"; isList: true; isReadonly: true }
         Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true }
         Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true }
         Property { name: "__isNative"; type: "bool" }
@@ -1256,9 +1261,9 @@ Module {
         Property { name: "boundingItem"; type: "QQuickItem"; isPointer: true }
         Property { name: "__protectedScope"; type: "QObject"; isPointer: true }
         Property { name: "activationMode"; type: "int" }
-        Property { name: "menuItems"; type: "QQuickMenuItem"; isList: true; isReadonly: true }
+        Property { name: "menuItems"; type: "QQuickMenuItem1"; isList: true; isReadonly: true }
         Property { name: "currentIndex"; type: "int"; isReadonly: true }
-        Property { name: "currentItem"; type: "QQuickMenuItem"; isReadonly: true; isPointer: true }
+        Property { name: "currentItem"; type: "QQuickMenuItem1"; isReadonly: true; isPointer: true }
         Property { name: "__mouseThief"; type: "QQuickMouseThief"; isReadonly: true; isPointer: true }
         Method {
             name: "popup"
@@ -1333,8 +1338,9 @@ Module {
         defaultProperty: "data"
         Property { name: "checked"; type: "bool" }
         Property { name: "activeFocusOnPress"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
         Property { name: "text"; type: "string" }
+        Property { name: "tooltip"; type: "string" }
         Property { name: "__cycleStatesHandler"; type: "QVariant" }
         Property { name: "pressed"; type: "bool" }
         Property { name: "hovered"; type: "bool"; isReadonly: true }
@@ -1355,7 +1361,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -1364,16 +1369,23 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
@@ -1630,7 +1642,7 @@ Module {
         defaultProperty: "data"
         Property { name: "checked"; type: "bool" }
         Property { name: "activeFocusOnPress"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
         Signal { name: "clicked" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -1720,7 +1732,7 @@ Module {
         Property { name: "currentRow"; type: "int" }
         Property {
             name: "selection"
-            type: "TableViewSelection_QMLTYPE_281"
+            type: "TableViewSelection_QMLTYPE_257"
             isReadonly: true
             isPointer: true
         }
@@ -1807,7 +1819,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -1816,16 +1827,23 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
@@ -1851,9 +1869,9 @@ Module {
     }
     Component {
         prototype: "QQuickFocusScope"
-        name: "QtQuick.Controls/TextArea 1.3"
-        exports: ["QtQuick.Controls/TextArea 1.3"]
-        exportMetaObjectRevisions: [3]
+        name: "QtQuick.Controls/TextArea 1.0"
+        exports: ["QtQuick.Controls/TextArea 1.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
@@ -1968,7 +1986,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -1977,25 +1994,32 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
     }
     Component {
         prototype: "QQuickFocusScope"
-        name: "QtQuick.Controls/TextArea 1.0"
-        exports: ["QtQuick.Controls/TextArea 1.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.Controls/TextArea 1.3"
+        exports: ["QtQuick.Controls/TextArea 1.3"]
+        exportMetaObjectRevisions: [3]
         isComposite: true
         defaultProperty: "data"
         Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
@@ -2110,7 +2134,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -2119,16 +2142,23 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
@@ -2252,7 +2282,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -2261,16 +2290,23 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
@@ -2378,11 +2414,11 @@ Module {
         isComposite: true
         defaultProperty: "data"
         Property { name: "isDefault"; type: "bool" }
-        Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+        Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
-        Property { name: "action"; type: "QQuickAction"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
+        Property { name: "action"; type: "QQuickAction1"; isPointer: true }
         Property { name: "activeFocusOnPress"; type: "bool" }
         Property { name: "text"; type: "string" }
         Property { name: "tooltip"; type: "string" }
@@ -2390,8 +2426,8 @@ Module {
         Property { name: "iconName"; type: "string" }
         Property { name: "__position"; type: "string" }
         Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
-        Property { name: "__action"; type: "QQuickAction"; isPointer: true }
-        Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isPointer: true }
+        Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__behavior"; type: "QVariant" }
         Property { name: "__effectivePressed"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -2426,11 +2462,11 @@ Module {
         isComposite: true
         defaultProperty: "data"
         Property { name: "isDefault"; type: "bool" }
-        Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+        Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
         Property { name: "checkable"; type: "bool" }
         Property { name: "checked"; type: "bool" }
-        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true }
-        Property { name: "action"; type: "QQuickAction"; isPointer: true }
+        Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true }
+        Property { name: "action"; type: "QQuickAction1"; isPointer: true }
         Property { name: "activeFocusOnPress"; type: "bool" }
         Property { name: "text"; type: "string" }
         Property { name: "tooltip"; type: "string" }
@@ -2438,8 +2474,8 @@ Module {
         Property { name: "iconName"; type: "string" }
         Property { name: "__position"; type: "string" }
         Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
-        Property { name: "__action"; type: "QQuickAction"; isPointer: true }
-        Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
+        Property { name: "__action"; type: "QQuickAction1"; isPointer: true }
+        Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly: true; isPointer: true }
         Property { name: "__behavior"; type: "QVariant" }
         Property { name: "__effectivePressed"; type: "bool" }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -2454,9 +2490,9 @@ Module {
     }
     Component {
         prototype: "QQuickFocusScope"
-        name: "QtQuick.Controls/TreeView 1.5"
-        exports: ["QtQuick.Controls/TreeView 1.5"]
-        exportMetaObjectRevisions: [5]
+        name: "QtQuick.Controls/TreeView 1.4"
+        exports: ["QtQuick.Controls/TreeView 1.4"]
+        exportMetaObjectRevisions: [4]
         isComposite: true
         defaultProperty: "__columns"
         Property { name: "model"; type: "QVariant" }
@@ -2563,7 +2599,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -2572,25 +2607,32 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
     }
     Component {
         prototype: "QQuickFocusScope"
-        name: "QtQuick.Controls/TreeView 1.4"
-        exports: ["QtQuick.Controls/TreeView 1.4"]
-        exportMetaObjectRevisions: [4]
+        name: "QtQuick.Controls/TreeView 1.5"
+        exports: ["QtQuick.Controls/TreeView 1.5"]
+        exportMetaObjectRevisions: [5]
         isComposite: true
         defaultProperty: "__columns"
         Property { name: "model"; type: "QVariant" }
@@ -2697,7 +2739,6 @@ Module {
         Property { name: "frameVisible"; type: "bool" }
         Property { name: "highlightOnFocus"; type: "bool" }
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
         Property { name: "__scrollBarTopMargin"; type: "int" }
         Property { name: "__viewTopMargin"; type: "int" }
         Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -2706,16 +2747,23 @@ Module {
         Property { name: "verticalScrollBarPolicy"; type: "int" }
         Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true }
+        Property {
+            name: "__scroller"
+            type: "ScrollViewHelper_QMLTYPE_26"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "__verticalScrollbarOffset"; type: "int" }
         Property { name: "__wheelAreaScrollSpeed"; type: "double" }
         Property {
             name: "__horizontalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "__verticalScrollBar"
-            type: "ScrollBar_QMLTYPE_24"
+            type: "ScrollBar_QMLTYPE_22"
             isReadonly: true
             isPointer: true
         }
@@ -2752,6 +2800,7 @@ Module {
             type: "QVariant"
             Parameter { name: "columnIndex"; type: "QVariant" }
             Parameter { name: "itemIndex"; type: "QVariant" }
+            Parameter { name: "interval"; type: "QVariant" }
         }
         Method {
             name: "getColumn"