Update plugins.qmltypes

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

1 files changed, 119 insertions, 1 deletions

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index eba8e74e..a4f59481 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -25,6 +25,13 @@ Module {
             Parameter { name: "color"; type: "QColor" }
             Parameter { name: "opacity"; type: "double" }
         }
+        Method {
+            name: "blend"
+            type: "QColor"
+            Parameter { name: "a"; type: "QColor" }
+            Parameter { name: "b"; type: "QColor" }
+            Parameter { name: "factor"; type: "double" }
+        }
     }
     Component {
         name: "QQuickColorImage"
@@ -33,6 +40,7 @@ Module {
         exports: ["QtQuick.Controls.impl/ColorImage 2.3"]
         exportMetaObjectRevisions: [0]
         Property { name: "color"; type: "QColor" }
+        Property { name: "defaultColor"; type: "QColor" }
     }
     Component {
         name: "QQuickDefaultBusyIndicator"
@@ -70,11 +78,17 @@ Module {
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Property { name: "backgroundColor"; type: "QColor"; isReadonly: true }
+        Property { name: "overlayModalColor"; type: "QColor"; isReadonly: true }
+        Property { name: "overlayDimColor"; type: "QColor"; isReadonly: true }
         Property { name: "textColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDarkColor"; type: "QColor"; isReadonly: true }
         Property { name: "textLightColor"; type: "QColor"; isReadonly: true }
+        Property { name: "textLinkColor"; type: "QColor"; isReadonly: true }
+        Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true }
+        Property { name: "textPlaceholderColor"; type: "QColor"; isReadonly: true }
+        Property { name: "focusColor"; type: "QColor"; isReadonly: true }
         Property { name: "focusLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "focusPressedColor"; type: "QColor"; isReadonly: true }
         Property { name: "buttonColor"; type: "QColor"; isReadonly: true }
@@ -98,6 +112,9 @@ Module {
         Property { name: "frameLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "scrollBarColor"; type: "QColor"; isReadonly: true }
         Property { name: "scrollBarPressedColor"; type: "QColor"; isReadonly: true }
+        Property { name: "progressBarColor"; type: "QColor"; isReadonly: true }
+        Property { name: "pageIndicatorColor"; type: "QColor"; isReadonly: true }
+        Property { name: "separatorColor"; type: "QColor"; isReadonly: true }
         Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true }
         Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true }
     }
@@ -188,6 +205,7 @@ Module {
         exports: ["QtQuick.Controls/ActionGroup 2.3"]
         exportMetaObjectRevisions: [3]
         isComposite: true
+        defaultProperty: "actions"
     }
     Component {
         prototype: "QQuickApplicationWindow"
@@ -350,6 +368,22 @@ Module {
         defaultProperty: "contentData"
     }
     Component {
+        prototype: "QQuickMenuBar"
+        name: "QtQuick.Controls/MenuBar 2.3"
+        exports: ["QtQuick.Controls/MenuBar 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "contentData"
+    }
+    Component {
+        prototype: "QQuickMenuBarItem"
+        name: "QtQuick.Controls/MenuBarItem 2.3"
+        exports: ["QtQuick.Controls/MenuBarItem 2.3"]
+        exportMetaObjectRevisions: [3]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
         prototype: "QQuickMenuItem"
         name: "QtQuick.Controls/MenuItem 2.0"
         exports: ["QtQuick.Controls/MenuItem 2.0"]
@@ -707,6 +741,7 @@ Module {
     }
     Component {
         name: "QQuickActionGroup"
+        defaultProperty: "actions"
         prototype: "QObject"
         exports: ["QtQuick.Templates/ActionGroup 2.3"]
         exportMetaObjectRevisions: [0]
@@ -753,7 +788,9 @@ Module {
         Property { name: "font"; type: "QFont" }
         Property { name: "locale"; type: "QLocale" }
         Property { name: "palette"; revision: 3; type: "QPalette" }
+        Property { name: "menuBar"; revision: 3; type: "QQuickItem"; isPointer: true }
         Signal { name: "paletteChanged"; revision: 3 }
+        Signal { name: "menuBarChanged"; revision: 3 }
     }
     Component {
         name: "QQuickApplicationWindowAttached"
@@ -764,6 +801,7 @@ Module {
         Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true }
+        Property { name: "menuBar"; type: "QQuickItem"; isReadonly: true; isPointer: true }
     }
     Component {
         name: "QQuickBusyIndicator"
@@ -1165,6 +1203,7 @@ Module {
         prototype: "QQuickPopup"
         exports: ["QtQuick.Templates/Menu 2.0", "QtQuick.Templates/Menu 2.3"]
         exportMetaObjectRevisions: [0, 3]
+        Property { name: "count"; revision: 3; type: "int"; isReadonly: true }
         Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "title"; type: "string" }
@@ -1172,11 +1211,16 @@ Module {
         Property { name: "overlap"; revision: 3; type: "double" }
         Property { name: "delegate"; revision: 3; type: "QQmlComponent"; isPointer: true }
         Property { name: "currentIndex"; revision: 3; type: "int" }
+        Signal { name: "countChanged"; revision: 3 }
         Signal {
             name: "titleChanged"
             Parameter { name: "title"; type: "string" }
         }
-        Signal { name: "cascadeChanged"; revision: 3 }
+        Signal {
+            name: "cascadeChanged"
+            revision: 3
+            Parameter { name: "cascade"; type: "bool" }
+        }
         Signal { name: "overlapChanged"; revision: 3 }
         Signal { name: "delegateChanged"; revision: 3 }
         Signal { name: "currentIndexChanged"; revision: 3 }
@@ -1210,6 +1254,12 @@ Module {
             Parameter { name: "index"; type: "int" }
         }
         Method {
+            name: "menuAt"
+            revision: 3
+            type: "QQuickMenu*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
             name: "addMenu"
             revision: 3
             Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true }
@@ -1232,6 +1282,12 @@ Module {
             Parameter { name: "index"; type: "int" }
         }
         Method {
+            name: "actionAt"
+            revision: 3
+            type: "QQuickAction*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
             name: "addAction"
             revision: 3
             Parameter { name: "action"; type: "QQuickAction"; isPointer: true }
@@ -1258,6 +1314,53 @@ Module {
             revision: 3
             Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
+        Method { name: "dismiss"; revision: 3 }
+    }
+    Component {
+        name: "QQuickMenuBar"
+        defaultProperty: "contentData"
+        prototype: "QQuickContainer"
+        exports: ["QtQuick.Templates/MenuBar 2.3"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "contentWidth"; type: "double" }
+        Property { name: "contentHeight"; type: "double" }
+        Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true }
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+        Method {
+            name: "menuAt"
+            type: "QQuickMenu*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "addMenu"
+            Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true }
+        }
+        Method {
+            name: "insertMenu"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true }
+        }
+        Method {
+            name: "removeMenu"
+            Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true }
+        }
+        Method {
+            name: "takeMenu"
+            type: "QQuickMenu*"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "QQuickMenuBarItem"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        exports: ["QtQuick.Templates/MenuBarItem 2.3"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "menuBar"; type: "QQuickMenuBar"; isReadonly: true; isPointer: true }
+        Property { name: "menu"; type: "QQuickMenu"; isPointer: true }
+        Property { name: "highlighted"; type: "bool" }
+        Signal { name: "triggered" }
     }
     Component {
         name: "QQuickMenuItem"
@@ -1288,6 +1391,19 @@ Module {
         name: "QQuickOverlay"
         defaultProperty: "data"
         prototype: "QQuickItem"
+        exports: ["QtQuick.Templates/Overlay 2.3"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickOverlayAttached"
+        Property { name: "modal"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "modeless"; type: "QQmlComponent"; isPointer: true }
+        Signal { name: "pressed" }
+        Signal { name: "released" }
+    }
+    Component {
+        name: "QQuickOverlayAttached"
+        prototype: "QObject"
+        Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true }
         Property { name: "modal"; type: "QQmlComponent"; isPointer: true }
         Property { name: "modeless"; type: "QQmlComponent"; isPointer: true }
         Signal { name: "pressed" }
@@ -1389,6 +1505,7 @@ Module {
         Property { name: "rightPadding"; type: "double" }
         Property { name: "bottomPadding"; type: "double" }
         Property { name: "locale"; type: "QLocale" }
+        Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true }
         Property { name: "font"; type: "QFont" }
         Property { name: "palette"; revision: 3; type: "QPalette" }
         Property { name: "parent"; type: "QQuickItem"; isPointer: true }
@@ -1411,6 +1528,7 @@ Module {
         Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
         Property { name: "exit"; type: "QQuickTransition"; isPointer: true }
         Signal { name: "spacingChanged"; revision: 1 }
+        Signal { name: "mirroredChanged"; revision: 3 }
         Signal { name: "paletteChanged"; revision: 3 }
         Signal { name: "enabledChanged"; revision: 3 }
         Signal { name: "openedChanged"; revision: 3 }