Update plugins.qmltypes

Change-Id: I9cdb652f20deb3c0e7b1705d37f69ff4f954e233
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 40 insertions, 45 deletions

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 377fe589..57ae4cd0 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -8,7 +8,12 @@ import QtQuick.tooling 1.2
 
 Module {
     dependencies: [
+        "Qt.labs.controls.material 1.0",
+        "Qt.labs.controls.universal 1.0",
+        "Qt.labs.controls.universal.impl 1.0",
         "Qt.labs.templates 1.0",
+        "QtGraphicalEffects 1.0",
+        "QtGraphicalEffects.private 1.0",
         "QtQuick 2.6",
         "QtQuick.Window 2.2"
     ]
@@ -35,26 +40,8 @@ Module {
         Property { name: "group"; type: "QQuickButtonGroup"; isPointer: true }
     }
     Component {
-        name: "QQuickThemeAttached"
-        prototype: "QObject"
-        exports: ["Qt.labs.controls/Theme 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "accentColor"; type: "QColor" }
-        Property { name: "backgroundColor"; type: "QColor" }
-        Property { name: "baseColor"; type: "QColor" }
-        Property { name: "disabledColor"; type: "QColor" }
-        Property { name: "focusColor"; type: "QColor" }
-        Property { name: "frameColor"; type: "QColor" }
-        Property { name: "pressColor"; type: "QColor" }
-        Property { name: "selectedTextColor"; type: "QColor" }
-        Property { name: "selectionColor"; type: "QColor" }
-        Property { name: "shadowColor"; type: "QColor" }
-        Property { name: "textColor"; type: "QColor" }
-    }
-    Component {
         prototype: "QQuickApplicationWindow"
-        name: "Qt.labs.controls/ApplicationWindow"
+        name: "Qt.labs.controls/ApplicationWindow 1.0"
         exports: ["Qt.labs.controls/ApplicationWindow 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -62,7 +49,7 @@ Module {
     }
     Component {
         prototype: "QQuickBusyIndicator"
-        name: "Qt.labs.controls/BusyIndicator"
+        name: "Qt.labs.controls/BusyIndicator 1.0"
         exports: ["Qt.labs.controls/BusyIndicator 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -70,7 +57,7 @@ Module {
     }
     Component {
         prototype: "QQuickButton"
-        name: "Qt.labs.controls/Button"
+        name: "Qt.labs.controls/Button 1.0"
         exports: ["Qt.labs.controls/Button 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -78,7 +65,7 @@ Module {
     }
     Component {
         prototype: "QQuickCheckBox"
-        name: "Qt.labs.controls/CheckBox"
+        name: "Qt.labs.controls/CheckBox 1.0"
         exports: ["Qt.labs.controls/CheckBox 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -86,7 +73,7 @@ Module {
     }
     Component {
         prototype: "QQuickDial"
-        name: "Qt.labs.controls/Dial"
+        name: "Qt.labs.controls/Dial 1.0"
         exports: ["Qt.labs.controls/Dial 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -94,7 +81,7 @@ Module {
     }
     Component {
         prototype: "QQuickDrawer"
-        name: "Qt.labs.controls/Drawer"
+        name: "Qt.labs.controls/Drawer 1.0"
         exports: ["Qt.labs.controls/Drawer 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -102,7 +89,7 @@ Module {
     }
     Component {
         prototype: "QQuickFrame"
-        name: "Qt.labs.controls/Frame"
+        name: "Qt.labs.controls/Frame 1.0"
         exports: ["Qt.labs.controls/Frame 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -110,15 +97,23 @@ Module {
     }
     Component {
         prototype: "QQuickGroupBox"
-        name: "Qt.labs.controls/GroupBox"
+        name: "Qt.labs.controls/GroupBox 1.0"
         exports: ["Qt.labs.controls/GroupBox 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "contentData"
     }
     Component {
+        prototype: "QQuickItemDelegate"
+        name: "Qt.labs.controls/ItemDelegate 1.0"
+        exports: ["Qt.labs.controls/ItemDelegate 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+    }
+    Component {
         prototype: "QQuickLabel"
-        name: "Qt.labs.controls/Label"
+        name: "Qt.labs.controls/Label 1.0"
         exports: ["Qt.labs.controls/Label 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -126,7 +121,7 @@ Module {
     }
     Component {
         prototype: "QQuickPageIndicator"
-        name: "Qt.labs.controls/PageIndicator"
+        name: "Qt.labs.controls/PageIndicator 1.0"
         exports: ["Qt.labs.controls/PageIndicator 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -134,7 +129,7 @@ Module {
     }
     Component {
         prototype: "QQuickProgressBar"
-        name: "Qt.labs.controls/ProgressBar"
+        name: "Qt.labs.controls/ProgressBar 1.0"
         exports: ["Qt.labs.controls/ProgressBar 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -142,7 +137,7 @@ Module {
     }
     Component {
         prototype: "QQuickRadioButton"
-        name: "Qt.labs.controls/RadioButton"
+        name: "Qt.labs.controls/RadioButton 1.0"
         exports: ["Qt.labs.controls/RadioButton 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -150,7 +145,7 @@ Module {
     }
     Component {
         prototype: "QQuickRangeSlider"
-        name: "Qt.labs.controls/RangeSlider"
+        name: "Qt.labs.controls/RangeSlider 1.0"
         exports: ["Qt.labs.controls/RangeSlider 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -158,7 +153,7 @@ Module {
     }
     Component {
         prototype: "QQuickScrollBar"
-        name: "Qt.labs.controls/ScrollBar"
+        name: "Qt.labs.controls/ScrollBar 1.0"
         exports: ["Qt.labs.controls/ScrollBar 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -166,7 +161,7 @@ Module {
     }
     Component {
         prototype: "QQuickScrollIndicator"
-        name: "Qt.labs.controls/ScrollIndicator"
+        name: "Qt.labs.controls/ScrollIndicator 1.0"
         exports: ["Qt.labs.controls/ScrollIndicator 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -174,7 +169,7 @@ Module {
     }
     Component {
         prototype: "QQuickSlider"
-        name: "Qt.labs.controls/Slider"
+        name: "Qt.labs.controls/Slider 1.0"
         exports: ["Qt.labs.controls/Slider 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -182,7 +177,7 @@ Module {
     }
     Component {
         prototype: "QQuickSpinBox"
-        name: "Qt.labs.controls/SpinBox"
+        name: "Qt.labs.controls/SpinBox 1.0"
         exports: ["Qt.labs.controls/SpinBox 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -190,7 +185,7 @@ Module {
     }
     Component {
         prototype: "QQuickStackView"
-        name: "Qt.labs.controls/StackView"
+        name: "Qt.labs.controls/StackView 1.0"
         exports: ["Qt.labs.controls/StackView 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -198,7 +193,7 @@ Module {
     }
     Component {
         prototype: "QQuickSwipeView"
-        name: "Qt.labs.controls/SwipeView"
+        name: "Qt.labs.controls/SwipeView 1.0"
         exports: ["Qt.labs.controls/SwipeView 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -206,7 +201,7 @@ Module {
     }
     Component {
         prototype: "QQuickSwitch"
-        name: "Qt.labs.controls/Switch"
+        name: "Qt.labs.controls/Switch 1.0"
         exports: ["Qt.labs.controls/Switch 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -214,7 +209,7 @@ Module {
     }
     Component {
         prototype: "QQuickTabBar"
-        name: "Qt.labs.controls/TabBar"
+        name: "Qt.labs.controls/TabBar 1.0"
         exports: ["Qt.labs.controls/TabBar 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -222,7 +217,7 @@ Module {
     }
     Component {
         prototype: "QQuickTabButton"
-        name: "Qt.labs.controls/TabButton"
+        name: "Qt.labs.controls/TabButton 1.0"
         exports: ["Qt.labs.controls/TabButton 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -230,7 +225,7 @@ Module {
     }
     Component {
         prototype: "QQuickTextArea"
-        name: "Qt.labs.controls/TextArea"
+        name: "Qt.labs.controls/TextArea 1.0"
         exports: ["Qt.labs.controls/TextArea 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -238,7 +233,7 @@ Module {
     }
     Component {
         prototype: "QQuickTextField"
-        name: "Qt.labs.controls/TextField"
+        name: "Qt.labs.controls/TextField 1.0"
         exports: ["Qt.labs.controls/TextField 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -246,7 +241,7 @@ Module {
     }
     Component {
         prototype: "QQuickToolBar"
-        name: "Qt.labs.controls/ToolBar"
+        name: "Qt.labs.controls/ToolBar 1.0"
         exports: ["Qt.labs.controls/ToolBar 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -254,7 +249,7 @@ Module {
     }
     Component {
         prototype: "QQuickToolButton"
-        name: "Qt.labs.controls/ToolButton"
+        name: "Qt.labs.controls/ToolButton 1.0"
         exports: ["Qt.labs.controls/ToolButton 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
@@ -262,7 +257,7 @@ Module {
     }
     Component {
         prototype: "QQuickTumbler"
-        name: "Qt.labs.controls/Tumbler"
+        name: "Qt.labs.controls/Tumbler 1.0"
         exports: ["Qt.labs.controls/Tumbler 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true