Merge remote-tracking branch 'origin/5.7' into dev

Comparing colors in tst_material.qml works fine now. Conflicts: examples/quickcontrols2/gallery/qtquickcontrols2.conf tests/auto/material/data/tst_material.qml Task-number: QTBUG-53556 Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
author: Liang Qi <liang.qi@qt.io> 2016-06-01 13:18:06 +0200
committer: Liang Qi <liang.qi@qt.io> 2016-06-01 13:19:21 +0200
commit: 14e08bafc88824f3d16602b04b5e60ae8c4005b0 (patch)
tree: 47a831782fe60e26e6bba7ff8e5a0c3ac0a81c42
parent: 2ebb1fdcafaba9d3b0e7fbb42ccd5c3ffde38fbf (diff)
parent: ceaf6177a8be6db22e629ff05a625e278025b071 (diff)
324 files changed, 3181 insertions, 2849 deletions
diff --git a/.gitignore b/.gitignore
index 7d6784f9..747a3778 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
 /tests/benchmarks/objectcount/tst_objectcount
 /tests/manual/fonts/fonts
 /tests/manual/gifs/tst_gifs
+/tests/manual/styles/styles
 /tests/manual/testbench/testbench
 
 /tests/auto/snippets/screenshots/*.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
index 57ec1026..9109fdda 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
index 5b34264e..3cbfbe65 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
index 5c2bb682..e69e7e46 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index 567325ad..113874a9 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -58,6 +58,8 @@ ApplicationWindow {
     }
 
     header: ToolBar {
+        Material.foreground: "white"
+
         RowLayout {
             spacing: 20
             anchors.fill: parent
diff --git a/examples/quickcontrols2/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc
index ba5fb595..01c61324 100644
--- a/examples/quickcontrols2/gallery/gallery.qrc
+++ b/examples/quickcontrols2/gallery/gallery.qrc
@@ -18,6 +18,14 @@
         <file>images/menu@2x.png</file>
         <file>images/menu@3x.png</file>
         <file>images/menu@4x.png</file>
+        <file>images/+material/drawer.png</file>
+        <file>images/+material/drawer@2x.png</file>
+        <file>images/+material/drawer@3x.png</file>
+        <file>images/+material/drawer@4x.png</file>
+        <file>images/+material/menu.png</file>
+        <file>images/+material/menu@2x.png</file>
+        <file>images/+material/menu@3x.png</file>
+        <file>images/+material/menu@4x.png</file>
         <file>images/qt-logo.png</file>
         <file>images/qt-logo@2x.png</file>
         <file>images/qt-logo@3x.png</file>
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer.png b/examples/quickcontrols2/gallery/images/+material/drawer.png
new file mode 100644
index 00000000..615cc817
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer.png
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@2x.png b/examples/quickcontrols2/gallery/images/+material/drawer@2x.png
new file mode 100644
index 00000000..b1dd106d
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer@2x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@3x.png b/examples/quickcontrols2/gallery/images/+material/drawer@3x.png
new file mode 100644
index 00000000..289889bf
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer@3x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@4x.png b/examples/quickcontrols2/gallery/images/+material/drawer@4x.png
new file mode 100644
index 00000000..215e6a82
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer@4x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu.png b/examples/quickcontrols2/gallery/images/+material/menu.png
new file mode 100644
index 00000000..f02429e9
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu@2x.png b/examples/quickcontrols2/gallery/images/+material/menu@2x.png
new file mode 100644
index 00000000..9309ad9a
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu@2x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu@3x.png b/examples/quickcontrols2/gallery/images/+material/menu@3x.png
new file mode 100644
index 00000000..7bddf71f
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu@3x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu@4x.png b/examples/quickcontrols2/gallery/images/+material/menu@4x.png
new file mode 100644
index 00000000..e5c23a3b
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu@4x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow.png b/examples/quickcontrols2/gallery/images/arrow.png
index 340139de..d81accbb 100644
--- a/examples/quickcontrols2/gallery/images/arrow.png
+++ b/examples/quickcontrols2/gallery/images/arrow.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@2x.png b/examples/quickcontrols2/gallery/images/arrow@2x.png
index ef2016e9..309c0187 100644
--- a/examples/quickcontrols2/gallery/images/arrow@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@2x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@3x.png b/examples/quickcontrols2/gallery/images/arrow@3x.png
index 86c8506b..e146ecc9 100644
--- a/examples/quickcontrols2/gallery/images/arrow@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@3x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@4x.png b/examples/quickcontrols2/gallery/images/arrow@4x.png
index ce70d95b..b2ad27f3 100644
--- a/examples/quickcontrols2/gallery/images/arrow@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@4x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows.png b/examples/quickcontrols2/gallery/images/arrows.png
index f77e01fa..d38b94a4 100644
--- a/examples/quickcontrols2/gallery/images/arrows.png
+++ b/examples/quickcontrols2/gallery/images/arrows.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@2x.png b/examples/quickcontrols2/gallery/images/arrows@2x.png
index 9615d436..69b9342b 100644
--- a/examples/quickcontrols2/gallery/images/arrows@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@2x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@3x.png b/examples/quickcontrols2/gallery/images/arrows@3x.png
index b6a53e1c..77032526 100644
--- a/examples/quickcontrols2/gallery/images/arrows@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@3x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@4x.png b/examples/quickcontrols2/gallery/images/arrows@4x.png
index 099ed1b5..66c1fac5 100644
--- a/examples/quickcontrols2/gallery/images/arrows@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@4x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo.png b/examples/quickcontrols2/gallery/images/qt-logo.png
index 8b0772b0..90e6f905 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@2x.png b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
index 0d1d499b..22d111ad 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@2x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@3x.png b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
index c9aae358..627746cd 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@3x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@4x.png b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
index ad0ebd03..dc62286d 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@4x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
index c3fa06c5..3d175fd8 100644
--- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
@@ -70,13 +70,13 @@ Pane {
             text: labelText
             width: parent.width
 
-            onClicked: if (exposure.active) view.model.remove(ourIndex)
+            onClicked: if (swipe.complete) view.model.remove(ourIndex)
 
             Component {
                 id: removeComponent
 
                 Rectangle {
-                    color: swipeDelegate.exposed && swipeDelegate.pressed ? "#333" : "#444"
+                    color: swipeDelegate.swipe.complete && swipeDelegate.pressed ? "#333" : "#444"
                     width: parent.width
                     height: parent.height
                     clip: true
@@ -90,8 +90,8 @@ Pane {
                 }
             }
 
-            exposure.left: removeComponent
-            exposure.right: removeComponent
+            swipe.left: removeComponent
+            swipe.right: removeComponent
         }
     }
 
diff --git a/examples/quickcontrols2/gallery/qtquickcontrols2.conf b/examples/quickcontrols2/gallery/qtquickcontrols2.conf
index e219ac1a..da1a8f41 100644
--- a/examples/quickcontrols2/gallery/qtquickcontrols2.conf
+++ b/examples/quickcontrols2/gallery/qtquickcontrols2.conf
@@ -1,8 +1,8 @@
 [Material]
-Primary=LightGreen
-Accent=LightGreen
+Primary=#41cd52
+Accent=#41cd52
 Theme=System
 
 [Universal]
-Accent=Green
+Accent=#41cd52
 Theme=System
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 93db1c8e..89853116 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -53,7 +53,6 @@ T.SpinBox {
     padding: 6
     leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0))
     rightPadding: padding + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0))
-    opacity: control.enabled ? 1 : 0.3
 
     //! [validator]
     validator: IntValidator {
@@ -67,6 +66,7 @@ T.SpinBox {
     contentItem: TextInput {
         z: 2
         text: control.textFromValue(control.value, control.locale)
+        opacity: control.enabled ? 1 : 0.3
 
         font: control.font
         color: "#353637"
@@ -105,14 +105,14 @@ T.SpinBox {
             y: (parent.height - height) / 2
             width: parent.width / 3
             height: 2
-            color: control.enabled ? "#353637" : "#bdbebf"
+            color: enabled ? "#353637" : "#bdbebf"
         }
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: 2
             height: parent.width / 3
-            color: control.enabled ? "#353637" : "#bdbebf"
+            color: enabled ? "#353637" : "#bdbebf"
         }
     }
     //! [up.indicator]
@@ -130,13 +130,14 @@ T.SpinBox {
             y: (parent.height - height) / 2
             width: parent.width / 3
             height: 2
-            color: control.enabled ? "#353637" : "#bdbebf"
+            color: enabled ? "#353637" : "#bdbebf"
         }
     }
     //! [down.indicator]
 
     //! [background]
     background: Rectangle {
+        opacity: control.enabled ? 1 : 0.3
         implicitWidth: 140
         border.color: "#e0e0e0"
     }
diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo
index f802b714..4c876cf5 100644
--- a/src/imports/controls/designer/qtquickcontrols2.metainfo
+++ b/src/imports/controls/designer/qtquickcontrols2.metainfo
@@ -1,6 +1,6 @@
 MetaInfo {
     Type {
-        name: "Qt.Quick.Controls.BusyIndicator"
+        name: "QtQuick.Controls.BusyIndicator"
         icon: "images/busyindicator-icon16.png"
 
         ItemLibraryEntry {
@@ -13,7 +13,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Button"
+        name: "QtQuick.Controls.Button"
         icon: "images/button-icon16.png"
 
         ItemLibraryEntry {
@@ -28,7 +28,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.CheckBox"
+        name: "QtQuick.Controls.CheckBox"
         icon: "images/checkbox-icon16.png"
 
         ItemLibraryEntry {
@@ -43,7 +43,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.CheckDelegate"
+        name: "QtQuick.Controls.CheckDelegate"
         icon: "images/checkbox-icon16.png"
 
         ItemLibraryEntry {
@@ -58,7 +58,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.ComboBox"
+        name: "QtQuick.Controls.ComboBox"
         icon: "images/combobox-icon16.png"
 
         ItemLibraryEntry {
@@ -71,7 +71,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Dial"
+        name: "QtQuick.Controls.Dial"
         icon: "images/dial-icon16.png"
 
         ItemLibraryEntry {
@@ -84,7 +84,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Frame"
+        name: "QtQuick.Controls.Frame"
         icon: "images/frame-icon16.png"
 
         ItemLibraryEntry {
@@ -100,7 +100,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.GroupBox"
+        name: "QtQuick.Controls.GroupBox"
         icon: "images/groupbox-icon16.png"
 
         ItemLibraryEntry {
@@ -117,7 +117,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.ItemDelegate"
+        name: "QtQuick.Controls.ItemDelegate"
         icon: "images/itemdelegate-icon16.png"
 
         ItemLibraryEntry {
@@ -132,7 +132,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Label"
+        name: "QtQuick.Controls.Label"
         icon: "images/label-icon16.png"
 
         ItemLibraryEntry {
@@ -147,7 +147,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.PageIndicator"
+        name: "QtQuick.Controls.PageIndicator"
         icon: "images/pageindicator-icon16.png"
 
         ItemLibraryEntry {
@@ -162,7 +162,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Pane"
+        name: "QtQuick.Controls.Pane"
         icon: "images/pane-icon16.png"
 
         ItemLibraryEntry {
@@ -178,7 +178,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.ProgressBar"
+        name: "QtQuick.Controls.ProgressBar"
         icon: "images/progressbar-icon16.png"
 
         ItemLibraryEntry {
@@ -193,7 +193,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.RadioButton"
+        name: "QtQuick.Controls.RadioButton"
         icon: "images/radiobutton-icon16.png"
 
         ItemLibraryEntry {
@@ -208,7 +208,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.RadioDelegate"
+        name: "QtQuick.Controls.RadioDelegate"
         icon: "images/radiobutton-icon16.png"
 
         ItemLibraryEntry {
@@ -223,7 +223,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Slider"
+        name: "QtQuick.Controls.Slider"
         icon: "images/slider-icon16.png"
 
         ItemLibraryEntry {
@@ -238,7 +238,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.SpinBox"
+        name: "QtQuick.Controls.SpinBox"
         icon: "images/spinbox-icon16.png"
 
         ItemLibraryEntry {
@@ -251,7 +251,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Switch"
+        name: "QtQuick.Controls.Switch"
         icon: "images/switch-icon16.png"
 
         ItemLibraryEntry {
@@ -266,7 +266,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.TextArea"
+        name: "QtQuick.Controls.TextArea"
         icon: "images/textarea-icon16.png"
 
         ItemLibraryEntry {
@@ -281,7 +281,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.TextField"
+        name: "QtQuick.Controls.TextField"
         icon: "images/textfield-icon16.png"
 
         ItemLibraryEntry {
@@ -296,7 +296,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.ToolButton"
+        name: "QtQuick.Controls.ToolButton"
         icon: "images/toolbutton-icon16.png"
 
         ItemLibraryEntry {
@@ -311,7 +311,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.ToolBar"
+        name: "QtQuick.Controls.ToolBar"
         icon: "images/toolbar-icon16.png"
 
         ItemLibraryEntry {
@@ -326,7 +326,7 @@ MetaInfo {
     }
 
     Type {
-        name: "Qt.Quick.Controls.Tumbler"
+        name: "QtQuick.Controls.Tumbler"
         icon: "images/tumbler-icon16.png"
 
         ItemLibraryEntry {
diff --git a/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png b/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
index 2bdff335..7a140d27 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
diff --git a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
index e0d7ca33..130e3757 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
diff --git a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
index 7b955c88..6c8424ab 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
diff --git a/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
index ae5db0c1..dd903650 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
diff --git a/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
index 13495d05..0c3b3c41 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
diff --git a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
index 09deb30e..b015a3e6 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
diff --git a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
index db0b94f3..65e25b29 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
deleted file mode 100644
index 03cf98d0..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png
deleted file mode 100644
index fb14cb86..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
index 8bae4909..89a38660 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
deleted file mode 100644
index c2703157..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png
deleted file mode 100644
index 73d8f2fb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
index e418da04..5e68ed44 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
index 33638d1e..3375152c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
index 24d2cd06..a487bd27 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
index 9a5ea80e..7e7e281b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
index c88d57b0..2dff7764 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
deleted file mode 100644
index 4d24fa2f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
index 8620b0c2..71cb90ca 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png
deleted file mode 100644
index d5a1ef2e..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
index 03a3d0a5..922e458a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
index 63669b29..0c4d3bf7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
index ea49c721..5fb6daaf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
deleted file mode 100644
index fe6cd7a2..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
index b185fc99..69700ee0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png
deleted file mode 100644
index 79023922..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png
deleted file mode 100644
index 29d900a8..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
index 2503c5c6..f565e0e7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png
deleted file mode 100644
index e1708413..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png
deleted file mode 100644
index 1930034b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png
deleted file mode 100644
index 08c7bfc8..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
index badf1b52..0b2e34bf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
index d76776cf..7e716b3d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
index 5cb32247..7e716b3d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png b/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
index 7132b876..f4e2454e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default.png b/src/imports/controls/doc/images/qtquickcontrols2-default.png
index 144ceacb..67e52b84 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-default.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-default.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png
deleted file mode 100644
index ca6c9283..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
index 98643b9f..dc5779c0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
index b9a8e0d8..49ba9d0c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
deleted file mode 100644
index 75ad77bd..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
index 94f491fc..c9d00187 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-frame.png
index dc14acaf..3bc1a76a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
deleted file mode 100644
index baec44d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
index 9b3f32b1..fd36aec2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
index 7759cf38..29f0a60d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
index ea4dfb32..4929be52 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
index c0fc92c7..ef57cc64 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png
deleted file mode 100644
index 99b87780..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png
deleted file mode 100644
index 9f924cd3..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
index 9e3fa0c1..ff8ba047 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png
deleted file mode 100644
index 029abb00..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
index 456a0d55..bbf49fad 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label-background.png b/src/imports/controls/doc/images/qtquickcontrols2-label-background.png
deleted file mode 100644
index 34a638d6..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-label-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
index 563c74b1..5d950fe6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label.png b/src/imports/controls/doc/images/qtquickcontrols2-label.png
index 961ce3e3..a51912f5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material.png b/src/imports/controls/doc/images/qtquickcontrols2-material.png
index d7ce0e88..4caef89e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-material.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png
deleted file mode 100644
index 4dcf1fac..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
index 8b8c6cc6..7121fd0a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png
deleted file mode 100644
index 756b87f1..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png
deleted file mode 100644
index cfce4ffb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png
deleted file mode 100644
index a379d915..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
index 6b429379..4c24f426 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane.png b/src/imports/controls/doc/images/qtquickcontrols2-pane.png
index fe534424..b34e9488 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pane.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png b/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png
new file mode 100644
index 00000000..787de5d4
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
deleted file mode 100644
index 59e81b2b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png
deleted file mode 100644
index 9ce19e92..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
index bb461b65..c018e5e7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
deleted file mode 100644
index 30295394..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
index 8f5af513..d22a595b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png
deleted file mode 100644
index 457555b7..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
index 85262f9c..15835a3c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
index 626cd616..11a99d6f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
index 797e50a9..d7c79ed1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
deleted file mode 100644
index 0d78a0d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
index f8d0828b..8a49bf58 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png
deleted file mode 100644
index f9ff48c2..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png
deleted file mode 100644
index 9ede889f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
index be6a9d08..46245323 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png
deleted file mode 100644
index 9d8cbdbd..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png
deleted file mode 100644
index c045fdbb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
index d481b4e9..8508a73d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
index abb033c2..8406fca6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
index abb033c2..c5f658d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
index fb246db3..535362bf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
index abb033c2..c5f658d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
index abb033c2..c5f658d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
index a33a6de2..44509959 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
deleted file mode 100644
index 0b1aa171..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png
deleted file mode 100644
index 5d916e66..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
index 2e582a70..f986f674 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
deleted file mode 100644
index e9fa04c7..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png
deleted file mode 100644
index 99266362..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
deleted file mode 100644
index 23a754c3..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
index 2323b79f..fc4c89d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
index 2e27a604..919a9a2b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
index 2e27a604..e6c4179c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
index 7729ef07..093f4a96 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
index 2e27a604..e6c4179c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png
deleted file mode 100644
index 74fbab6e..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png
deleted file mode 100644
index 81d549c0..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
index 64acb6f9..5aeee0c4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
index fcfaa472..cdece17b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
index e7c43101..1f88f98d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
index 4361c492..922e59b7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
index b9992471..7d254971 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
index 909fbda6..6aa341bb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png
deleted file mode 100644
index 07f388bb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png
deleted file mode 100644
index cec6cf15..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
index 25ae9e77..10c60ac3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png
deleted file mode 100644
index 1b43928b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
deleted file mode 100644
index c3cf20f3..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
index 7c678417..f4b0320c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png
deleted file mode 100644
index 50f608ab..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
index 5293a8b9..737d3a09 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
index 15ff76e6..060d2b2a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
index 9e973d0e..2384f76a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
deleted file mode 100644
index 02b88dde..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
index aac440a0..5f84f62a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png
deleted file mode 100644
index e53141ac..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png
deleted file mode 100644
index e12be69a..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
index d7f5430b..3a77a480 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png
deleted file mode 100644
index 33c15cdf..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
index 3203e619..cadf3079 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
index 44a91d63..6993c8bd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
index 76d1e35c..3cdce15e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
index 7ed0c2cf..59777574 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
deleted file mode 100644
index e345124d..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
index acca494f..a9f40c07 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
index 55034be2..a027c72a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
index bf5ee32a..a63d3c85 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
index 02bb465a..25047227 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
deleted file mode 100644
index 8f390b49..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
deleted file mode 100644
index fa883751..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
deleted file mode 100644
index 794692b0..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
deleted file mode 100644
index f52e4686..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
deleted file mode 100644
index 97e06e2c..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
deleted file mode 100644
index 3eb3ba35..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
deleted file mode 100644
index b066c565..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
deleted file mode 100644
index 12b4c348..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
index 9e07ce57..374cc836 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
index 3e64b4e4..f4808ca9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
deleted file mode 100644
index 8dd64031..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png
deleted file mode 100644
index f4797098..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
index f590af7d..4bd209aa 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png
deleted file mode 100644
index c082c840..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png
deleted file mode 100644
index d79a336f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
index b5c70d86..64a79839 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
index b5c70d86..64a79839 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
index 6dad4464..440f6eba 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
index ffac3ed6..0a4d57e5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png
deleted file mode 100644
index 24c200de..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png
deleted file mode 100644
index 24c200de..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
index 39a2c509..0ebb9edf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
index d274d444..5213bcd8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal.png b/src/imports/controls/doc/images/qtquickcontrols2-universal.png
index 89a0f069..b50d9cca 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-universal.png
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 25eb8e9c..563fb771 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -29,7 +29,7 @@ qhp.QtQuickControls2.subprojects.examples.title = Examples
 qhp.QtQuickControls2.subprojects.examples.indexTitle = Qt Quick Controls 2 Examples
 qhp.QtQuickControls2.subprojects.examples.selectors = fake:example
 
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake qtsql qtwidgets
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets
 
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
@@ -61,7 +61,7 @@ navigation.cppclassespage = "Qt Quick Controls 2 C++ Classes"
 tagfile                 = qtquickcontrols2.tags
 
 # \styleimport {QtQuick.Controls.Universal 2.0}
-macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr></tbody></table>"
+macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr><tr><td class=\"memItemLeft rightAlign topAlign\"> Since:</td><td class=\"memItemRight bottomAlign\"> \2</td></tr></tbody></table>"
 
 # \styleproperty {Universal.accent} {enumeration} {html-target-id}
 # \target html-target-id
@@ -71,9 +71,18 @@ macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\
 macro.styleproperty.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\3\"><td class=\"tblQmlPropNode\"><p><span class=\"name\">\1</span> : <span class=\"type\">\2</span></p></td></tr></tbody></table></div>"
 macro.endstyleproperty = "\\br"
 
+# \stylemethod {returntype} {methodname} {argtype} {argname} {html-target-id}
+# \target html-target-id
+# This property holds ...
+# (empty line)
+# \endstylemethod
+macro.stylemethod.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\5\"><td class=\"tblQmlFuncNode\"><p><span class=\"type\">\1</span> <span class=\"name\">\2</span>(<span class="type">\3</span> <i>\4</i>)</p></td></tr></tbody></table></div>"
+macro.endstylemethod = "\\br"
+
 # \stylecolor {#6A00FF} {(default)}
 macro.stylecolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\">\1 \2</div>"
 
+macro.nbsp.HTML = "&nbsp;"
 macro.labs = "\\note \\e{Types in the Qt.labs module are not guaranteed to remain compatible in future versions.}"
 
 #Add output suffix to the html filenames
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
deleted file mode 100644
index b003cd82..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-BusyIndicator {
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
deleted file mode 100644
index 87a8a0fe..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-BusyIndicator {
-    Rectangle {
-        anchors.fill: contentItem
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
deleted file mode 100644
index 4c179384..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Button {
-    width: 80
-    text: "Button"
-    Rectangle {
-        anchors.fill: background
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
deleted file mode 100644
index 482eee54..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Button {
-    width: 80
-    text: "Button"
-    Rectangle {
-        anchors.fill: contentItem
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
deleted file mode 100644
index c53604b9..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckBox {
-    text: "CheckBox"
-    background: Rectangle {
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
deleted file mode 100644
index 282cfb59..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckBox {
-    text: "CheckBox"
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
deleted file mode 100644
index 041871f1..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckBox {
-    text: "CheckBox"
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
deleted file mode 100644
index ab868506..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckDelegate {
-    text: "CheckDelegate"
-    checked: true
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
deleted file mode 100644
index 377fa39f..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckDelegate {
-    text: "CheckDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
deleted file mode 100644
index 0af46fbe..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckDelegate {
-    text: "CheckDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
deleted file mode 100644
index a61cf18d..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ComboBox {
-    model: ["ComboBox"]
-    Rectangle {
-        anchors.fill: background
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
deleted file mode 100644
index cd3383c7..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ComboBox {
-    model: ["ComboBox"]
-    Rectangle {
-        anchors.fill: contentItem
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
deleted file mode 100644
index 46187995..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Dial {
-    Rectangle {
-        anchors.fill: background
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
deleted file mode 100644
index 90537ddd..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Frame {
-    width: 100
-    height: 100
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
deleted file mode 100644
index c379a7ce..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-GroupBox {
-    width: 100
-    height: 100
-    title: "GroupBox"
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
deleted file mode 100644
index 81148ebd..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ItemDelegate {
-    text: "ItemDelegate"
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
deleted file mode 100644
index 76082088..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ItemDelegate {
-    text: "ItemDelegate"
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
deleted file mode 100644
index 9a293d3c..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ItemDelegate {
-    text: "ItemDelegate"
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
deleted file mode 100644
index b08f2ff5..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Label {
-    text: "Label"
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
deleted file mode 100644
index ffbaa934..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Item {
-    id: window
-    width: menu.contentItem.width
-    height: menu.contentItem.height
-    visible: true
-
-    Menu {
-        id: menu
-        contentItem.parent: window
-
-        MenuItem {
-            text: "New..."
-        }
-        MenuItem {
-            text: "Open..."
-        }
-        MenuItem {
-            text: "Save"
-        }
-    }
-
-    Rectangle {
-        parent: menu.contentItem
-        anchors.fill: parent
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
deleted file mode 100644
index a6a4a9e3..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-PageIndicator {
-    count: 5
-    currentIndex: 2
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
deleted file mode 100644
index 039a0507..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-PageIndicator {
-    count: 5
-    currentIndex: 2
-    Rectangle {
-        anchors.fill: contentItem
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
deleted file mode 100644
index 40a07495..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Pane {
-    width: 100
-    height: 100
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
deleted file mode 100644
index 2a5ddc4e..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ProgressBar {
-    value: 0.5
-    Rectangle {
-        anchors.fill: background
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
deleted file mode 100644
index 068eff76..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ProgressBar {
-    value: 0.5
-    Rectangle {
-        parent: contentItem
-        anchors.fill: parent
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
deleted file mode 100644
index 21f22e6f..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioButton {
-    text: "RadioButton"
-    background: Rectangle {
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
deleted file mode 100644
index 1d54af6b..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioButton {
-    text: "RadioButton"
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
deleted file mode 100644
index b138c25d..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioButton {
-    text: "RadioButton"
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
deleted file mode 100644
index 99123371..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioDelegate {
-    text: "RadioDelegate"
-    checked: true
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
deleted file mode 100644
index b14a2f13..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioDelegate {
-    text: "RadioDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
deleted file mode 100644
index d8b0e395..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioDelegate {
-    text: "RadioDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
deleted file mode 100644
index a948f319..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RangeSlider {
-    first.value: 0.25
-    second.value: 0.75
-    background: Rectangle {
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
deleted file mode 100644
index eebb5157..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ScrollBar {
-    size: 0.5
-    position: 0.5
-    active: true
-    height: 100
-    background: Rectangle {
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
deleted file mode 100644
index f039e291..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ScrollBar {
-    size: 0.5
-    position: 0.5
-    active: true
-    height: 100
-    Rectangle {
-        parent: contentItem
-        anchors.fill: parent
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
deleted file mode 100644
index 9e540cf9..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ScrollIndicator {
-    size: 0.5
-    position: 0.5
-    active: true
-    height: 100
-    background: Rectangle {
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
deleted file mode 100644
index c32539be..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ScrollIndicator {
-    size: 0.5
-    position: 0.5
-    active: true
-    height: 100
-    Rectangle {
-        parent: contentItem
-        anchors.fill: parent
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
deleted file mode 100644
index 94f4a176..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Slider {
-    value: 0.5
-    Rectangle {
-        anchors.fill: background
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
deleted file mode 100644
index 6cf47ac9..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SpinBox {
-    value: 50
-    Rectangle {
-        anchors.fill: parent
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
deleted file mode 100644
index e226fc09..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SpinBox {
-    value: 50
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
index 99549b8c..6433fd80 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
@@ -56,7 +56,7 @@ SpinBox {
         implicitWidth: 40
         implicitHeight: 40
         color: up.pressed ? "#e4e4e4" : "#f6f6f6"
-        border.color: control.enabled ? "#21be2b" : "#bdbebf"
+        border.color: enabled ? "#21be2b" : "#bdbebf"
 
         Text {
             text: "+"
@@ -75,7 +75,7 @@ SpinBox {
         implicitWidth: 40
         implicitHeight: 40
         color: down.pressed ? "#e4e4e4" : "#f6f6f6"
-        border.color: control.enabled ? "#21be2b" : "#bdbebf"
+        border.color: enabled ? "#21be2b" : "#bdbebf"
 
         Text {
             text: "-"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
deleted file mode 100644
index 4a37a13f..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwipeDelegate {
-    text: "SwipeDelegate"
-    Rectangle {
-        anchors.fill: background
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
deleted file mode 100644
index 8284f7e4..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwipeDelegate {
-    text: "SwipeDelegate"
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
index bd58de8b..ae63efed 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
@@ -37,7 +37,7 @@ SwipeDelegate {
         id: component
 
         Rectangle {
-            color: control.exposure.active && control.down ? "#333" : "#444"
+            color: control.swipe.complete && control.down ? "#333" : "#444"
             width: parent.width
             height: parent.height
             clip: true
@@ -50,8 +50,8 @@ SwipeDelegate {
         }
     }
 
-    exposure.left: component
-    exposure.right: component
+    swipe.left: component
+    swipe.right: component
 
     contentItem: Text {
         text: control.text
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
deleted file mode 100644
index 2a5be1a0..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwipeDelegate {
-    text: "SwipeDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
deleted file mode 100644
index 605df1f4..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Switch {
-    text: "Switch"
-    background: Rectangle {
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
deleted file mode 100644
index 2e68086b..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Switch {
-    text: "Switch"
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
deleted file mode 100644
index 7be24128..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Switch {
-    text: "Switch"
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
deleted file mode 100644
index 27be5e86..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwitchDelegate {
-    text: "SwitchDelegate"
-    checked: true
-    background: Rectangle {
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
deleted file mode 100644
index 121904cd..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwitchDelegate {
-    text: "SwitchDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: contentItem
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
deleted file mode 100644
index b3b1d121..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwitchDelegate {
-    text: "SwitchDelegate"
-    checked: true
-    Rectangle {
-        anchors.fill: indicator
-        color: "transparent"
-        border.color: "red"
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
deleted file mode 100644
index 8e012d19..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-TextField {
-    width: 80
-    text: "TextField"
-    Rectangle {
-        anchors.fill: background
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
deleted file mode 100644
index 6eed06bb..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ToolBar {
-    width: 100
-    Rectangle {
-        parent: background
-        anchors.fill: parent
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
deleted file mode 100644
index 619fac71..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ToolButton {
-    text: "ToolButton"
-    Rectangle {
-        anchors.fill: background
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
deleted file mode 100644
index 6f78e45d..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ToolButton {
-    text: "ToolButton"
-    Rectangle {
-        anchors.fill: contentItem
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
deleted file mode 100644
index 22444739..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-
-Item {
-    id: root
-    width: tip.width
-    height: tip.height
-
-    ToolTip {
-        id: tip
-        text: "ToolTip"
-        visible: root.Window.active
-
-        Rectangle {
-            parent: tip.background
-            anchors.fill: parent
-            color: 'transparent'
-            border.color: 'red'
-        }
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
deleted file mode 100644
index c05ee534..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-
-Item {
-    id: root
-    width: tip.width
-    height: tip.height
-
-    ToolTip {
-        id: tip
-        text: "ToolTip"
-        visible: root.Window.active
-
-        Rectangle {
-            parent: tip.contentItem
-            anchors.fill: parent
-            color: 'transparent'
-            border.color: 'red'
-        }
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
deleted file mode 100644
index dcb2d942..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Tumbler {
-    model: 5
-
-    Rectangle {
-        anchors.fill: parent
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
deleted file mode 100644
index 989c4521..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Tumbler {
-    model: 5
-
-    Rectangle {
-        anchors.fill: parent.contentItem
-        color: 'transparent'
-        border.color: 'red'
-    }
-}
diff --git a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
index aee93a26..32ccbb89 100644
--- a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
+++ b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
@@ -4,7 +4,7 @@ This property holds the logical position of the thumb indicator.
 
 The position is defined as a percentage of the indicator's size, scaled to
 \c 0.0 - \c 1.0. The position can be used for example to determine whether
-the thumb has been dragged past the halfway. For visualizing a thumb
+the thumb has been dragged past the halfway point. For visualizing a thumb
 indicator, the right-to-left aware \l visualPosition should be used instead.
 
 \sa visualPosition
@@ -21,7 +21,7 @@ The position is defined as a percentage of the indicator's size, scaled to
 value is equal to \c {1.0 - position}. This makes the value suitable for
 visualizing the thumb indicator taking right-to-left support into account.
 In order to for example determine whether the thumb has been dragged past
-the halfway, the logical \l position should be used instead.
+the halfway point, the logical \l position should be used instead.
 
 \sa position
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 19f1889e..559c89f0 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -585,7 +585,7 @@
 
         SwipeDelegate consists of six visual items: \l {Control::background}{background},
         \l {Control::contentItem}{content item}, \l {AbstractButton::indicator}{indicator},
-        \c exposure.left, \c exposure.right, and \c exposure.behind.
+        \c swipe.left, \c swipe.right, and \c swipe.behind.
 
         \image qtquickcontrols2-swipedelegate-custom.png
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
index 8ff518f5..88faf25a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
@@ -45,6 +45,8 @@
     does not implement a certain control, the Default style implementation of
     that control is selected.
 
+    \b {See also} \l {Material Style}, \l {Universal Style}
+
     \section1 Related Information
 
     \list
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index c80f8ccd..31c8b196 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -130,7 +130,7 @@
         \li C++
     \endtable
 
-    \b {* No hover support}
+    \b {* No hover effects}
 
     \section2 Porting Qt Quick Controls Code
 
@@ -180,15 +180,18 @@
     This works with both modules, and will reduce the amount of work needed
     when the migration begins.
 
-    \section3 Type Changes
+    \section3 Type Comparison Table
 
     \table
     \header
-        \li Qt Quick Controls
-        \li Qt Quick Controls 2
+        \li Qt Quick Controls 1, Qt Quick Extras
+        \li Qt Quick Controls 2, Qt Labs Calendar
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {AbstractButton}
     \row
         \li \l [QML QtQuickControls] {Action}
-        \li No equivalent; see \l [QML QtQuick] {Shortcut} instead.
+        \li \span {} {\mdash \nbsp \sub {(see \l [QML QtQuick] {Shortcut} instead)}}
     \row
         \li \l [QML QtQuickControls] {ApplicationWindow}
         \li \l [QML QtQuickControls2] {ApplicationWindow}
@@ -199,23 +202,52 @@
         \li \l [QML QtQuickControls] {Button}
         \li \l [QML QtQuickControls2] {Button}
     \row
+        \li \l [QML QtQuickExtras] {CircularGauge}
+        \li \mdash
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Control}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Container}
+    \row
         \li \l [QML QtQuickControls] {Calendar}
-        \li No equivalent; see \l [QML] {MonthGrid}, \l [QML] {DayOfWeekRow} and \l [QML] {WeekNumberColumn} instead.
+        \li \l [QML QtLabsCalendar] {MonthGrid},
+            \l [QML QtLabsCalendar] {DayOfWeekRow},
+            \l [QML QtLabsCalendar] {WeekNumberColumn}
     \row
         \li \l [QML QtQuickControls] {CheckBox}
         \li \l [QML QtQuickControls2] {CheckBox}
     \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {CheckDelegate}
+    \row
         \li \l [QML QtQuickControls] {ComboBox}
         \li \l [QML QtQuickControls2] {ComboBox}
     \row
+        \li \l [QML QtQuickExtras] {DelayButton}
+        \li \mdash
+    \row
+        \li \l [QML QtQuickExtras] {Dial}
+        \li \l [QML QtQuickControls2] {Dial}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Drawer}
+    \row
         \li \l [QML QtQuickControls] {ExclusiveGroup}
         \li \l [QML QtQuickControls2] {ButtonGroup}
     \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Frame}
+    \row
+        \li \l [QML QtQuickExtras] {Gauge}
+        \li \mdash
+    \row
         \li \l [QML QtQuickControls] {GroupBox}
-
-        \li \l [QtQuickControls2] {GroupBox}, or \l [QML QtQuickControls2] {Frame}
-            if a title is not required.
-
+        \li \l [QML QtQuickControls2] {GroupBox}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {ItemDelegate}
     \row
         \li \l [QML QtQuickControls] {Label}
         \li \l [QML QtQuickControls2] {Label}
@@ -223,12 +255,39 @@
         \li \l [QML QtQuickControls] {Menu}
         \li \l [QML QtQuickControls2] {Menu}
     \row
+        \li \l [QML QtQuickControls] {MenuItem}
+        \li \l [QML QtQuickControls2] {MenuItem}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Page}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {PageIndicator}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Pane}
+    \row
+        \li \l [QML QtQuickExtras] {Picture}
+        \li \mdash
+    \row
+        \li \l [QML QtQuickExtras] {PieMenu}
+        \li \mdash
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {Popup}
+    \row
         \li \l [QML QtQuickControls] {ProgressBar}
         \li \l [QML QtQuickControls2] {ProgressBar}
     \row
         \li \l [QML QtQuickControls] {RadioButton}
         \li \l [QML QtQuickControls2] {RadioButton}
     \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {RadioDelegate}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {RangeSlider}
+    \row
         \li \l [QML QtQuickControls] {ScrollView}
         \li \l [QML QtQuickControls2] {ScrollBar},
             \l [QML QtQuickControls2] {ScrollIndicator}
@@ -239,24 +298,36 @@
         \li \l [QML QtQuickControls] {SpinBox}
         \li \l [QML QtQuickControls2] {SpinBox}
     \row
-        \li \l [QML QtQuickControls] {Stack},
-            \l [QML QtQuickControls] {StackView},
-            \l [QML QtQuickControls] {StackViewDelegate}
+        \li \l [QML QtQuickControls] {StackView},
+            \l [QML QtQuickControls] {StackViewDelegate},
+            \l [QML QtQuickControls] {Stack}
         \li \l [QML QtQuickControls2] {StackView}
     \row
         \li \l [QML QtQuickControls] {StatusBar}
-        \li No equivalent
+        \li \mdash
+    \row
+        \li \l [QML QtQuickExtras] {StatusIndicator}
+        \li \mdash
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {SwipeDelegate}
+    \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {SwipeView}
     \row
         \li \l [QML QtQuickControls] {Switch}
         \li \l [QML QtQuickControls2] {Switch}
     \row
-        \li \l [QML QtQuickControls] {Tab},
-            \l [QML QtQuickControls] {TabView}
-        \li \l [QML QtQuickControls2] {TabBar} in combination with, for example,
-            \l [QML QtQuickControls2] {SwipeView}.
+        \li \mdash
+        \li \l [QML QtQuickControls2] {SwitchDelegate}
+    \row
+        \li \l [QML QtQuickControls] {TabView},
+            \l [QML QtQuickControls] {Tab}
+        \li \l [QML QtQuickControls2] {TabBar},
+            \l [QML QtQuickControls2] {TabButton}
     \row
         \li \l [QML QtQuickControls] {TableView}
-        \li No equivalent
+        \li \mdash
     \row
         \li \l [QML QtQuickControls] {TextArea}
         \li \l [QML QtQuickControls2] {TextArea}
@@ -264,21 +335,32 @@
         \li \l [QML QtQuickControls] {TextField}
         \li \l [QML QtQuickControls2] {TextField}
     \row
+        \li \l [QML QtQuickExtras] {ToggleButton}
+        \li \mdash
+    \row
         \li \l [QML QtQuickControls] {ToolBar}
         \li \l [QML QtQuickControls2] {ToolBar}
     \row
         \li \l [QML QtQuickControls] {ToolButton}
         \li \l [QML QtQuickControls2] {ToolButton}
     \row
+        \li \mdash
+        \li \l [QML QtQuickControls2] {ToolTip}
+    \row
         \li \l [QML QtQuickControls] {TreeView}
-        \li No equivalent
+        \li \mdash
+    \row
+        \li \l [QML QtQuickExtras] {Tumbler},
+            \l [QML QtQuickExtras] {TumblerColumn}
+        \li \l [QML QtQuickControls2] {Tumbler}
     \endtable
 
     \section1 Related Information
 
     \list
       \li \l{Qt Quick}
-      \li \l{Qt Quick Controls}
       \li \l{Qt Quick Controls 2 QML Types}
+      \li \l{Qt Quick Controls QML Types}
+      \li \l{Qt Quick Extras QML Types}
     \endlist
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index b96ffaa0..cf5d8840 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -32,7 +32,7 @@
     The Material Style is based on the Google Material Design Guidelines.
     \l{detailed-desc-material}{More...}
 
-    \styleimport {QtQuick.Controls.Material 2.0}
+    \styleimport {QtQuick.Controls.Material 2.0} {Qt 5.7}
 
     \section1 Attached Properties
 
@@ -44,6 +44,12 @@
         \li \l {theme-attached-prop}{\b theme} : enumeration
     \endlist
 
+    \section1 Attached Methods
+
+    \list
+        \li color \l {color-attached-method}{\b color}(enumeration predefined)
+    \endlist
+
     \section1 Detailed Description
     \target detailed-desc-material
 
@@ -200,6 +206,8 @@
     \value Material.Grey \stylecolor {#9E9E9E} {}
     \value Material.BlueGrey \stylecolor {#607D8B} {}
 
+    \b {See also} \l {Default Style}, \l {Universal Style}
+
     \section1 Attached Property Documentation
 
     \styleproperty {Material.accent} {color} {accent-attached-prop}
@@ -262,6 +270,24 @@
 
     \endstyleproperty
 
+    \section1 Attached Method Documentation
+
+    \stylemethod {color} {color} {enumeration} {predefined} {color-attached-method}
+    \target color-attached-method
+    This attached method returns the color value of the specified \l {pre-defined colors}
+    {pre-defined color}.
+
+    \qml
+    import QtQuick 2.0
+    import QtQuick.Controls.Material 2.0
+
+    Rectangle {
+        color: Material.color(Material.Red)
+    }
+    \endqml
+
+    \endstylemethod
+
     \section1 Related Information
 
     \list
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
index 0d70028f..2ea21f3f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
@@ -42,20 +42,49 @@
     \l Drawer provides a swipe-based side panel, similar to those often used
     in touch interfaces to provide a central location for navigation.
 
+    The drawer can be positioned at any of the four edges of the screen. It allows
+    the user to add navigation without taking up valuable screen space. The user can
+    show and hide the drawer at any time with a simple swipe movement.
+
     \section1 Menu Control
 
     \image qtquickcontrols2-menu.png
 
-    \l Menu is a traditional menu.
+    The \l Menu control displays a vertical list of items that can be selected. It can
+    be used for offering a list of actions that can be taken in a given context.
 
     \section1 Popup Control
 
-    \l Popup is the base type of popup-like user interface controls.
+    \image qtquickcontrols2-popup-settings.png
+
+    A \l Popup displays content over other application content.
+    It prompts the user to make a decision or enter information.
+
+    Popups can be modal or non-modal. A modal popup blocks users from interacting
+    with the application until they have made a choice and closed the popup.
+
+    A popup can be used for:
+
+    \list
+    \li communicating a message to the user that he must read and acknowledge.
+    \li displaying an error message.
+    \li prompting the user to make a choice and/or enter a value.
+    \endlist
 
     \section1 ToolTip Control
 
     \image qtquickcontrols2-tooltip.png
 
     \l ToolTip shows a short piece of text that informs the user of a control's
-    function. It is typically placed above or below the parent control.
+    function.
+
+    Recommendations:
+    \list
+    \li Use a tooltip if a control has little or no descriptive text, or needs
+    a short explanation.
+    \li Use a tooltip only if the information on a particular control is not
+     available elsewhere in the screen.
+    \li Keep the tooltip text short so that it does not cover other content
+    while being displayed.
+    \endlist
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index d2c4c5f3..98f9a212 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -29,11 +29,46 @@
     \page qtquickcontrols2-styles.html
     \title Styling Qt Quick Controls 2
 
-    Qt Quick Controls 2 comes with a selection of styles. The \l {Default Style}
-    {Default} style is a simple and light-weight all-round style that offers
-    the maximum performance for Qt Quick Controls 2. The more advanced
-    \l {Universal Style}{Universal} and \l {Material Style}{Material} styles
-    offer an appealing design, but require more system resources.
+    Qt Quick Controls 2 comes with a selection of styles.
+
+    \raw HTML
+    <table style="background:transparent; border:0px">
+      <tr>
+        <td style="border:0px">
+          <a href="qtquickcontrols2-default.html">
+            <img src="images/qtquickcontrols2-default.png" width="45%"/>
+          </a>
+        </td>
+        <td style="border:0px">
+          <a href="qtquickcontrols2-material.html">
+            <img src="images/qtquickcontrols2-material.png" width="75%"/>
+          </a>
+        </td>
+        <td style="border:0px">
+          <a href="qtquickcontrols2-universal.html">
+            <img src="images/qtquickcontrols2-universal.png" width="75%"/>
+          </a>
+        </td>
+      </tr>
+      <tr>
+        <td style="border:0px">
+          The <a href="qtquickcontrols2-default.html">Default</a> style is
+          a simple and light-weight all-round style that offers the maximum
+          performance for Qt Quick Controls 2.
+        </td>
+        <td style="border:0px">
+          The <a href="qtquickcontrols2-material.html">Material</a> style offers an appealing design
+          based on the <a href="https://www.google.com/design/spec/material-design/introduction.html">
+          Google Material Design Guidelines</a>, but requires more system resources than the Default style.
+        </td>
+        <td style="border:0px">
+          The <a href="qtquickcontrols2-universal.html">Universal</a> style offers an appealing design
+          based on the <a href="https://dev.windows.com/design">Microsoft Universal Design Guidelines</a>,
+          but requires more system resources than the Default style.
+        </td>
+      </tr>
+    </table>
+    \endraw
 
     \section1 Using Styles in Qt Quick Controls 2
 
@@ -48,7 +83,7 @@
 
     \section2 Using QQuickStyle in C++
 
-    \l QQuickStyle provides API configuring a specific style. The following
+    \l QQuickStyle provides API for configuring a specific style. The following
     example runs a Qt Quick Controls 2 application with the Material style:
 
     \code
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index ac2c051d..fbfca8d1 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -32,7 +32,7 @@
     The Universal Style is based on the Microsoft Universal Design Guidelines.
     \l {detailed-desc-universal}{More...}
 
-    \styleimport {QtQuick.Controls.Universal 2.0}
+    \styleimport {QtQuick.Controls.Universal 2.0} {Qt 5.7}
 
     \section1 Attached Properties
 
@@ -43,6 +43,12 @@
         \li \l {theme-attached-prop}{\b theme} : enumeration
     \endlist
 
+    \section1 Attached Methods
+
+    \list
+        \li color \l {color-attached-method}{\b color}(enumeration predefined)
+    \endlist
+
     \section1 Detailed Description
     \target detailed-desc-universal
 
@@ -159,6 +165,8 @@
     style-specific tweaks can be applied without creating a hard dependency to
     a style.
 
+    \b {See also} \l {Default Style}, \l {Material Style}
+
     \section1 Attached Property Documentation
 
     \styleproperty {Universal.accent} {color} {accent-attached-prop}
@@ -225,6 +233,24 @@
 
     \endstyleproperty
 
+    \section1 Attached Method Documentation
+
+    \stylemethod {color} {color} {enumeration} {predefined} {color-attached-method}
+    \target color-attached-method
+    This attached method returns the color value of the specified \l {pre-defined colors}
+    {pre-defined color}.
+
+    \qml
+    import QtQuick 2.0
+    import QtQuick.Controls.Universal 2.0
+
+    Rectangle {
+        color: Universal.color(Universal.Red)
+    }
+    \endqml
+
+    \endstylemethod
+
     \section1 Related Information
 
     \list
diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml
index c541e221..f64ca168 100644
--- a/src/imports/controls/material/CheckIndicator.qml
+++ b/src/imports/controls/material/CheckIndicator.qml
@@ -42,7 +42,7 @@ Rectangle {
     implicitWidth: 18
     implicitHeight: 18
     color: "transparent"
-    border.color: control.checked ? control.Material.accentColor : control.Material.secondaryTextColor
+    border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor
     border.width: control.checked ? width / 2 : 2
     radius: 2
 
@@ -81,15 +81,31 @@ Rectangle {
         source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/check.png"
         fillMode: Image.PreserveAspectFit
 
-        scale: control.checked ? 1 : 0
+        scale: control.checkState === Qt.Checked ? 1 : 0
         Behavior on scale { NumberAnimation { duration: 100 } }
     }
 
-    states: State {
-        name: "checked"
-        when: control.checked
+    Rectangle {
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+        width: 12
+        height: 3
+
+        scale: control.checkState === Qt.PartiallyChecked ? 1 : 0
+        Behavior on scale { NumberAnimation { duration: 100 } }
     }
 
+    states: [
+        State {
+            name: "checked"
+            when: control.checkState === Qt.Checked
+        },
+        State {
+            name: "partiallychecked"
+            when: control.checkState === Qt.PartiallyChecked
+        }
+    ]
+
     transitions: Transition {
         SequentialAnimation {
             NumberAnimation {
diff --git a/src/imports/controls/material/ElevationEffect.qml b/src/imports/controls/material/ElevationEffect.qml
index 93a32f83..4ee4369c 100644
--- a/src/imports/controls/material/ElevationEffect.qml
+++ b/src/imports/controls/material/ElevationEffect.qml
@@ -215,7 +215,7 @@ Item {
 
        The current shadow based on the elevation.
      */
-    readonly property var _shadow: _shadows[elevation]
+    readonly property var _shadow: _shadows[Math.max(0, Math.min(elevation, _shadows.length - 1))]
 
     // Nest the shadows and source view in two items rendered as a layer
     // so the shadow is not clipped by the bounds of the source view
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index e007013b..567fbfe5 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -126,14 +126,14 @@ T.SpinBox {
             y: (parent.height - height) / 2
             width: Math.min(parent.width / 3, parent.width / 3)
             height: 2
-            color: control.Material.primaryTextColor
+            color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
         }
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: 2
             height: Math.min(parent.width / 3, parent.width / 3)
-            color: control.Material.primaryTextColor
+            color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
         }
     }
     //! [up.indicator]
@@ -156,7 +156,7 @@ T.SpinBox {
             y: (parent.height - height) / 2
             width: parent.width / 3
             height: 2
-            color: control.Material.primaryTextColor
+            color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
         }
     }
     //! [down.indicator]
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 8ad1ba66..76d81e5f 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -415,6 +415,8 @@ static const QRgb switchDisabledTrackColorLight = 0x1E000000;
 static const QRgb switchDisabledTrackColorDark = 0x19FFFFFF;
 static const QRgb checkBoxUncheckedRippleColorLight = 0x10000000;
 static const QRgb checkBoxUncheckedRippleColorDark = 0x20FFFFFF;
+static const QRgb spinBoxDisabledIconColorLight = 0xFFCCCCCC;
+static const QRgb spinBoxDisabledIconColorDark = 0xFF666666;
 
 static QColor alphaBlend(const QColor &bg, const QColor &fg)
 {
@@ -574,7 +576,10 @@ void QQuickMaterialStyle::resetPrimary()
     m_customPrimary = false;
     m_explicitPrimary = false;
     QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
-    inheritPrimary(material ? material->m_primary : defaultPrimary, true);
+    if (material)
+        inheritPrimary(material->m_primary, material->m_customPrimary);
+    else
+        inheritPrimary(defaultPrimary, false);
 }
 
 QVariant QQuickMaterialStyle::accent() const
@@ -630,7 +635,10 @@ void QQuickMaterialStyle::resetAccent()
     m_customAccent = false;
     m_explicitAccent = false;
     QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
-    inheritAccent(material ? material->m_accent : defaultAccent, true);
+    if (material)
+        inheritAccent(material->m_accent, material->m_customAccent);
+    else
+        inheritAccent(defaultAccent, false);
 }
 
 QVariant QQuickMaterialStyle::foreground() const
@@ -1073,6 +1081,11 @@ QColor QQuickMaterialStyle::toolTextColor() const
     return primaryTextColor();
 }
 
+QColor QQuickMaterialStyle::spinBoxDisabledIconColor() const
+{
+    return QColor::fromRgba(m_theme == Light ? spinBoxDisabledIconColorLight : spinBoxDisabledIconColorDark);
+}
+
 QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const
 {
     int count = sizeof(colors) / sizeof(colors[0]);
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 2686d14b..59858a5e 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -104,6 +104,7 @@ class QQuickMaterialStyle : public QQuickStyleAttached
     Q_PROPERTY(QColor listHighlightColor READ listHighlightColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor tooltipColor READ tooltipColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor toolTextColor READ toolTextColor NOTIFY paletteChanged FINAL)
+    Q_PROPERTY(QColor spinBoxDisabledIconColor READ spinBoxDisabledIconColor NOTIFY paletteChanged FINAL)
 
 public:
     enum Theme {
@@ -232,6 +233,7 @@ public:
     QColor listHighlightColor() const;
     QColor tooltipColor() const;
     QColor toolTextColor() const;
+    QColor spinBoxDisabledIconColor() const;
 
     Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const;
     Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const;
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index eab2a899..d243cef3 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -4,14 +4,82 @@ 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'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.0 -merge ..\templates\plugins.qmltypes -dependencies dep.json'
 
 Module {
-    dependencies: [
-        "QtQuick 2.6",
-        "QtQuick.Templates 2.0",
-        "QtQuick.Window 2.2"
-    ]
+    dependencies: ["QtQuick.Templates 2.0", "QtQuick.Window 2.2"]
+    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" }
+        }
+    }
     Component {
         name: "QQuickBusyIndicatorRing"
         defaultProperty: "data"
@@ -51,6 +119,24 @@ Module {
         Property { name: "color"; type: "QColor" }
     }
     Component {
+        name: "QQuickPaintedItem"
+        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" }
+    }
+    Component {
         name: "QQuickProgressStrip"
         defaultProperty: "data"
         prototype: "QQuickItem"
@@ -100,13 +186,17 @@ Module {
         defaultProperty: "data"
     }
     Component {
-        prototype: "QQuickRectangle"
+        prototype: "QQuickItem"
         name: "QtQuick.Controls.impl/CheckIndicator 2.0"
         exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         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"
@@ -237,13 +327,17 @@ Module {
         defaultProperty: "data"
     }
     Component {
-        prototype: "QQuickRectangle"
+        prototype: "QQuickItem"
         name: "QtQuick.Controls.impl/RadioIndicator 2.0"
         exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         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"
@@ -398,4 +492,1749 @@ Module {
         isComposite: true
         defaultProperty: "data"
     }
+    Component {
+        name: "QQuickAbstractButton"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/AbstractButton 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "text"; type: "string" }
+        Property { name: "down"; type: "bool" }
+        Property { name: "pressed"; type: "bool"; isReadonly: true }
+        Property { name: "checked"; type: "bool" }
+        Property { name: "autoExclusive"; type: "bool" }
+        Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+        Signal { name: "pressed" }
+        Signal { name: "released" }
+        Signal { name: "canceled" }
+        Signal { name: "clicked" }
+        Signal { name: "pressAndHold" }
+        Signal { name: "doubleClicked" }
+        Method { name: "toggle" }
+    }
+    Component {
+        name: "QQuickApplicationWindow"
+        defaultProperty: "data"
+        prototype: "QQuickWindowQmlImpl"
+        exports: ["QtQuick.Templates/ApplicationWindow 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickApplicationWindowAttached"
+        Property { name: "background"; type: "QQuickItem"; isPointer: true }
+        Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "header"; type: "QQuickItem"; isPointer: true }
+        Property { name: "footer"; type: "QQuickItem"; isPointer: true }
+        Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true }
+        Property { name: "font"; type: "QFont" }
+        Property { name: "locale"; type: "QLocale" }
+    }
+    Component {
+        name: "QQuickApplicationWindowAttached"
+        prototype: "QObject"
+        Property { name: "window"; type: "QQuickApplicationWindow"; isReadonly: true; isPointer: true }
+        Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        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 }
+    }
+    Component {
+        name: "QQuickBusyIndicator"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/BusyIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "running"; type: "bool" }
+    }
+    Component {
+        name: "QQuickButton"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        exports: ["QtQuick.Templates/Button 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "checkable"; type: "bool" }
+        Property { name: "autoRepeat"; type: "bool" }
+        Property { name: "highlighted"; type: "bool" }
+        Property { name: "flat"; type: "bool" }
+    }
+    Component {
+        name: "QQuickCheckBox"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        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" }
+    }
+    Component {
+        name: "QQuickComboBox"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/ComboBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "model"; type: "QVariant" }
+        Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true }
+        Property { name: "pressed"; type: "bool" }
+        Property { name: "highlightedIndex"; type: "int"; isReadonly: true }
+        Property { name: "currentIndex"; type: "int" }
+        Property { name: "currentText"; type: "string"; isReadonly: true }
+        Property { name: "displayText"; type: "string" }
+        Property { name: "textRole"; type: "string" }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+        Property { name: "popup"; type: "QQuickPopup"; isPointer: true }
+        Signal {
+            name: "activated"
+            Parameter { name: "index"; type: "int" }
+        }
+        Signal {
+            name: "highlighted"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method { name: "incrementCurrentIndex" }
+        Method { name: "decrementCurrentIndex" }
+        Method {
+            name: "textAt"
+            type: "string"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "find"
+            type: "int"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "flags"; type: "Qt::MatchFlags" }
+        }
+        Method {
+            name: "find"
+            type: "int"
+            Parameter { name: "text"; type: "string" }
+        }
+    }
+    Component {
+        name: "QQuickContainer"
+        defaultProperty: "contentData"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/Container 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "currentIndex"; type: "int" }
+        Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Method {
+            name: "setCurrentIndex"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "itemAt"
+            type: "QQuickItem*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "addItem"
+            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+        }
+        Method {
+            name: "insertItem"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+        }
+        Method {
+            name: "moveItem"
+            Parameter { name: "from"; type: "int" }
+            Parameter { name: "to"; type: "int" }
+        }
+        Method {
+            name: "removeItem"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "QQuickControl"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        exports: ["QtQuick.Templates/Control 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "font"; type: "QFont" }
+        Property { name: "availableWidth"; type: "double"; isReadonly: true }
+        Property { name: "availableHeight"; type: "double"; isReadonly: true }
+        Property { name: "padding"; type: "double" }
+        Property { name: "topPadding"; type: "double" }
+        Property { name: "leftPadding"; type: "double" }
+        Property { name: "rightPadding"; type: "double" }
+        Property { name: "bottomPadding"; type: "double" }
+        Property { name: "spacing"; type: "double" }
+        Property { name: "locale"; type: "QLocale" }
+        Property { name: "mirrored"; type: "bool"; isReadonly: true }
+        Property { name: "focusPolicy"; type: "Qt::FocusPolicy" }
+        Property { name: "focusReason"; type: "Qt::FocusReason" }
+        Property { name: "visualFocus"; type: "bool"; isReadonly: true }
+        Property { name: "hovered"; type: "bool"; isReadonly: true }
+        Property { name: "hoverEnabled"; type: "bool" }
+        Property { name: "wheelEnabled"; type: "bool" }
+        Property { name: "background"; type: "QQuickItem"; isPointer: true }
+        Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        name: "QQuickDial"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/Dial 2.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "SnapMode"
+            values: {
+                "NoSnap": 0,
+                "SnapAlways": 1,
+                "SnapOnRelease": 2
+            }
+        }
+        Property { name: "from"; type: "double" }
+        Property { name: "to"; type: "double" }
+        Property { name: "value"; type: "double" }
+        Property { name: "position"; type: "double"; isReadonly: true }
+        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" }
+        Method { name: "decrease" }
+    }
+    Component {
+        name: "QQuickDrawer"
+        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: "dragMargin"; type: "double" }
+    }
+    Component {
+        name: "QQuickFrame"
+        defaultProperty: "contentData"
+        prototype: "QQuickPane"
+        exports: ["QtQuick.Templates/Frame 2.0"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQuickGroupBox"
+        defaultProperty: "contentData"
+        prototype: "QQuickFrame"
+        exports: ["QtQuick.Templates/GroupBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "title"; type: "string" }
+        Property { name: "label"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        name: "QQuickImplicitSizeItem"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Property { name: "implicitWidth"; type: "double"; isReadonly: true }
+        Property { name: "implicitHeight"; type: "double"; isReadonly: true }
+        Signal { name: "implicitWidthChanged2"; revision: 1 }
+        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: ["QtQuick.Templates/ItemDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "highlighted"; type: "bool" }
+    }
+    Component {
+        name: "QQuickLabel"
+        defaultProperty: "data"
+        prototype: "QQuickText"
+        exports: ["QtQuick.Templates/Label 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "font"; type: "QFont" }
+        Property { name: "background"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        name: "QQuickMenu"
+        defaultProperty: "contentData"
+        prototype: "QQuickPopup"
+        exports: ["QtQuick.Templates/Menu 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "title"; type: "string" }
+        Method {
+            name: "itemAt"
+            type: "QQuickItem*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "addItem"
+            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+        }
+        Method {
+            name: "insertItem"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+        }
+        Method {
+            name: "moveItem"
+            Parameter { name: "from"; type: "int" }
+            Parameter { name: "to"; type: "int" }
+        }
+        Method {
+            name: "removeItem"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "QQuickMenuItem"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        exports: ["QtQuick.Templates/MenuItem 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "checkable"; type: "bool" }
+        Property { name: "highlighted"; type: "bool" }
+        Signal { name: "triggered" }
+    }
+    Component {
+        name: "QQuickOverlay"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Property { name: "modal"; type: "QQuickItem"; isPointer: true }
+        Property { name: "modeless"; type: "QQuickItem"; isPointer: true }
+        Signal { name: "pressed" }
+        Signal { name: "released" }
+    }
+    Component {
+        name: "QQuickPage"
+        defaultProperty: "contentData"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/Page 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "title"; type: "string" }
+        Property { name: "header"; type: "QQuickItem"; isPointer: true }
+        Property { name: "footer"; type: "QQuickItem"; isPointer: true }
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+    }
+    Component {
+        name: "QQuickPageIndicator"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/PageIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int" }
+        Property { name: "currentIndex"; type: "int" }
+        Property { name: "interactive"; type: "bool" }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+    }
+    Component {
+        name: "QQuickPane"
+        defaultProperty: "contentData"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/Pane 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "contentWidth"; type: "double" }
+        Property { name: "contentHeight"; type: "double" }
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+    }
+    Component {
+        name: "QQuickPopup"
+        defaultProperty: "contentData"
+        prototype: "QObject"
+        exports: ["QtQuick.Templates/Popup 2.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "ClosePolicy"
+            values: {
+                "NoAutoClose": 0,
+                "CloseOnPressOutside": 1,
+                "CloseOnPressOutsideParent": 2,
+                "CloseOnReleaseOutside": 4,
+                "CloseOnReleaseOutsideParent": 8,
+                "CloseOnEscape": 16
+            }
+        }
+        Enum {
+            name: "TransformOrigin"
+            values: {
+                "TopLeft": 0,
+                "Top": 1,
+                "TopRight": 2,
+                "Left": 3,
+                "Center": 4,
+                "Right": 5,
+                "BottomLeft": 6,
+                "Bottom": 7,
+                "BottomRight": 8
+            }
+        }
+        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: "implicitWidth"; type: "double" }
+        Property { name: "implicitHeight"; type: "double" }
+        Property { name: "contentWidth"; type: "double" }
+        Property { name: "contentHeight"; type: "double" }
+        Property { name: "availableWidth"; type: "double"; isReadonly: true }
+        Property { name: "availableHeight"; type: "double"; isReadonly: true }
+        Property { name: "margins"; type: "double" }
+        Property { name: "topMargin"; type: "double" }
+        Property { name: "leftMargin"; type: "double" }
+        Property { name: "rightMargin"; type: "double" }
+        Property { name: "bottomMargin"; type: "double" }
+        Property { name: "padding"; type: "double" }
+        Property { name: "topPadding"; type: "double" }
+        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 }
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "clip"; type: "bool" }
+        Property { name: "focus"; type: "bool" }
+        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+        Property { name: "modal"; type: "bool" }
+        Property { name: "dim"; type: "bool" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "opacity"; type: "double" }
+        Property { name: "scale"; type: "double" }
+        Property { name: "closePolicy"; type: "ClosePolicy" }
+        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" }
+    }
+    Component {
+        name: "QQuickProgressBar"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/ProgressBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "from"; type: "double" }
+        Property { name: "to"; type: "double" }
+        Property { name: "value"; type: "double" }
+        Property { name: "position"; type: "double"; isReadonly: true }
+        Property { name: "visualPosition"; type: "double"; isReadonly: true }
+        Property { name: "indeterminate"; type: "bool" }
+    }
+    Component {
+        name: "QQuickRadioButton"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        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: ["QtQuick.Templates/RangeSlider 2.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "SnapMode"
+            values: {
+                "NoSnap": 0,
+                "SnapAlways": 1,
+                "SnapOnRelease": 2
+            }
+        }
+        Property { name: "from"; type: "double" }
+        Property { name: "to"; type: "double" }
+        Property { name: "first"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true }
+        Property { name: "second"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true }
+        Property { name: "stepSize"; type: "double" }
+        Property { name: "snapMode"; type: "SnapMode" }
+        Property { name: "orientation"; type: "Qt::Orientation" }
+        Method {
+            name: "setValues"
+            Parameter { name: "firstValue"; type: "double" }
+            Parameter { name: "secondValue"; type: "double" }
+        }
+    }
+    Component {
+        name: "QQuickRangeSliderNode"
+        prototype: "QObject"
+        Property { name: "value"; type: "double" }
+        Property { name: "position"; type: "double"; isReadonly: true }
+        Property { name: "visualPosition"; type: "double"; isReadonly: true }
+        Property { name: "handle"; type: "QQuickItem"; isPointer: true }
+        Property { name: "pressed"; type: "bool" }
+        Method { name: "increase" }
+        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: ["QtQuick.Templates/ScrollBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickScrollBarAttached"
+        Property { name: "size"; type: "double" }
+        Property { name: "position"; type: "double" }
+        Property { name: "stepSize"; type: "double" }
+        Property { name: "active"; type: "bool" }
+        Property { name: "pressed"; type: "bool" }
+        Property { name: "orientation"; type: "Qt::Orientation" }
+        Method { name: "increase" }
+        Method { name: "decrease" }
+        Method {
+            name: "setSize"
+            Parameter { name: "size"; type: "double" }
+        }
+        Method {
+            name: "setPosition"
+            Parameter { name: "position"; type: "double" }
+        }
+    }
+    Component {
+        name: "QQuickScrollBarAttached"
+        prototype: "QObject"
+        Property { name: "horizontal"; type: "QQuickScrollBar"; isPointer: true }
+        Property { name: "vertical"; type: "QQuickScrollBar"; isPointer: true }
+    }
+    Component {
+        name: "QQuickScrollIndicator"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/ScrollIndicator 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickScrollIndicatorAttached"
+        Property { name: "size"; type: "double" }
+        Property { name: "position"; type: "double" }
+        Property { name: "active"; type: "bool" }
+        Property { name: "orientation"; type: "Qt::Orientation" }
+        Method {
+            name: "setSize"
+            Parameter { name: "size"; type: "double" }
+        }
+        Method {
+            name: "setPosition"
+            Parameter { name: "position"; type: "double" }
+        }
+    }
+    Component {
+        name: "QQuickScrollIndicatorAttached"
+        prototype: "QObject"
+        Property { name: "horizontal"; type: "QQuickScrollIndicator"; isPointer: true }
+        Property { name: "vertical"; type: "QQuickScrollIndicator"; isPointer: true }
+    }
+    Component {
+        name: "QQuickSlider"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/Slider 2.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "SnapMode"
+            values: {
+                "NoSnap": 0,
+                "SnapAlways": 1,
+                "SnapOnRelease": 2
+            }
+        }
+        Property { name: "from"; type: "double" }
+        Property { name: "to"; type: "double" }
+        Property { name: "value"; type: "double" }
+        Property { name: "position"; type: "double"; isReadonly: true }
+        Property { name: "visualPosition"; type: "double"; isReadonly: true }
+        Property { name: "stepSize"; type: "double" }
+        Property { name: "snapMode"; type: "SnapMode" }
+        Property { name: "pressed"; type: "bool" }
+        Property { name: "orientation"; type: "Qt::Orientation" }
+        Property { name: "handle"; type: "QQuickItem"; isPointer: true }
+        Method { name: "increase" }
+        Method { name: "decrease" }
+    }
+    Component {
+        name: "QQuickSpinBox"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/SpinBox 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "from"; type: "int" }
+        Property { name: "to"; type: "int" }
+        Property { name: "value"; type: "int" }
+        Property { name: "stepSize"; type: "int" }
+        Property { name: "editable"; type: "bool" }
+        Property { name: "validator"; type: "QValidator"; isPointer: true }
+        Property { name: "textFromValue"; type: "QJSValue" }
+        Property { name: "valueFromText"; type: "QJSValue" }
+        Property { name: "up"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true }
+        Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true }
+        Method { name: "increase" }
+        Method { name: "decrease" }
+    }
+    Component {
+        name: "QQuickSpinButton"
+        prototype: "QObject"
+        Property { name: "pressed"; type: "bool" }
+        Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
+        name: "QQuickStackAttached"
+        prototype: "QObject"
+        Property { name: "index"; type: "int"; isReadonly: true }
+        Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true }
+        Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true }
+    }
+    Component {
+        name: "QQuickStackView"
+        defaultProperty: "data"
+        prototype: "QQuickControl"
+        exports: ["QtQuick.Templates/StackView 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickStackAttached"
+        Enum {
+            name: "Status"
+            values: {
+                "Inactive": 0,
+                "Deactivating": 1,
+                "Activating": 2,
+                "Active": 3
+            }
+        }
+        Enum {
+            name: "LoadBehavior"
+            values: {
+                "DontLoad": 0,
+                "ForceLoad": 1
+            }
+        }
+        Enum {
+            name: "Operation"
+            values: {
+                "Transition": 0,
+                "Immediate": 1
+            }
+        }
+        Property { name: "busy"; type: "bool"; isReadonly: true }
+        Property { name: "depth"; type: "int"; isReadonly: true }
+        Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "initialItem"; type: "QVariant" }
+        Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true }
+        Property { name: "popExit"; type: "QQuickTransition"; isPointer: true }
+        Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true }
+        Property { name: "pushExit"; type: "QQuickTransition"; isPointer: true }
+        Property { name: "replaceEnter"; type: "QQuickTransition"; isPointer: true }
+        Property { name: "replaceExit"; type: "QQuickTransition"; isPointer: true }
+        Method { name: "clear" }
+        Method {
+            name: "get"
+            type: "QQuickItem*"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "behavior"; type: "LoadBehavior" }
+        }
+        Method {
+            name: "get"
+            type: "QQuickItem*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "find"
+            type: "QQuickItem*"
+            Parameter { name: "callback"; type: "QJSValue" }
+            Parameter { name: "behavior"; type: "LoadBehavior" }
+        }
+        Method {
+            name: "find"
+            type: "QQuickItem*"
+            Parameter { name: "callback"; type: "QJSValue" }
+        }
+        Method {
+            name: "push"
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "pop"
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "replace"
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QQuickSwipe"
+        prototype: "QObject"
+        Property { name: "position"; type: "double"; isReadonly: true }
+        Property { name: "complete"; 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: "QQuickSwipeDelegate"
+        defaultProperty: "data"
+        prototype: "QQuickItemDelegate"
+        exports: ["QtQuick.Templates/SwipeDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "swipe"; type: "QQuickSwipe"; isReadonly: true; isPointer: true }
+    }
+    Component {
+        name: "QQuickSwipeView"
+        defaultProperty: "contentData"
+        prototype: "QQuickContainer"
+        exports: ["QtQuick.Templates/SwipeView 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickSwipeViewAttached"
+    }
+    Component {
+        name: "QQuickSwipeViewAttached"
+        prototype: "QObject"
+        Property { name: "index"; type: "int"; isReadonly: true }
+        Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
+        Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true }
+    }
+    Component {
+        name: "QQuickSwitch"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        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 }
+    }
+    Component {
+        name: "QQuickTabBar"
+        defaultProperty: "contentData"
+        prototype: "QQuickContainer"
+        exports: ["QtQuick.Templates/TabBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Position"
+            values: {
+                "Header": 0,
+                "Footer": 1
+            }
+        }
+        Property { name: "position"; type: "Position" }
+    }
+    Component {
+        name: "QQuickTabButton"
+        defaultProperty: "data"
+        prototype: "QQuickAbstractButton"
+        exports: ["QtQuick.Templates/TabButton 2.0"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQuickText"
+        defaultProperty: "data"
+        prototype: "QQuickImplicitSizeItem"
+        Enum {
+            name: "HAlignment"
+            values: {
+                "AlignLeft": 1,
+                "AlignRight": 2,
+                "AlignHCenter": 4,
+                "AlignJustify": 8
+            }
+        }
+        Enum {
+            name: "VAlignment"
+            values: {
+                "AlignTop": 32,
+                "AlignBottom": 64,
+                "AlignVCenter": 128
+            }
+        }
+        Enum {
+            name: "TextStyle"
+            values: {
+                "Normal": 0,
+                "Outline": 1,
+                "Raised": 2,
+                "Sunken": 3
+            }
+        }
+        Enum {
+            name: "TextFormat"
+            values: {
+                "PlainText": 0,
+                "RichText": 1,
+                "AutoText": 2,
+                "StyledText": 4
+            }
+        }
+        Enum {
+            name: "TextElideMode"
+            values: {
+                "ElideLeft": 0,
+                "ElideRight": 1,
+                "ElideMiddle": 2,
+                "ElideNone": 3
+            }
+        }
+        Enum {
+            name: "WrapMode"
+            values: {
+                "NoWrap": 0,
+                "WordWrap": 1,
+                "WrapAnywhere": 3,
+                "WrapAtWordBoundaryOrAnywhere": 4,
+                "Wrap": 4
+            }
+        }
+        Enum {
+            name: "RenderType"
+            values: {
+                "QtRendering": 0,
+                "NativeRendering": 1
+            }
+        }
+        Enum {
+            name: "LineHeightMode"
+            values: {
+                "ProportionalHeight": 0,
+                "FixedHeight": 1
+            }
+        }
+        Enum {
+            name: "FontSizeMode"
+            values: {
+                "FixedSize": 0,
+                "HorizontalFit": 1,
+                "VerticalFit": 2,
+                "Fit": 3
+            }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "font"; type: "QFont" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "linkColor"; type: "QColor" }
+        Property { name: "style"; type: "TextStyle" }
+        Property { name: "styleColor"; type: "QColor" }
+        Property { name: "horizontalAlignment"; type: "HAlignment" }
+        Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
+        Property { name: "verticalAlignment"; type: "VAlignment" }
+        Property { name: "wrapMode"; type: "WrapMode" }
+        Property { name: "lineCount"; type: "int"; isReadonly: true }
+        Property { name: "truncated"; type: "bool"; isReadonly: true }
+        Property { name: "maximumLineCount"; type: "int" }
+        Property { name: "textFormat"; type: "TextFormat" }
+        Property { name: "elide"; type: "TextElideMode" }
+        Property { name: "contentWidth"; type: "double"; isReadonly: true }
+        Property { name: "contentHeight"; type: "double"; isReadonly: true }
+        Property { name: "paintedWidth"; type: "double"; isReadonly: true }
+        Property { name: "paintedHeight"; type: "double"; isReadonly: true }
+        Property { name: "lineHeight"; type: "double" }
+        Property { name: "lineHeightMode"; type: "LineHeightMode" }
+        Property { name: "baseUrl"; type: "QUrl" }
+        Property { name: "minimumPixelSize"; type: "int" }
+        Property { name: "minimumPointSize"; type: "int" }
+        Property { name: "fontSizeMode"; type: "FontSizeMode" }
+        Property { name: "renderType"; type: "RenderType" }
+        Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
+        Property { name: "padding"; revision: 6; type: "double" }
+        Property { name: "topPadding"; revision: 6; type: "double" }
+        Property { name: "leftPadding"; revision: 6; type: "double" }
+        Property { name: "rightPadding"; revision: 6; type: "double" }
+        Property { name: "bottomPadding"; revision: 6; type: "double" }
+        Signal {
+            name: "textChanged"
+            Parameter { name: "text"; type: "string" }
+        }
+        Signal {
+            name: "linkActivated"
+            Parameter { name: "link"; type: "string" }
+        }
+        Signal {
+            name: "linkHovered"
+            revision: 2
+            Parameter { name: "link"; type: "string" }
+        }
+        Signal {
+            name: "fontChanged"
+            Parameter { name: "font"; type: "QFont" }
+        }
+        Signal {
+            name: "styleChanged"
+            Parameter { name: "style"; type: "QQuickText::TextStyle" }
+        }
+        Signal {
+            name: "horizontalAlignmentChanged"
+            Parameter { name: "alignment"; type: "QQuickText::HAlignment" }
+        }
+        Signal {
+            name: "verticalAlignmentChanged"
+            Parameter { name: "alignment"; type: "QQuickText::VAlignment" }
+        }
+        Signal {
+            name: "textFormatChanged"
+            Parameter { name: "textFormat"; type: "QQuickText::TextFormat" }
+        }
+        Signal {
+            name: "elideModeChanged"
+            Parameter { name: "mode"; type: "QQuickText::TextElideMode" }
+        }
+        Signal { name: "contentSizeChanged" }
+        Signal {
+            name: "lineHeightChanged"
+            Parameter { name: "lineHeight"; type: "double" }
+        }
+        Signal {
+            name: "lineHeightModeChanged"
+            Parameter { name: "mode"; type: "LineHeightMode" }
+        }
+        Signal {
+            name: "lineLaidOut"
+            Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true }
+        }
+        Signal { name: "paddingChanged"; revision: 6 }
+        Signal { name: "topPaddingChanged"; revision: 6 }
+        Signal { name: "leftPaddingChanged"; revision: 6 }
+        Signal { name: "rightPaddingChanged"; revision: 6 }
+        Signal { name: "bottomPaddingChanged"; revision: 6 }
+        Method { name: "doLayout" }
+        Method {
+            name: "linkAt"
+            revision: 3
+            type: "string"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+    }
+    Component {
+        name: "QQuickTextArea"
+        defaultProperty: "data"
+        prototype: "QQuickTextEdit"
+        exports: ["QtQuick.Templates/TextArea 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickTextAreaAttached"
+        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" }
+        Signal { name: "implicitWidthChanged3" }
+        Signal { name: "implicitHeightChanged3" }
+        Signal {
+            name: "pressAndHold"
+            Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QQuickTextAreaAttached"
+        prototype: "QObject"
+        Property { name: "flickable"; type: "QQuickTextArea"; isPointer: true }
+    }
+    Component {
+        name: "QQuickTextEdit"
+        defaultProperty: "data"
+        prototype: "QQuickImplicitSizeItem"
+        Enum {
+            name: "HAlignment"
+            values: {
+                "AlignLeft": 1,
+                "AlignRight": 2,
+                "AlignHCenter": 4,
+                "AlignJustify": 8
+            }
+        }
+        Enum {
+            name: "VAlignment"
+            values: {
+                "AlignTop": 32,
+                "AlignBottom": 64,
+                "AlignVCenter": 128
+            }
+        }
+        Enum {
+            name: "TextFormat"
+            values: {
+                "PlainText": 0,
+                "RichText": 1,
+                "AutoText": 2
+            }
+        }
+        Enum {
+            name: "WrapMode"
+            values: {
+                "NoWrap": 0,
+                "WordWrap": 1,
+                "WrapAnywhere": 3,
+                "WrapAtWordBoundaryOrAnywhere": 4,
+                "Wrap": 4
+            }
+        }
+        Enum {
+            name: "SelectionMode"
+            values: {
+                "SelectCharacters": 0,
+                "SelectWords": 1
+            }
+        }
+        Enum {
+            name: "RenderType"
+            values: {
+                "QtRendering": 0,
+                "NativeRendering": 1
+            }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "selectionColor"; type: "QColor" }
+        Property { name: "selectedTextColor"; type: "QColor" }
+        Property { name: "font"; type: "QFont" }
+        Property { name: "horizontalAlignment"; type: "HAlignment" }
+        Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
+        Property { name: "verticalAlignment"; type: "VAlignment" }
+        Property { name: "wrapMode"; type: "WrapMode" }
+        Property { name: "lineCount"; type: "int"; isReadonly: true }
+        Property { name: "length"; type: "int"; isReadonly: true }
+        Property { name: "contentWidth"; type: "double"; isReadonly: true }
+        Property { name: "contentHeight"; type: "double"; isReadonly: true }
+        Property { name: "paintedWidth"; type: "double"; isReadonly: true }
+        Property { name: "paintedHeight"; type: "double"; isReadonly: true }
+        Property { name: "textFormat"; type: "TextFormat" }
+        Property { name: "readOnly"; type: "bool" }
+        Property { name: "cursorVisible"; type: "bool" }
+        Property { name: "cursorPosition"; type: "int" }
+        Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
+        Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "selectionStart"; type: "int"; isReadonly: true }
+        Property { name: "selectionEnd"; type: "int"; isReadonly: true }
+        Property { name: "selectedText"; type: "string"; isReadonly: true }
+        Property { name: "activeFocusOnPress"; type: "bool" }
+        Property { name: "persistentSelection"; type: "bool" }
+        Property { name: "textMargin"; type: "double" }
+        Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
+        Property { name: "selectByKeyboard"; revision: 1; type: "bool" }
+        Property { name: "selectByMouse"; type: "bool" }
+        Property { name: "mouseSelectionMode"; type: "SelectionMode" }
+        Property { name: "canPaste"; type: "bool"; isReadonly: true }
+        Property { name: "canUndo"; type: "bool"; isReadonly: true }
+        Property { name: "canRedo"; type: "bool"; isReadonly: true }
+        Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
+        Property { name: "baseUrl"; type: "QUrl" }
+        Property { name: "renderType"; type: "RenderType" }
+        Property {
+            name: "textDocument"
+            revision: 1
+            type: "QQuickTextDocument"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
+        Property { name: "padding"; revision: 6; type: "double" }
+        Property { name: "topPadding"; revision: 6; type: "double" }
+        Property { name: "leftPadding"; revision: 6; type: "double" }
+        Property { name: "rightPadding"; revision: 6; type: "double" }
+        Property { name: "bottomPadding"; revision: 6; type: "double" }
+        Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
+        Signal { name: "preeditTextChanged"; revision: 7 }
+        Signal { name: "contentSizeChanged" }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "selectionColorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "selectedTextColorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "fontChanged"
+            Parameter { name: "font"; type: "QFont" }
+        }
+        Signal {
+            name: "horizontalAlignmentChanged"
+            Parameter { name: "alignment"; type: "QQuickTextEdit::HAlignment" }
+        }
+        Signal {
+            name: "verticalAlignmentChanged"
+            Parameter { name: "alignment"; type: "QQuickTextEdit::VAlignment" }
+        }
+        Signal {
+            name: "textFormatChanged"
+            Parameter { name: "textFormat"; type: "QQuickTextEdit::TextFormat" }
+        }
+        Signal {
+            name: "readOnlyChanged"
+            Parameter { name: "isReadOnly"; type: "bool" }
+        }
+        Signal {
+            name: "cursorVisibleChanged"
+            Parameter { name: "isCursorVisible"; type: "bool" }
+        }
+        Signal {
+            name: "activeFocusOnPressChanged"
+            Parameter { name: "activeFocusOnPressed"; type: "bool" }
+        }
+        Signal {
+            name: "persistentSelectionChanged"
+            Parameter { name: "isPersistentSelection"; type: "bool" }
+        }
+        Signal {
+            name: "textMarginChanged"
+            Parameter { name: "textMargin"; type: "double" }
+        }
+        Signal {
+            name: "selectByKeyboardChanged"
+            revision: 1
+            Parameter { name: "selectByKeyboard"; type: "bool" }
+        }
+        Signal {
+            name: "selectByMouseChanged"
+            Parameter { name: "selectByMouse"; type: "bool" }
+        }
+        Signal {
+            name: "mouseSelectionModeChanged"
+            Parameter { name: "mode"; type: "QQuickTextEdit::SelectionMode" }
+        }
+        Signal {
+            name: "linkActivated"
+            Parameter { name: "link"; type: "string" }
+        }
+        Signal {
+            name: "linkHovered"
+            revision: 2
+            Parameter { name: "link"; type: "string" }
+        }
+        Signal { name: "editingFinished"; revision: 6 }
+        Signal { name: "paddingChanged"; revision: 6 }
+        Signal { name: "topPaddingChanged"; revision: 6 }
+        Signal { name: "leftPaddingChanged"; revision: 6 }
+        Signal { name: "rightPaddingChanged"; revision: 6 }
+        Signal { name: "bottomPaddingChanged"; revision: 6 }
+        Method { name: "selectAll" }
+        Method { name: "selectWord" }
+        Method {
+            name: "select"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method { name: "deselect" }
+        Method {
+            name: "isRightToLeft"
+            type: "bool"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method { name: "cut" }
+        Method { name: "copy" }
+        Method { name: "paste" }
+        Method { name: "undo" }
+        Method { name: "redo" }
+        Method {
+            name: "insert"
+            Parameter { name: "position"; type: "int" }
+            Parameter { name: "text"; type: "string" }
+        }
+        Method {
+            name: "remove"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method {
+            name: "append"
+            revision: 2
+            Parameter { name: "text"; type: "string" }
+        }
+        Method { name: "clear"; revision: 7 }
+        Method {
+            name: "inputMethodQuery"
+            revision: 4
+            type: "QVariant"
+            Parameter { name: "query"; type: "Qt::InputMethodQuery" }
+            Parameter { name: "argument"; type: "QVariant" }
+        }
+        Method {
+            name: "positionToRectangle"
+            type: "QRectF"
+            Parameter { type: "int" }
+        }
+        Method {
+            name: "positionAt"
+            type: "int"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "moveCursorSelection"
+            Parameter { name: "pos"; type: "int" }
+        }
+        Method {
+            name: "moveCursorSelection"
+            Parameter { name: "pos"; type: "int" }
+            Parameter { name: "mode"; type: "SelectionMode" }
+        }
+        Method {
+            name: "getText"
+            type: "string"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method {
+            name: "getFormattedText"
+            type: "string"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method {
+            name: "linkAt"
+            revision: 3
+            type: "string"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+    }
+    Component {
+        name: "QQuickTextField"
+        defaultProperty: "data"
+        prototype: "QQuickTextInput"
+        exports: ["QtQuick.Templates/TextField 2.0"]
+        exportMetaObjectRevisions: [0]
+        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" }
+        Signal { name: "implicitWidthChanged3" }
+        Signal { name: "implicitHeightChanged3" }
+        Signal {
+            name: "pressAndHold"
+            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QQuickTextInput"
+        defaultProperty: "data"
+        prototype: "QQuickImplicitSizeItem"
+        Enum {
+            name: "EchoMode"
+            values: {
+                "Normal": 0,
+                "NoEcho": 1,
+                "Password": 2,
+                "PasswordEchoOnEdit": 3
+            }
+        }
+        Enum {
+            name: "HAlignment"
+            values: {
+                "AlignLeft": 1,
+                "AlignRight": 2,
+                "AlignHCenter": 4
+            }
+        }
+        Enum {
+            name: "VAlignment"
+            values: {
+                "AlignTop": 32,
+                "AlignBottom": 64,
+                "AlignVCenter": 128
+            }
+        }
+        Enum {
+            name: "WrapMode"
+            values: {
+                "NoWrap": 0,
+                "WordWrap": 1,
+                "WrapAnywhere": 3,
+                "WrapAtWordBoundaryOrAnywhere": 4,
+                "Wrap": 4
+            }
+        }
+        Enum {
+            name: "SelectionMode"
+            values: {
+                "SelectCharacters": 0,
+                "SelectWords": 1
+            }
+        }
+        Enum {
+            name: "CursorPosition"
+            values: {
+                "CursorBetweenCharacters": 0,
+                "CursorOnCharacter": 1
+            }
+        }
+        Enum {
+            name: "RenderType"
+            values: {
+                "QtRendering": 0,
+                "NativeRendering": 1
+            }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "length"; type: "int"; isReadonly: true }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "selectionColor"; type: "QColor" }
+        Property { name: "selectedTextColor"; type: "QColor" }
+        Property { name: "font"; type: "QFont" }
+        Property { name: "horizontalAlignment"; type: "HAlignment" }
+        Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
+        Property { name: "verticalAlignment"; type: "VAlignment" }
+        Property { name: "wrapMode"; type: "WrapMode" }
+        Property { name: "readOnly"; type: "bool" }
+        Property { name: "cursorVisible"; type: "bool" }
+        Property { name: "cursorPosition"; type: "int" }
+        Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
+        Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "selectionStart"; type: "int"; isReadonly: true }
+        Property { name: "selectionEnd"; type: "int"; isReadonly: true }
+        Property { name: "selectedText"; type: "string"; isReadonly: true }
+        Property { name: "maximumLength"; type: "int" }
+        Property { name: "validator"; type: "QValidator"; isPointer: true }
+        Property { name: "inputMask"; type: "string" }
+        Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
+        Property { name: "acceptableInput"; type: "bool"; isReadonly: true }
+        Property { name: "echoMode"; type: "EchoMode" }
+        Property { name: "activeFocusOnPress"; type: "bool" }
+        Property { name: "passwordCharacter"; type: "string" }
+        Property { name: "passwordMaskDelay"; revision: 3; type: "int" }
+        Property { name: "displayText"; type: "string"; isReadonly: true }
+        Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
+        Property { name: "autoScroll"; type: "bool" }
+        Property { name: "selectByMouse"; type: "bool" }
+        Property { name: "mouseSelectionMode"; type: "SelectionMode" }
+        Property { name: "persistentSelection"; type: "bool" }
+        Property { name: "canPaste"; type: "bool"; isReadonly: true }
+        Property { name: "canUndo"; type: "bool"; isReadonly: true }
+        Property { name: "canRedo"; type: "bool"; isReadonly: true }
+        Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
+        Property { name: "contentWidth"; type: "double"; isReadonly: true }
+        Property { name: "contentHeight"; type: "double"; isReadonly: true }
+        Property { name: "renderType"; type: "RenderType" }
+        Property { name: "padding"; revision: 6; type: "double" }
+        Property { name: "topPadding"; revision: 6; type: "double" }
+        Property { name: "leftPadding"; revision: 6; type: "double" }
+        Property { name: "rightPadding"; revision: 6; type: "double" }
+        Property { name: "bottomPadding"; revision: 6; type: "double" }
+        Signal { name: "accepted" }
+        Signal { name: "editingFinished"; revision: 2 }
+        Signal {
+            name: "fontChanged"
+            Parameter { name: "font"; type: "QFont" }
+        }
+        Signal {
+            name: "horizontalAlignmentChanged"
+            Parameter { name: "alignment"; type: "QQuickTextInput::HAlignment" }
+        }
+        Signal {
+            name: "verticalAlignmentChanged"
+            Parameter { name: "alignment"; type: "QQuickTextInput::VAlignment" }
+        }
+        Signal {
+            name: "readOnlyChanged"
+            Parameter { name: "isReadOnly"; type: "bool" }
+        }
+        Signal {
+            name: "cursorVisibleChanged"
+            Parameter { name: "isCursorVisible"; type: "bool" }
+        }
+        Signal {
+            name: "maximumLengthChanged"
+            Parameter { name: "maximumLength"; type: "int" }
+        }
+        Signal {
+            name: "inputMaskChanged"
+            Parameter { name: "inputMask"; type: "string" }
+        }
+        Signal {
+            name: "echoModeChanged"
+            Parameter { name: "echoMode"; type: "QQuickTextInput::EchoMode" }
+        }
+        Signal {
+            name: "passwordMaskDelayChanged"
+            revision: 3
+            Parameter { name: "delay"; type: "int" }
+        }
+        Signal { name: "preeditTextChanged"; revision: 7 }
+        Signal {
+            name: "activeFocusOnPressChanged"
+            Parameter { name: "activeFocusOnPress"; type: "bool" }
+        }
+        Signal {
+            name: "autoScrollChanged"
+            Parameter { name: "autoScroll"; type: "bool" }
+        }
+        Signal {
+            name: "selectByMouseChanged"
+            Parameter { name: "selectByMouse"; type: "bool" }
+        }
+        Signal {
+            name: "mouseSelectionModeChanged"
+            Parameter { name: "mode"; type: "QQuickTextInput::SelectionMode" }
+        }
+        Signal { name: "contentSizeChanged" }
+        Signal { name: "paddingChanged"; revision: 6 }
+        Signal { name: "topPaddingChanged"; revision: 6 }
+        Signal { name: "leftPaddingChanged"; revision: 6 }
+        Signal { name: "rightPaddingChanged"; revision: 6 }
+        Signal { name: "bottomPaddingChanged"; revision: 6 }
+        Method { name: "selectAll" }
+        Method { name: "selectWord" }
+        Method {
+            name: "select"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method { name: "deselect" }
+        Method {
+            name: "isRightToLeft"
+            type: "bool"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method { name: "cut" }
+        Method { name: "copy" }
+        Method { name: "paste" }
+        Method { name: "undo" }
+        Method { name: "redo" }
+        Method {
+            name: "insert"
+            Parameter { name: "position"; type: "int" }
+            Parameter { name: "text"; type: "string" }
+        }
+        Method {
+            name: "remove"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+        Method {
+            name: "ensureVisible"
+            revision: 3
+            Parameter { name: "position"; type: "int" }
+        }
+        Method { name: "clear"; revision: 7 }
+        Method {
+            name: "positionAt"
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "positionToRectangle"
+            type: "QRectF"
+            Parameter { name: "pos"; type: "int" }
+        }
+        Method {
+            name: "moveCursorSelection"
+            Parameter { name: "pos"; type: "int" }
+        }
+        Method {
+            name: "moveCursorSelection"
+            Parameter { name: "pos"; type: "int" }
+            Parameter { name: "mode"; type: "SelectionMode" }
+        }
+        Method {
+            name: "inputMethodQuery"
+            revision: 3
+            type: "QVariant"
+            Parameter { name: "query"; type: "Qt::InputMethodQuery" }
+            Parameter { name: "argument"; type: "QVariant" }
+        }
+        Method {
+            name: "getText"
+            type: "string"
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+        }
+    }
+    Component {
+        name: "QQuickToolBar"
+        defaultProperty: "contentData"
+        prototype: "QQuickFrame"
+        exports: ["QtQuick.Templates/ToolBar 2.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Position"
+            values: {
+                "Header": 0,
+                "Footer": 1
+            }
+        }
+        Property { name: "position"; type: "Position" }
+    }
+    Component {
+        name: "QQuickToolButton"
+        defaultProperty: "data"
+        prototype: "QQuickButton"
+        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: ["QtQuick.Templates/Tumbler 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQuickTumblerAttached"
+        Property { name: "model"; type: "QVariant" }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "currentIndex"; type: "int" }
+        Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "visibleItemCount"; type: "int" }
+    }
+    Component {
+        name: "QQuickTumblerAttached"
+        prototype: "QObject"
+        Property { name: "tumbler"; type: "QQuickTumbler"; isReadonly: true; isPointer: true }
+        Property { name: "displacement"; type: "double"; isReadonly: true }
+    }
 }
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 49fa6954..4654aa01 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -106,8 +106,8 @@ T.SpinBox {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             source: "image://universal/" + (control.mirrored ? "left" : "right") + "arrow/"
-                    + (!control.enabled ? control.Universal.chromeDisabledLowColor :
-                                          control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
+                    + (!enabled ? control.Universal.chromeDisabledLowColor :
+                                  control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
             sourceSize.width: width
             sourceSize.height: height
         }
@@ -134,8 +134,8 @@ T.SpinBox {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             source: "image://universal/" + (control.mirrored ? "right" : "left") + "arrow/"
-                    + (!control.enabled ? control.Universal.chromeDisabledLowColor :
-                                          control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
+                    + (!enabled ? control.Universal.chromeDisabledLowColor :
+                                  control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
             sourceSize.width: width
             sourceSize.height: height
         }
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index c96dd2dc..75a11a6e 100644
--- a/src/imports/templates/plugins.qmltypes
+++ b/src/imports/templates/plugins.qmltypes
@@ -886,18 +886,10 @@ 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"
+        name: "QQuickSwipe"
         prototype: "QObject"
         Property { name: "position"; type: "double"; isReadonly: true }
-        Property { name: "active"; type: "bool"; isReadonly: true }
+        Property { name: "complete"; 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 }
@@ -906,6 +898,14 @@ Module {
         Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
     }
     Component {
+        name: "QQuickSwipeDelegate"
+        defaultProperty: "data"
+        prototype: "QQuickItemDelegate"
+        exports: ["QtQuick.Templates/SwipeDelegate 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "swipe"; type: "QQuickSwipe"; isReadonly: true; isPointer: true }
+    }
+    Component {
         name: "QQuickSwipeView"
         defaultProperty: "contentData"
         prototype: "QQuickContainer"
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 3f05d31e..b0ec18d3 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -40,6 +40,7 @@
 #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
 #include <QtQuickTemplates2/private/qquickbusyindicator_p.h>
 #include <QtQuickTemplates2/private/qquickbutton_p.h>
+#include <QtQuickTemplates2/private/qquickbuttongroup_p.h>
 #include <QtQuickTemplates2/private/qquickcheckbox_p.h>
 #include <QtQuickTemplates2/private/qquickcheckdelegate_p.h>
 #include <QtQuickTemplates2/private/qquickcombobox_p.h>
@@ -111,6 +112,8 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickApplicationWindowAttached>();
     qmlRegisterType<QQuickBusyIndicator>(uri, 2, 0, "BusyIndicator");
     qmlRegisterType<QQuickButton>(uri, 2, 0, "Button");
+    qmlRegisterType<QQuickButtonGroup>(uri, 2, 0, "ButtonGroup");
+    qmlRegisterType<QQuickButtonGroupAttached>();
     qmlRegisterType<QQuickCheckBox>(uri, 2, 0, "CheckBox");
     qmlRegisterType<QQuickCheckDelegate>(uri, 2, 0, "CheckDelegate");
     qmlRegisterType<QQuickComboBox>(uri, 2, 0, "ComboBox");
@@ -135,13 +138,16 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickRangeSlider>(uri, 2, 0, "RangeSlider");
     qmlRegisterType<QQuickRangeSliderNode>();
     qmlRegisterType<QQuickScrollBar>(uri, 2, 0, "ScrollBar");
+    qmlRegisterType<QQuickScrollBarAttached>();
     qmlRegisterType<QQuickScrollIndicator>(uri, 2, 0, "ScrollIndicator");
+    qmlRegisterType<QQuickScrollIndicatorAttached>();
     qmlRegisterType<QQuickSlider>(uri, 2, 0, "Slider");
     qmlRegisterType<QQuickSpinBox>(uri, 2, 0, "SpinBox");
     qmlRegisterType<QQuickSpinButton>();
     qmlRegisterType<QQuickStackView>(uri, 2, 0, "StackView");
+    qmlRegisterType<QQuickStackAttached>();
     qmlRegisterType<QQuickSwipeDelegate>(uri, 2, 0, "SwipeDelegate");
-    qmlRegisterType<QQuickSwipeExposure>();
+    qmlRegisterType<QQuickSwipe>();
     qmlRegisterType<QQuickSwipeViewAttached>();
     qmlRegisterType<QQuickSwipeView>(uri, 2, 0, "SwipeView");
     qmlRegisterType<QQuickSwitch>(uri, 2, 0, "Switch");
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 99764976..f432eded 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
     \class QQuickStyle
     \brief The QQQuickStyle class allows configuring the application style.
     \inmodule QtQuickControls2
+    \since 5.7
 
     QQuickStyle provides API for querying and configuring the application
     \l {Styling Qt Quick Controls 2}{styles} of Qt Quick Controls 2.
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 68d11bae..32930318 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -54,6 +54,7 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     \inherits Control
     \instantiates QQuickAbstractButton
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-buttons
     \brief Base type of all button controls.
 
@@ -62,7 +63,7 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     radio buttons and check boxes. As an abstract control, it has no delegate
     implementations, leaving them to the types that derive from it.
 
-    TODO: ButtonGroup usage
+    \sa ButtonGroup
 */
 
 /*!
@@ -448,7 +449,7 @@ void QQuickAbstractButton::setIndicator(QQuickItem *indicator)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Button::toggle()
+    \qmlmethod void QtQuick.Controls::AbstractButton::toggle()
 
     Toggles the checked state of the button.
 */
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 940e5eeb..878fe7c7 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
     \inherits Window
     \instantiates QQuickApplicationWindow
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief Provides a top-level application window.
 
@@ -454,8 +455,8 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const
 /*!
     \qmlpropertygroup QtQuick.Controls::ApplicationWindow::overlay
     \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay
-    \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay.modal
-    \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay.modeless
+    \qmlproperty Component QtQuick.Controls::ApplicationWindow::overlay.modal
+    \qmlproperty Component QtQuick.Controls::ApplicationWindow::overlay.modeless
 
     This property holds the window overlay item. Popups are automatically
     reparented to the overlay.
@@ -466,15 +467,14 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const
         \li Description
     \row
         \li overlay.modal
-        \li This property holds a visual item that implements background
-            dimming for modal popups. It is stacked below the top-most open
-            modal popup, or hidden when there are no modal popups open.
+        \li This property holds a component to use as a visual item that implements
+            background dimming for modal popups. It is created for and stacked below
+            visible modal popups.
     \row
         \li overlay.modeless
-        \li This property holds a visual item that implements background
-            dimming for modeless popups. It is stacked below the top-most
-            open modeless dimming popup, or hidden when there are no modeless
-            dimming popups open.
+        \li This property holds a component to use as a visual item that implements
+            background dimming for modeless popups. It is created for and stacked below
+            visible dimming popups.
     \endtable
 
     \sa Popup::modal, Popup::dim
diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp
index 5a2c04ae..c3dc069a 100644
--- a/src/quicktemplates2/qquickbusyindicator.cpp
+++ b/src/quicktemplates2/qquickbusyindicator.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickBusyIndicator
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-indicators
     \brief Indicates activity while content is being loaded.
 
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index 465e82de..a51e2210 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickButton
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-buttons
     \brief A push-button control that can be clicked by the user.
 
diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp
index b8933336..0b134267 100644
--- a/src/quicktemplates2/qquickbuttongroup.cpp
+++ b/src/quicktemplates2/qquickbuttongroup.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
     \inherits QtObject
     \instantiates QQuickButtonGroup
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup utilities
     \brief A mutually-exclusive group of checkable controls.
 
diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp
index 452162f7..1daf69dc 100644
--- a/src/quicktemplates2/qquickcheckbox.cpp
+++ b/src/quicktemplates2/qquickcheckbox.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickCheckBox
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-buttons
     \brief An option button that can be checked or unchecked.
 
diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index f21da57c..09be5d60 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickCheckDelegate
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-delegates
     \brief An item delegate that can be checked or unchecked.
 
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index a5c94b48..836d6806 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickComboBox
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief A combined button and popup list taking minimal space.
 
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index f17c56f1..ff5b694b 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickContainer
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief A container control base type.
 
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index c006fd3a..d504d4fa 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
     \inherits Item
     \instantiates QQuickControl
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \brief The base type of user interface controls.
 
     Control is the base type of user interface controls.  It receives input
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 37c26201..3932fd05 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickDial
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief A circular dial that is rotated to set a value.
 
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 74d79b28..e5d05c9c 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
     \instantiates QQuickDrawer
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-navigation
     \ingroup qtquickcontrols2-popups
     \brief Provides a swipe-based side panel.
@@ -420,6 +421,8 @@ void QQuickDrawer::setPosition(qreal position)
     d->position = position;
     if (isComponentComplete())
         d->reposition();
+    if (d->dimmer)
+        d->dimmer->setOpacity(position);
     emit positionChanged();
 }
 
diff --git a/src/quicktemplates2/qquickframe.cpp b/src/quicktemplates2/qquickframe.cpp
index 54701a10..2f2a5497 100644
--- a/src/quicktemplates2/qquickframe.cpp
+++ b/src/quicktemplates2/qquickframe.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Pane
     \instantiates QQuickFrame
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief A logical group of controls within a visual frame.
 
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index 6236e755..43c75665 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Frame
     \instantiates QQuickGroupBox
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief A frame with a logical group of controls.
 
diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp
index 9ff068f1..9b21eb30 100644
--- a/src/quicktemplates2/qquickitemdelegate.cpp
+++ b/src/quicktemplates2/qquickitemdelegate.cpp
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickItemDelegate
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \brief  A standard view item that can be used in various views and controls.
 
     \image qtquickcontrols2-itemdelegate.gif
@@ -86,7 +87,20 @@ QQuickItemDelegate::QQuickItemDelegate(QQuickItemDelegatePrivate &dd, QQuickItem
     This property holds whether the delegate is highlighted.
 
     A delegate can be highlighted in order to draw the user's attention towards
-    it. It has no effect on keyboard interaction.
+    it. It has no effect on keyboard interaction. For example, you can
+    highlight the current item in a ListView using the following code:
+
+    \code
+    ListView {
+        id: listView
+        model: 10
+        delegate: ItemDelegate {
+            text: modelData
+            highlighted: ListView.isCurrentItem
+            onClicked: listView.currentIndex = index
+        }
+    }
+    \endcode
 
     The default value is \c false.
 */
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 22b2df61..6a0c6a0b 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
     \inherits Text
     \instantiates QQuickLabel
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup text
     \brief A text label with inherited styling and font.
 
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index d47c7571..f4fb26e7 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
     \instantiates QQuickMenu
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-menus
     \ingroup qtquickcontrols2-popups
     \brief A menu control that can be used as a context menu or popup menu.
diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp
index 7c9ede7d..35942f92 100644
--- a/src/quicktemplates2/qquickmenuitem.cpp
+++ b/src/quicktemplates2/qquickmenuitem.cpp
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickMenuItem
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-menus
     \brief A menu item within a Menu.
 
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index 0fb9f3ca..67eb3ceb 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -39,6 +39,7 @@
 #include "qquickdrawer_p.h"
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/qqmlproperty.h>
+#include <QtQml/qqmlcomponent.h>
 #include <QtQuick/private/qquickitem_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -52,12 +53,14 @@ public:
 
     void popupAboutToShow();
     void popupAboutToHide();
-    void drawerPositionChange();
-    void resizeOverlay(QQuickItem *overlay);
-    void restackOverlay();
+    void popupClosed();
 
-    QQuickItem *modal;
-    QQuickItem *modeless;
+    void createOverlay(QQuickPopup *popup);
+    void destroyOverlay(QQuickPopup *popup);
+    void resizeOverlay(QQuickPopup *popup);
+
+    QQmlComponent *modal;
+    QQmlComponent *modeless;
     QVector<QQuickDrawer *> drawers;
     QVector<QQuickPopup *> popups;
     QPointer<QQuickPopup> mouseGrabberPopup;
@@ -71,14 +74,12 @@ void QQuickOverlayPrivate::popupAboutToShow()
     if (!popup || !popup->dim())
         return;
 
+    createOverlay(popup);
+
     // use QQmlProperty instead of QQuickItem::setOpacity() to trigger QML Behaviors
-    if (popup->isModal()) {
-        if (modal)
-            QQmlProperty::write(modal, QStringLiteral("opacity"), 1.0);
-    } else {
-        if (modeless)
-            QQmlProperty::write(modeless, QStringLiteral("opacity"), 1.0);
-    }
+    QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup);
+    if (p->dimmer)
+        QQmlProperty::write(p->dimmer, QStringLiteral("opacity"), 1.0);
 }
 
 void QQuickOverlayPrivate::popupAboutToHide()
@@ -89,71 +90,67 @@ void QQuickOverlayPrivate::popupAboutToHide()
         return;
 
     // use QQmlProperty instead of QQuickItem::setOpacity() to trigger QML Behaviors
-    if (popup->isModal()) {
-        if (modal && modalPopups <= 1)
-            QQmlProperty::write(modal, QStringLiteral("opacity"), 0.0);
-    } else {
-        if (modeless)
-            QQmlProperty::write(modeless, QStringLiteral("opacity"), 0.0);
-    }
+    QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup);
+    if (p->dimmer)
+        QQmlProperty::write(p->dimmer, QStringLiteral("opacity"), 0.0);
 }
 
-void QQuickOverlayPrivate::drawerPositionChange()
+void QQuickOverlayPrivate::popupClosed()
 {
     Q_Q(QQuickOverlay);
-    QQuickDrawer *drawer = qobject_cast<QQuickDrawer *>(q->sender());
-    if (!drawer || !drawer->dim())
+    QQuickPopup *popup = qobject_cast<QQuickPopup *>(q->sender());
+    if (!popup || !popup->dim())
         return;
 
-    // call QQuickItem::setOpacity() directly to avoid triggering QML Behaviors
-    // which would make the fading feel laggy compared to the drawer movement
-    if (drawer->isModal()) {
-        if (modal)
-            modal->setOpacity(drawer->position());
-    } else {
-        if (modeless)
-            modeless->setOpacity(drawer->position());
+    destroyOverlay(popup);
+}
+
+static QQuickItem *createDimmer(QQmlComponent *component, QQuickPopup *popup, QQuickItem *parent)
+{
+    if (!component)
+        return nullptr;
+
+    QQmlContext *creationContext = component->creationContext();
+    if (!creationContext)
+        creationContext = qmlContext(parent);
+    QQmlContext *context = new QQmlContext(creationContext);
+    context->setContextObject(popup);
+    QQuickItem *item = qobject_cast<QQuickItem*>(component->beginCreate(context));
+    if (item) {
+        item->setOpacity(0.0);
+        item->setParentItem(parent);
+        item->stackBefore(popup->popupItem());
+        item->setZ(popup->z());
+        component->completeCreate();
     }
+    return item;
 }
 
-void QQuickOverlayPrivate::resizeOverlay(QQuickItem *overlay)
+void QQuickOverlayPrivate::createOverlay(QQuickPopup *popup)
 {
     Q_Q(QQuickOverlay);
-    overlay->setWidth(q->width());
-    overlay->setHeight(q->height());
+    QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup);
+    if (!p->dimmer)
+        p->dimmer = createDimmer(popup->isModal() ? modal : modeless, popup, q);
+    resizeOverlay(popup);
 }
 
-void QQuickOverlayPrivate::restackOverlay()
+void QQuickOverlayPrivate::destroyOverlay(QQuickPopup *popup)
 {
-    if (!modal && !modeless)
-        return;
-
-    // find the bottom-most modal and top-most modeless dimming popups
-    QQuickPopup *modalPopup = nullptr;
-    QQuickPopup *modelessPopup = nullptr;
-    for (auto it = popups.crbegin(), end = popups.crend(); it != end; ++it) {
-        QQuickPopup *popup = (*it);
-        if (!popup->dim())
-            continue;
-
-        if (popup->isModal()) {
-            if (!modalPopup || modalPopup->z() >= popup->z())
-                modalPopup = popup;
-        } else {
-            if (!modelessPopup)
-                modelessPopup = popup;
-        }
+    QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup);
+    if (p->dimmer) {
+        p->dimmer->deleteLater();
+        p->dimmer = nullptr;
     }
+}
 
-    if (modal) {
-        modal->setZ(modalPopup ? modalPopup->z() : 0.0);
-        if (modalPopup)
-            modal->stackBefore(modalPopup->popupItem());
-    }
-    if (modeless) {
-        modeless->setZ(modelessPopup ? modelessPopup->z() : 0.0);
-        if (modelessPopup)
-            modeless->stackBefore(modelessPopup->popupItem());
+void QQuickOverlayPrivate::resizeOverlay(QQuickPopup *popup)
+{
+    Q_Q(QQuickOverlay);
+    QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup);
+    if (p->dimmer) {
+        p->dimmer->setWidth(q->width());
+        p->dimmer->setHeight(q->height());
     }
 }
 
@@ -172,13 +169,13 @@ QQuickOverlay::QQuickOverlay(QQuickItem *parent)
     setVisible(false);
 }
 
-QQuickItem *QQuickOverlay::modal() const
+QQmlComponent *QQuickOverlay::modal() const
 {
     Q_D(const QQuickOverlay);
     return d->modal;
 }
 
-void QQuickOverlay::setModal(QQuickItem *modal)
+void QQuickOverlay::setModal(QQmlComponent *modal)
 {
     Q_D(QQuickOverlay);
     if (d->modal == modal)
@@ -186,22 +183,16 @@ void QQuickOverlay::setModal(QQuickItem *modal)
 
     delete d->modal;
     d->modal = modal;
-    if (modal) {
-        modal->setOpacity(0.0);
-        modal->setParentItem(this);
-        if (isComponentComplete())
-            d->resizeOverlay(modal);
-    }
     emit modalChanged();
 }
 
-QQuickItem *QQuickOverlay::modeless() const
+QQmlComponent *QQuickOverlay::modeless() const
 {
     Q_D(const QQuickOverlay);
     return d->modeless;
 }
 
-void QQuickOverlay::setModeless(QQuickItem *modeless)
+void QQuickOverlay::setModeless(QQmlComponent *modeless)
 {
     Q_D(QQuickOverlay);
     if (d->modeless == modeless)
@@ -209,12 +200,6 @@ void QQuickOverlay::setModeless(QQuickItem *modeless)
 
     delete d->modeless;
     d->modeless = modeless;
-    if (modeless) {
-        modeless->setOpacity(0.0);
-        modeless->setParentItem(this);
-        if (isComponentComplete())
-            d->resizeOverlay(modeless);
-    }
     emit modelessChanged();
 }
 
@@ -233,33 +218,33 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data)
 
     if (change == ItemChildAddedChange) {
         d->popups.append(popup);
-        d->restackOverlay();
 
         QQuickDrawer *drawer = qobject_cast<QQuickDrawer *>(popup);
         if (drawer) {
-            QObjectPrivate::connect(drawer, &QQuickDrawer::positionChanged, d, &QQuickOverlayPrivate::drawerPositionChange);
             d->drawers.append(drawer);
+            d->createOverlay(drawer);
         } else {
             if (popup->isModal())
                 ++d->modalPopups;
 
             QObjectPrivate::connect(popup, &QQuickPopup::aboutToShow, d, &QQuickOverlayPrivate::popupAboutToShow);
             QObjectPrivate::connect(popup, &QQuickPopup::aboutToHide, d, &QQuickOverlayPrivate::popupAboutToHide);
+            QObjectPrivate::connect(popup, &QQuickPopup::closed, d, &QQuickOverlayPrivate::popupClosed);
         }
     } else if (change == ItemChildRemovedChange) {
         d->popups.removeOne(popup);
-        d->restackOverlay();
 
         QQuickDrawer *drawer = qobject_cast<QQuickDrawer *>(popup);
         if (drawer) {
-            QObjectPrivate::disconnect(drawer, &QQuickDrawer::positionChanged, d, &QQuickOverlayPrivate::drawerPositionChange);
             d->drawers.removeOne(drawer);
+            d->destroyOverlay(drawer);
         } else {
             if (popup->isModal())
                 --d->modalPopups;
 
             QObjectPrivate::disconnect(popup, &QQuickPopup::aboutToShow, d, &QQuickOverlayPrivate::popupAboutToShow);
             QObjectPrivate::disconnect(popup, &QQuickPopup::aboutToHide, d, &QQuickOverlayPrivate::popupAboutToHide);
+            QObjectPrivate::disconnect(popup, &QQuickPopup::closed, d, &QQuickOverlayPrivate::popupClosed);
         }
     }
 }
@@ -268,10 +253,8 @@ void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &old
 {
     Q_D(QQuickOverlay);
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
-    if (d->modal)
-        d->resizeOverlay(d->modal);
-    if (d->modeless)
-        d->resizeOverlay(d->modeless);
+    for (QQuickPopup *popup : d->popups)
+        d->resizeOverlay(popup);
 }
 
 bool QQuickOverlay::event(QEvent *event)
diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h
index 77137257..99d7ba75 100644
--- a/src/quicktemplates2/qquickoverlay_p.h
+++ b/src/quicktemplates2/qquickoverlay_p.h
@@ -53,22 +53,23 @@
 
 QT_BEGIN_NAMESPACE
 
+class QQmlComponent;
 class QQuickOverlayPrivate;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickOverlay : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QQuickItem *modal READ modal WRITE setModal NOTIFY modalChanged FINAL)
-    Q_PROPERTY(QQuickItem *modeless READ modeless WRITE setModeless NOTIFY modelessChanged FINAL)
+    Q_PROPERTY(QQmlComponent *modal READ modal WRITE setModal NOTIFY modalChanged FINAL)
+    Q_PROPERTY(QQmlComponent *modeless READ modeless WRITE setModeless NOTIFY modelessChanged FINAL)
 
 public:
     explicit QQuickOverlay(QQuickItem *parent = nullptr);
 
-    QQuickItem *modal() const;
-    void setModal(QQuickItem *modal);
+    QQmlComponent *modal() const;
+    void setModal(QQmlComponent *modal);
 
-    QQuickItem *modeless() const;
-    void setModeless(QQuickItem *modeless);
+    QQmlComponent *modeless() const;
+    void setModeless(QQmlComponent *modeless);
 
 Q_SIGNALS:
     void modalChanged();
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 463ecc40..dd9bcc21 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickPage
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief A control that makes it convenient to add a header and footer to a page.
 
diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp
index 639fbdbb..04c6a344 100644
--- a/src/quicktemplates2/qquickpageindicator.cpp
+++ b/src/quicktemplates2/qquickpageindicator.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickPageIndicator
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-indicators
     \brief Indicates the currently active page.
 
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index f291abf8..f2141619 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickPane
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief Provides a background matching with the application style and theme.
 
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index cb13d7b6..0702121e 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
     \inherits QtObject
     \instantiates QQuickPopup
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-popups
     \brief The base type of popup-like user interface controls.
 
@@ -145,6 +146,7 @@ QQuickPopupPrivate::QQuickPopupPrivate()
     , contentHeight(0)
     , closePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside)
     , parentItem(nullptr)
+    , dimmer(nullptr)
     , window(nullptr)
     , enter(nullptr)
     , exit(nullptr)
@@ -1784,6 +1786,22 @@ void QQuickPopup::setFiltersChildMouseEvents(bool filter)
     d->popupItem->setFiltersChildMouseEvents(filter);
 }
 
+/*!
+    \qmlmethod QtQuick.Controls::Popup::forceActiveFocus(reason = Qt.OtherFocusReason)
+
+    Forces active focus on the popup with the given \a reason.
+
+    This method sets focus on the popup and ensures that all ancestor
+    \l FocusScope objects in the object hierarchy are also given \l focus.
+
+    \sa activeFocus, Qt::FocusReason
+*/
+void QQuickPopup::forceActiveFocus(Qt::FocusReason reason)
+{
+    Q_D(QQuickPopup);
+    d->popupItem->forceActiveFocus(reason);
+}
+
 void QQuickPopup::classBegin()
 {
     Q_D(QQuickPopup);
diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h
index c0bb3426..be6a8e22 100644
--- a/src/quicktemplates2/qquickpopup_p.h
+++ b/src/quicktemplates2/qquickpopup_p.h
@@ -275,6 +275,8 @@ public:
     bool filtersChildMouseEvents() const;
     void setFiltersChildMouseEvents(bool filter);
 
+    Q_INVOKABLE void forceActiveFocus(Qt::FocusReason reason = Qt::OtherFocusReason);
+
 public Q_SLOTS:
     void open();
     void close();
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 9ea5a7f0..ffe2c2bb 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -204,6 +204,7 @@ public:
     qreal contentHeight;
     QQuickPopup::ClosePolicy closePolicy;
     QQuickItem *parentItem;
+    QQuickItem *dimmer;
     QQuickWindow *window;
     QQuickTransition *enter;
     QQuickTransition *exit;
diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp
index 5bb90a8a..5f403690 100644
--- a/src/quicktemplates2/qquickprogressbar.cpp
+++ b/src/quicktemplates2/qquickprogressbar.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickProgressBar
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-indicators
     \brief Indicates the progress of an operation.
 
diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp
index 5615703f..2aafbfbd 100644
--- a/src/quicktemplates2/qquickradiobutton.cpp
+++ b/src/quicktemplates2/qquickradiobutton.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickRadioButton
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-buttons
     \brief An option button that can be toggled on or off.
 
diff --git a/src/quicktemplates2/qquickradiodelegate.cpp b/src/quicktemplates2/qquickradiodelegate.cpp
index 666086af..01a27cc9 100644
--- a/src/quicktemplates2/qquickradiodelegate.cpp
+++ b/src/quicktemplates2/qquickradiodelegate.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickRadioDelegate
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-delegates
     \brief An item delegate that can be checked or unchecked.
 
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index aa35a837..db211433 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickRangeSlider
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief A slider control used to select a range of values.
 
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index 6c83e56a..40116bf9 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickScrollBar
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-indicators
     \brief An interactive scroll bar control.
 
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp
index f89219a9..bc53768c 100644
--- a/src/quicktemplates2/qquickscrollindicator.cpp
+++ b/src/quicktemplates2/qquickscrollindicator.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickScrollIndicator
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-indicators
     \brief A non-interactive scroll indicator control.
 
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index dbc411fd..9769085d 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickSlider
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief Selects a value by sliding a handle along a track.
 
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 2b58acf2..b2d88d3b 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -55,6 +55,7 @@ static const int AUTO_REPEAT_INTERVAL = 100;
     \inherits Control
     \instantiates QQuickSpinBox
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup input
     \brief A spinbox control that allows the user to select from a set of preset values.
 
@@ -104,6 +105,11 @@ public:
 
     int effectiveStepSize() const;
 
+    bool upEnabled() const;
+    void updateUpEnabled();
+    bool downEnabled() const;
+    void updateDownEnabled();
+
     void startRepeatDelay();
     void startPressRepeat();
     void stopPressRepeat();
@@ -154,6 +160,36 @@ int QQuickSpinBoxPrivate::effectiveStepSize() const
     return from > to ? -1 * stepSize : stepSize;
 }
 
+bool QQuickSpinBoxPrivate::upEnabled() const
+{
+    const QQuickItem *upIndicator = up->indicator();
+    return upIndicator && upIndicator->isEnabled();
+}
+
+void QQuickSpinBoxPrivate::updateUpEnabled()
+{
+    QQuickItem *upIndicator = up->indicator();
+    if (!upIndicator)
+        return;
+
+    upIndicator->setEnabled(from < to ? value < to : value > to);
+}
+
+bool QQuickSpinBoxPrivate::downEnabled() const
+{
+    const QQuickItem *downIndicator = down->indicator();
+    return downIndicator && downIndicator->isEnabled();
+}
+
+void QQuickSpinBoxPrivate::updateDownEnabled()
+{
+    QQuickItem *downIndicator = down->indicator();
+    if (!downIndicator)
+        return;
+
+    downIndicator->setEnabled(from < to ? value > from : value < from);
+}
+
 void QQuickSpinBoxPrivate::startRepeatDelay()
 {
     Q_Q(QQuickSpinBox);
@@ -186,8 +222,8 @@ bool QQuickSpinBoxPrivate::handleMousePressEvent(QQuickItem *child, QMouseEvent
     Q_Q(QQuickSpinBox);
     QQuickItem *ui = up->indicator();
     QQuickItem *di = down->indicator();
-    up->setPressed(ui && ui->contains(ui->mapFromItem(child, event->pos())));
-    down->setPressed(di && di->contains(di->mapFromItem(child, event->pos())));
+    up->setPressed(ui && ui->isEnabled() && ui->contains(ui->mapFromItem(child, event->pos())));
+    down->setPressed(di && di->isEnabled() && di->contains(di->mapFromItem(child, event->pos())));
 
     bool pressed = up->isPressed() || down->isPressed();
     q->setAccessibleProperty("pressed", pressed);
@@ -201,8 +237,8 @@ bool QQuickSpinBoxPrivate::handleMouseMoveEvent(QQuickItem *child, QMouseEvent *
     Q_Q(QQuickSpinBox);
     QQuickItem *ui = up->indicator();
     QQuickItem *di = down->indicator();
-    up->setPressed(ui && ui->contains(ui->mapFromItem(child, event->pos())));
-    down->setPressed(di && di->contains(di->mapFromItem(child, event->pos())));
+    up->setPressed(ui && ui->isEnabled() && ui->contains(ui->mapFromItem(child, event->pos())));
+    down->setPressed(di && di->isEnabled() && di->contains(di->mapFromItem(child, event->pos())));
 
     bool pressed = up->isPressed() || down->isPressed();
     q->setAccessibleProperty("pressed", pressed);
@@ -325,6 +361,10 @@ void QQuickSpinBox::setValue(int value)
         return;
 
     d->value = value;
+
+    d->updateUpEnabled();
+    d->updateDownEnabled();
+
     emit valueChanged();
 }
 
@@ -545,15 +585,19 @@ void QQuickSpinBox::keyPressEvent(QKeyEvent *event)
 
     switch (event->key()) {
     case Qt::Key_Up:
-        increase();
-        d->up->setPressed(true);
-        event->accept();
+        if (d->upEnabled()) {
+            increase();
+            d->up->setPressed(true);
+            event->accept();
+        }
         break;
 
     case Qt::Key_Down:
-        decrease();
-        d->down->setPressed(true);
-        event->accept();
+        if (d->downEnabled()) {
+            decrease();
+            d->down->setPressed(true);
+            event->accept();
+        }
         break;
 
     default:
@@ -648,6 +692,14 @@ void QQuickSpinBox::wheelEvent(QWheelEvent *event)
     }
 }
 
+void QQuickSpinBox::componentComplete()
+{
+    Q_D(QQuickSpinBox);
+    QQuickControl::componentComplete();
+    d->updateUpEnabled();
+    d->updateDownEnabled();
+}
+
 void QQuickSpinBox::itemChange(ItemChange change, const ItemChangeData &value)
 {
     Q_D(QQuickSpinBox);
diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h
index 5dd7b57d..3898a28b 100644
--- a/src/quicktemplates2/qquickspinbox_p.h
+++ b/src/quicktemplates2/qquickspinbox_p.h
@@ -127,6 +127,7 @@ protected:
     void timerEvent(QTimerEvent *event) override;
     void wheelEvent(QWheelEvent *event) override;
 
+    void componentComplete() override;
     void itemChange(ItemChange change, const ItemChangeData &value) override;
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
 
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index b0998604..9c9cd5c2 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickStackView
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-navigation
     \ingroup qtquickcontrols2-containers
     \brief Provides a stack-based navigation model.
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index 683e6790..31571864 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickSwipeDelegate
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \brief A swipable item delegate.
 
     SwipeDelegate presents a view item that can be swiped left or right to
@@ -63,27 +64,27 @@ QT_BEGIN_NAMESPACE
 
     Information regarding the progress of a swipe, as well as the components
     that should be shown upon swiping, are both available through the
-    \l {SwipeDelegate::}{exposure} grouped property object. For example,
-    \c exposure.position holds the position of the
-    swipe within the range \c -1.0 to \c 1.0. The \c exposure.left
+    \l {SwipeDelegate::}{swipe} grouped property object. For example,
+    \c swipe.position holds the position of the
+    swipe within the range \c -1.0 to \c 1.0. The \c swipe.left
     property determines which item will be displayed when the control is swiped
-    to the right, and vice versa for \c exposure.right. The positioning of these
+    to the right, and vice versa for \c swipe.right. The positioning of these
     components is left to applications to decide. For example, without specifying
-    any position for \c exposure.left or \c exposure.right, the following will
+    any position for \c swipe.left or \c swipe.right, the following will
     occur:
 
     \image qtquickcontrols2-swipedelegate.gif
 
-    If \c exposure.left and \c exposure.right are anchored to the left and
-    right of the \l background item (respectively), they'll behave like this:
+    If \c swipe.left and \c swipe.right are anchored to the left and
+    right of the \l {Control::}{background} item (respectively), they'll behave like this:
 
     \image qtquickcontrols2-swipedelegate-leading-trailing.gif
 
-    When using \c exposure.left and \c exposure.right, the control cannot be
+    When using \c swipe.left and \c swipe.right, the control cannot be
     swiped past the left and right edges. To achieve this type of "wrapping"
-    behavior, set \c exposure.behind instead. This will result in the same
+    behavior, set \c swipe.behind instead. This will result in the same
     item being shown regardless of which direction the control is swiped. For
-    example, in the image below, we set \c exposure.behind and then swipe the
+    example, in the image below, we set \c swipe.behind and then swipe the
     control repeatedly in both directions:
 
     \image qtquickcontrols2-swipedelegate-behind.gif
@@ -91,17 +92,17 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing SwipeDelegate}
 */
 
-class QQuickSwipeExposurePrivate : public QObjectPrivate
+class QQuickSwipePrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickSwipeExposure)
+    Q_DECLARE_PUBLIC(QQuickSwipe)
 
 public:
-    QQuickSwipeExposurePrivate(QQuickSwipeDelegate *control) :
+    QQuickSwipePrivate(QQuickSwipeDelegate *control) :
         control(control),
         positionBeforePress(0),
         position(0),
-        wasActive(false),
-        active(false),
+        wasComplete(false),
+        complete(false),
         left(nullptr),
         behind(nullptr),
         right(nullptr),
@@ -111,7 +112,7 @@ public:
     {
     }
 
-    static QQuickSwipeExposurePrivate *get(QQuickSwipeExposure *exposure);
+    static QQuickSwipePrivate *get(QQuickSwipe *swipe);
 
     QQuickItem *createDelegateItem(QQmlComponent *component);
     QQuickItem *showRelevantItemForPosition(qreal position);
@@ -131,10 +132,10 @@ public:
     // keep track of which direction the user must swipe when using left and right delegates.
     qreal positionBeforePress;
     qreal position;
-    // A "less strict" version of active that is true if active was true
+    // A "less strict" version of complete that is true if complete was true
     // before the last press event.
-    bool wasActive;
-    bool active;
+    bool wasComplete;
+    bool complete;
     QQuickVelocityCalculator velocityCalculator;
     QQmlComponent *left;
     QQmlComponent *behind;
@@ -144,12 +145,12 @@ public:
     QQuickItem *rightItem;
 };
 
-QQuickSwipeExposurePrivate *QQuickSwipeExposurePrivate::get(QQuickSwipeExposure *exposure)
+QQuickSwipePrivate *QQuickSwipePrivate::get(QQuickSwipe *swipe)
 {
-    return exposure->d_func();
+    return swipe->d_func();
 }
 
-QQuickItem *QQuickSwipeExposurePrivate::createDelegateItem(QQmlComponent *component)
+QQuickItem *QQuickSwipePrivate::createDelegateItem(QQmlComponent *component)
 {
     // If we don't use the correct context, it won't be possible to refer to
     // the control's id from within the delegates.
@@ -168,7 +169,7 @@ QQuickItem *QQuickSwipeExposurePrivate::createDelegateItem(QQmlComponent *compon
     return item;
 }
 
-QQuickItem *QQuickSwipeExposurePrivate::showRelevantItemForPosition(qreal position)
+QQuickItem *QQuickSwipePrivate::showRelevantItemForPosition(qreal position)
 {
     if (qFuzzyIsNull(position))
         return nullptr;
@@ -191,7 +192,7 @@ QQuickItem *QQuickSwipeExposurePrivate::showRelevantItemForPosition(qreal positi
     return nullptr;
 }
 
-QQuickItem *QQuickSwipeExposurePrivate::createRelevantItemForDistance(qreal distance)
+QQuickItem *QQuickSwipePrivate::createRelevantItemForDistance(qreal distance)
 {
     if (qFuzzyIsNull(distance))
         return nullptr;
@@ -233,37 +234,37 @@ QQuickItem *QQuickSwipeExposurePrivate::createRelevantItemForDistance(qreal dist
     return nullptr;
 }
 
-void QQuickSwipeExposurePrivate::createLeftItem()
+void QQuickSwipePrivate::createLeftItem()
 {
     if (!leftItem) {
-        Q_Q(QQuickSwipeExposure);
+        Q_Q(QQuickSwipe);
         q->setLeftItem(createDelegateItem(left));
         if (!leftItem)
             qmlInfo(control) << "Failed to create left item:" << left->errors();
     }
 }
 
-void QQuickSwipeExposurePrivate::createBehindItem()
+void QQuickSwipePrivate::createBehindItem()
 {
     if (!behindItem) {
-        Q_Q(QQuickSwipeExposure);
+        Q_Q(QQuickSwipe);
         q->setBehindItem(createDelegateItem(behind));
         if (!behindItem)
             qmlInfo(control) << "Failed to create behind item:" << behind->errors();
     }
 }
 
-void QQuickSwipeExposurePrivate::createRightItem()
+void QQuickSwipePrivate::createRightItem()
 {
     if (!rightItem) {
-        Q_Q(QQuickSwipeExposure);
+        Q_Q(QQuickSwipe);
         q->setRightItem(createDelegateItem(right));
         if (!rightItem)
             qmlInfo(control) << "Failed to create right item:" << right->errors();
     }
 }
 
-void QQuickSwipeExposurePrivate::createAndShowLeftItem()
+void QQuickSwipePrivate::createAndShowLeftItem()
 {
     createLeftItem();
 
@@ -274,7 +275,7 @@ void QQuickSwipeExposurePrivate::createAndShowLeftItem()
         rightItem->setVisible(false);
 }
 
-void QQuickSwipeExposurePrivate::createAndShowBehindItem()
+void QQuickSwipePrivate::createAndShowBehindItem()
 {
     createBehindItem();
 
@@ -282,7 +283,7 @@ void QQuickSwipeExposurePrivate::createAndShowBehindItem()
         behindItem->setVisible(true);
 }
 
-void QQuickSwipeExposurePrivate::createAndShowRightItem()
+void QQuickSwipePrivate::createAndShowRightItem()
 {
     createRightItem();
 
@@ -295,30 +296,30 @@ void QQuickSwipeExposurePrivate::createAndShowRightItem()
         leftItem->setVisible(false);
 }
 
-void QQuickSwipeExposurePrivate::warnAboutMixingDelegates()
+void QQuickSwipePrivate::warnAboutMixingDelegates()
 {
     qmlInfo(control) << "cannot set both behind and left/right properties";
 }
 
-void QQuickSwipeExposurePrivate::warnAboutSettingDelegatesWhileVisible()
+void QQuickSwipePrivate::warnAboutSettingDelegatesWhileVisible()
 {
-    qmlInfo(control) << "left/right/behind properties may only be set when exposure.position is 0";
+    qmlInfo(control) << "left/right/behind properties may only be set when swipe.position is 0";
 }
 
-QQuickSwipeExposure::QQuickSwipeExposure(QQuickSwipeDelegate *control) :
-    QObject(*(new QQuickSwipeExposurePrivate(control)))
+QQuickSwipe::QQuickSwipe(QQuickSwipeDelegate *control) :
+    QObject(*(new QQuickSwipePrivate(control)))
 {
 }
 
-QQmlComponent *QQuickSwipeExposure::left() const
+QQmlComponent *QQuickSwipe::left() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->left;
 }
 
-void QQuickSwipeExposure::setLeft(QQmlComponent *left)
+void QQuickSwipe::setLeft(QQmlComponent *left)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     if (left == d->left)
         return;
 
@@ -342,15 +343,15 @@ void QQuickSwipeExposure::setLeft(QQmlComponent *left)
     emit leftChanged();
 }
 
-QQmlComponent *QQuickSwipeExposure::behind() const
+QQmlComponent *QQuickSwipe::behind() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->behind;
 }
 
-void QQuickSwipeExposure::setBehind(QQmlComponent *behind)
+void QQuickSwipe::setBehind(QQmlComponent *behind)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     if (behind == d->behind)
         return;
 
@@ -374,15 +375,15 @@ void QQuickSwipeExposure::setBehind(QQmlComponent *behind)
     emit behindChanged();
 }
 
-QQmlComponent *QQuickSwipeExposure::right() const
+QQmlComponent *QQuickSwipe::right() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->right;
 }
 
-void QQuickSwipeExposure::setRight(QQmlComponent *right)
+void QQuickSwipe::setRight(QQmlComponent *right)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     if (right == d->right)
         return;
 
@@ -406,15 +407,15 @@ void QQuickSwipeExposure::setRight(QQmlComponent *right)
     emit rightChanged();
 }
 
-QQuickItem *QQuickSwipeExposure::leftItem() const
+QQuickItem *QQuickSwipe::leftItem() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->leftItem;
 }
 
-void QQuickSwipeExposure::setLeftItem(QQuickItem *item)
+void QQuickSwipe::setLeftItem(QQuickItem *item)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     if (item == d->leftItem)
         return;
 
@@ -431,15 +432,15 @@ void QQuickSwipeExposure::setLeftItem(QQuickItem *item)
     emit leftItemChanged();
 }
 
-QQuickItem *QQuickSwipeExposure::behindItem() const
+QQuickItem *QQuickSwipe::behindItem() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->behindItem;
 }
 
-void QQuickSwipeExposure::setBehindItem(QQuickItem *item)
+void QQuickSwipe::setBehindItem(QQuickItem *item)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     if (item == d->behindItem)
         return;
 
@@ -456,15 +457,15 @@ void QQuickSwipeExposure::setBehindItem(QQuickItem *item)
     emit behindItemChanged();
 }
 
-QQuickItem *QQuickSwipeExposure::rightItem() const
+QQuickItem *QQuickSwipe::rightItem() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->rightItem;
 }
 
-void QQuickSwipeExposure::setRightItem(QQuickItem *item)
+void QQuickSwipe::setRightItem(QQuickItem *item)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     if (item == d->rightItem)
         return;
 
@@ -481,15 +482,15 @@ void QQuickSwipeExposure::setRightItem(QQuickItem *item)
     emit rightItemChanged();
 }
 
-qreal QQuickSwipeExposure::position() const
+qreal QQuickSwipe::position() const
 {
-    Q_D(const QQuickSwipeExposure);
+    Q_D(const QQuickSwipe);
     return d->position;
 }
 
-void QQuickSwipeExposure::setPosition(qreal position)
+void QQuickSwipe::setPosition(qreal position)
 {
-    Q_D(QQuickSwipeExposure);
+    Q_D(QQuickSwipe);
     const qreal adjustedPosition = qBound<qreal>(-1.0, position, 1.0);
     if (adjustedPosition == d->position)
         return;
@@ -505,20 +506,20 @@ void QQuickSwipeExposure::setPosition(qreal position)
     emit positionChanged();
 }
 
-bool QQuickSwipeExposure::isActive() const
+bool QQuickSwipe::isComplete() const
 {
-    Q_D(const QQuickSwipeExposure);
-    return d->active;
+    Q_D(const QQuickSwipe);
+    return d->complete;
 }
 
-void QQuickSwipeExposure::setActive(bool active)
+void QQuickSwipe::setComplete(bool complete)
 {
-    Q_D(QQuickSwipeExposure);
-    if (active == d->active)
+    Q_D(QQuickSwipe);
+    if (complete == d->complete)
         return;
 
-    d->active = active;
-    emit activeChanged();
+    d->complete = complete;
+    emit completeChanged();
 }
 
 class QQuickSwipeDelegatePrivate : public QQuickItemDelegatePrivate
@@ -527,7 +528,7 @@ class QQuickSwipeDelegatePrivate : public QQuickItemDelegatePrivate
 
 public:
     QQuickSwipeDelegatePrivate(QQuickSwipeDelegate *control) :
-        exposure(control)
+        swipe(control)
     {
     }
 
@@ -537,23 +538,23 @@ public:
 
     void resizeContent() override;
 
-    QQuickSwipeExposure exposure;
+    QQuickSwipe swipe;
 };
 
 bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseEvent *event)
 {
     Q_Q(QQuickSwipeDelegate);
-    QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&exposure);
+    QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&swipe);
     // If the position is 0, we want to handle events ourself - we don't want child items to steal them.
     // This code will only get called when a child item has been created;
     // events will go through the regular channels (mousePressEvent()) until then.
-    if (qFuzzyIsNull(exposurePrivate->position)) {
+    if (qFuzzyIsNull(swipePrivate->position)) {
         q->mousePressEvent(event);
         return true;
     }
 
-    exposurePrivate->positionBeforePress = exposurePrivate->position;
-    exposurePrivate->velocityCalculator.startMeasuring(event->pos(), event->timestamp());
+    swipePrivate->positionBeforePress = swipePrivate->position;
+    swipePrivate->velocityCalculator.startMeasuring(event->pos(), event->timestamp());
     pressPoint = item->mapToItem(q, event->pos());
     return false;
 }
@@ -572,8 +573,8 @@ bool QQuickSwipeDelegatePrivate::handleMouseMoveEvent(QQuickItem *item, QMouseEv
         return false;
 
     // Don't bother reacting to events if we don't have any delegates.
-    QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&exposure);
-    if (!exposurePrivate->left && !exposurePrivate->right && !exposurePrivate->behind)
+    QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&swipe);
+    if (!swipePrivate->left && !swipePrivate->right && !swipePrivate->behind)
         return false;
 
     // Don't handle move events for the control if it wasn't pressed.
@@ -591,7 +592,7 @@ bool QQuickSwipeDelegatePrivate::handleMouseMoveEvent(QQuickItem *item, QMouseEv
                 q->grabMouse();
                 q->setKeepMouseGrab(overThreshold);
                 q->setPressed(true);
-                exposure.setActive(false);
+                swipe.setComplete(false);
             }
         }
     }
@@ -601,15 +602,15 @@ bool QQuickSwipeDelegatePrivate::handleMouseMoveEvent(QQuickItem *item, QMouseEv
         // to the left when the left item is already exposed, and vice versa.
         // The code below assumes that the drag is valid, so if we don't have this check,
         // the wrong items are visible and the swiping wraps.
-        if (exposurePrivate->behind
-            || ((exposurePrivate->left || exposurePrivate->right)
-                && (qFuzzyIsNull(exposurePrivate->positionBeforePress)
-                    || (exposurePrivate->positionBeforePress == -1.0 && distance >= 0.0)
-                    || (exposurePrivate->positionBeforePress == 1.0 && distance <= 0.0)))) {
+        if (swipePrivate->behind
+            || ((swipePrivate->left || swipePrivate->right)
+                && (qFuzzyIsNull(swipePrivate->positionBeforePress)
+                    || (swipePrivate->positionBeforePress == -1.0 && distance >= 0.0)
+                    || (swipePrivate->positionBeforePress == 1.0 && distance <= 0.0)))) {
 
             // We must instantiate the items here so that we can calculate the
             // position against the width of the relevant item.
-            QQuickItem *relevantItem = exposurePrivate->createRelevantItemForDistance(distance);
+            QQuickItem *relevantItem = swipePrivate->createRelevantItemForDistance(distance);
             // If there isn't any relevant item, the user may have swiped back to the 0 position,
             // or they swiped back to a position that is equal to positionBeforePress.
             const qreal normalizedDistance = relevantItem ? distance / relevantItem->width() : 0.0;
@@ -633,14 +634,14 @@ bool QQuickSwipeDelegatePrivate::handleMouseMoveEvent(QQuickItem *item, QMouseEv
                 // to the left by the exact width of the left item, there won't be any relevant item
                 // (because the swipe's position would be at 0.0). In turn, the normalizedDistance
                 // would be 0 (because of the lack of a relevant item), but the distance will be non-zero.
-                position = qFuzzyIsNull(distance) ? exposurePrivate->positionBeforePress : 0;
-            } else if (!exposurePrivate->wasActive) {
+                position = qFuzzyIsNull(distance) ? swipePrivate->positionBeforePress : 0;
+            } else if (!swipePrivate->wasComplete) {
                 position = normalizedDistance;
             } else {
                 position = distance > 0 ? normalizedDistance - 1.0 : normalizedDistance + 1.0;
             }
 
-            exposure.setPosition(position);
+            swipe.setPosition(position);
         }
     }
 
@@ -654,25 +655,25 @@ static const qreal exposeVelocityThreshold = 300.0;
 bool QQuickSwipeDelegatePrivate::handleMouseReleaseEvent(QQuickItem *, QMouseEvent *event)
 {
     Q_Q(QQuickSwipeDelegate);
-    QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&exposure);
-    exposurePrivate->velocityCalculator.stopMeasuring(event->pos(), event->timestamp());
+    QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&swipe);
+    swipePrivate->velocityCalculator.stopMeasuring(event->pos(), event->timestamp());
 
     // The control can be exposed by either swiping past the halfway mark, or swiping fast enough.
-    const qreal swipeVelocity = exposurePrivate->velocityCalculator.velocity().x();
-    if (exposurePrivate->position > 0.5 ||
-        (exposurePrivate->position > 0.0 && swipeVelocity > exposeVelocityThreshold)) {
-        exposure.setPosition(1.0);
-        exposure.setActive(true);
-        exposurePrivate->wasActive = true;
-    } else if (exposurePrivate->position < -0.5 ||
-        (exposurePrivate->position < 0.0 && swipeVelocity < -exposeVelocityThreshold)) {
-        exposure.setPosition(-1.0);
-        exposure.setActive(true);
-        exposurePrivate->wasActive = true;
+    const qreal swipeVelocity = swipePrivate->velocityCalculator.velocity().x();
+    if (swipePrivate->position > 0.5 ||
+        (swipePrivate->position > 0.0 && swipeVelocity > exposeVelocityThreshold)) {
+        swipe.setPosition(1.0);
+        swipe.setComplete(true);
+        swipePrivate->wasComplete = true;
+    } else if (swipePrivate->position < -0.5 ||
+        (swipePrivate->position < 0.0 && swipeVelocity < -exposeVelocityThreshold)) {
+        swipe.setPosition(-1.0);
+        swipe.setComplete(true);
+        swipePrivate->wasComplete = true;
     } else {
-        exposure.setPosition(0.0);
-        exposure.setActive(false);
-        exposurePrivate->wasActive = false;
+        swipe.setPosition(0.0);
+        swipe.setComplete(false);
+        swipePrivate->wasComplete = false;
     }
 
     q->setKeepMouseGrab(false);
@@ -686,8 +687,8 @@ void QQuickSwipeDelegatePrivate::resizeContent()
     // of the control (we clip anything outside the bounds), we don't want
     // to call QQuickControlPrivate's implementation of this function,
     // as it repositions the contentItem to be visible.
-    QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&exposure);
-    if (!exposurePrivate->active) {
+    QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&swipe);
+    if (!swipePrivate->complete) {
         QQuickAbstractButtonPrivate::resizeContent();
     }
 }
@@ -699,15 +700,15 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) :
 }
 
 /*!
-    \qmlpropertygroup QtQuick.Controls::SwipeDelegate::exposure
-    \qmlproperty real QtQuick.Controls::SwipeDelegate::exposure.position
-    \qmlproperty bool QtQuick.Controls::SwipeDelegate::exposure.active
-    \qmlproperty Component QtQuick.Controls::SwipeDelegate::exposure.left
-    \qmlproperty Component QtQuick.Controls::SwipeDelegate::exposure.behind
-    \qmlproperty Component QtQuick.Controls::SwipeDelegate::exposure.right
-    \qmlproperty Item QtQuick.Controls::SwipeDelegate::exposure.leftItem
-    \qmlproperty Item QtQuick.Controls::SwipeDelegate::exposure.behindItem
-    \qmlproperty Item QtQuick.Controls::SwipeDelegate::exposure.rightItem
+    \qmlpropertygroup QtQuick.Controls::SwipeDelegate::swipe
+    \qmlproperty real QtQuick.Controls::SwipeDelegate::swipe.position
+    \qmlproperty bool QtQuick.Controls::SwipeDelegate::swipe.complete
+    \qmlproperty Component QtQuick.Controls::SwipeDelegate::swipe.left
+    \qmlproperty Component QtQuick.Controls::SwipeDelegate::swipe.behind
+    \qmlproperty Component QtQuick.Controls::SwipeDelegate::swipe.right
+    \qmlproperty Item QtQuick.Controls::SwipeDelegate::swipe.leftItem
+    \qmlproperty Item QtQuick.Controls::SwipeDelegate::swipe.behindItem
+    \qmlproperty Item QtQuick.Controls::SwipeDelegate::swipe.rightItem
 
     \table
     \header
@@ -718,37 +719,37 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) :
         \li This property holds the position of the swipe relative to either
             side of the control. When this value reaches either
             \c -1.0 (left side) or \c 1.0 (right side) and the mouse button is
-            released, \c active will be \c true.
+            released, \c complete will be \c true.
     \row
-        \li active
-        \li This property holds whether the control is fully exposed. It is
-            equivalent to \c {!pressed && (position == -1.0 || position == 1.0)}.
+        \li complete
+        \li This property holds whether the control is fully exposed after
+            having been swiped to the left or right.
 
-            When active is \c true, any interactive items declared in \l left
-            or \l right will receive mouse events.
+            When complete is \c true, any interactive items declared in \c left,
+            \c right, or \c behind will receive mouse events.
     \row
         \li left
         \li This property holds the left delegate.
 
             The left delegate sits behind both \l {Control::}{contentItem} and
-            \l background. When the SwipeDelegate is swiped to the right, this item
-            will be gradually revealed.
+            \l {Control::}{background}. When the SwipeDelegate is swiped to the right,
+            this item will be gradually revealed.
     \row
         \li behind
         \li This property holds the delegate that is shown when the
             SwipeDelegate is swiped to both the left and right.
 
             As with the \c left and \c right delegates, it sits behind both
-            \l {Control::}{contentItem} and \l background. However, a SwipeDelegate
-            whose \c behind has been set can be continuously swiped from either
-            side, and will always show the same item.
+            \l {Control::}{contentItem} and \l {Control::}{background}. However, a
+            SwipeDelegate whose \c behind has been set can be continuously swiped
+            from either side, and will always show the same item.
     \row
         \li right
         \li This property holds the right delegate.
 
             The right delegate sits behind both \l {Control::}{contentItem} and
-            \l background. When the SwipeDelegate is swiped to the left, this item
-            will be gradually revealed.
+            \l {Control::}{background}. When the SwipeDelegate is swiped to the left,
+            this item will be gradually revealed.
     \row
         \li leftItem
         \li This property holds the item instantiated from the \c left component.
@@ -771,10 +772,10 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) :
 
     \sa {Control::}{contentItem}, {Control::}{background}
 */
-QQuickSwipeExposure *QQuickSwipeDelegate::exposure() const
+QQuickSwipe *QQuickSwipeDelegate::swipe() const
 {
     Q_D(const QQuickSwipeDelegate);
-    return const_cast<QQuickSwipeExposure*>(&d->exposure);
+    return const_cast<QQuickSwipe*>(&d->swipe);
 }
 
 static bool isChildOrGrandchildOf(QQuickItem *child, QQuickItem *item)
@@ -790,9 +791,9 @@ bool QQuickSwipeDelegate::childMouseEventFilter(QQuickItem *child, QEvent *event
     // items before these items won't allow us to get mouse events when the control is not currently exposed
     // but has been previously. Therefore, we instead call setFiltersChildMouseEvents(true) in the constructor
     // and filter out child events only when the child is the left/right/behind item.
-    const QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&d->exposure);
-    if (!isChildOrGrandchildOf(child, exposurePrivate->leftItem) && !isChildOrGrandchildOf(child, exposurePrivate->behindItem)
-        && !isChildOrGrandchildOf(child, exposurePrivate->rightItem)) {
+    const QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&d->swipe);
+    if (!isChildOrGrandchildOf(child, swipePrivate->leftItem) && !isChildOrGrandchildOf(child, swipePrivate->behindItem)
+        && !isChildOrGrandchildOf(child, swipePrivate->rightItem)) {
         return false;
     }
 
@@ -818,9 +819,9 @@ void QQuickSwipeDelegate::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QQuickSwipeDelegate);
     QQuickItemDelegate::mousePressEvent(event);
-    QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&d->exposure);
-    exposurePrivate->positionBeforePress = exposurePrivate->position;
-    exposurePrivate->velocityCalculator.startMeasuring(event->pos(), event->timestamp());
+    QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&d->swipe);
+    swipePrivate->positionBeforePress = swipePrivate->position;
+    swipePrivate->velocityCalculator.startMeasuring(event->pos(), event->timestamp());
 }
 
 void QQuickSwipeDelegate::mouseMoveEvent(QMouseEvent *event)
diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h
index fe4fd05d..b2bea3eb 100644
--- a/src/quicktemplates2/qquickswipedelegate_p.h
+++ b/src/quicktemplates2/qquickswipedelegate_p.h
@@ -53,17 +53,17 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickSwipeDelegatePrivate;
-class QQuickSwipeExposure;
+class QQuickSwipe;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
-    Q_PROPERTY(QQuickSwipeExposure *exposure READ exposure CONSTANT)
+    Q_PROPERTY(QQuickSwipe *swipe READ swipe CONSTANT)
 
 public:
     explicit QQuickSwipeDelegate(QQuickItem *parent = nullptr);
 
-    QQuickSwipeExposure *exposure() const;
+    QQuickSwipe *swipe() const;
 
 protected:
     bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
@@ -82,13 +82,13 @@ private:
     Q_DECLARE_PRIVATE(QQuickSwipeDelegate)
 };
 
-class QQuickSwipeExposurePrivate;
+class QQuickSwipePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeExposure : public QObject
+class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipe : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position NOTIFY positionChanged FINAL)
-    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged FINAL)
+    Q_PROPERTY(bool complete READ isComplete NOTIFY completeChanged FINAL)
     Q_PROPERTY(QQmlComponent *left READ left WRITE setLeft NOTIFY leftChanged FINAL)
     Q_PROPERTY(QQmlComponent *behind READ behind WRITE setBehind NOTIFY behindChanged FINAL)
     Q_PROPERTY(QQmlComponent *right READ right WRITE setRight NOTIFY rightChanged FINAL)
@@ -97,13 +97,13 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeExposure : public QObject
     Q_PROPERTY(QQuickItem *rightItem READ rightItem NOTIFY rightItemChanged FINAL)
 
 public:
-    explicit QQuickSwipeExposure(QQuickSwipeDelegate *control);
+    explicit QQuickSwipe(QQuickSwipeDelegate *control);
 
     qreal position() const;
     void setPosition(qreal position);
 
-    bool isActive() const;
-    void setActive(bool active);
+    bool isComplete() const;
+    void setComplete(bool complete);
 
     QQmlComponent *left() const;
     void setLeft(QQmlComponent *left);
@@ -125,7 +125,7 @@ public:
 
 Q_SIGNALS:
     void positionChanged();
-    void activeChanged();
+    void completeChanged();
     void leftChanged();
     void behindChanged();
     void rightChanged();
@@ -134,8 +134,8 @@ Q_SIGNALS:
     void rightItemChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickSwipeExposure)
-    Q_DECLARE_PRIVATE(QQuickSwipeExposure)
+    Q_DISABLE_COPY(QQuickSwipe)
+    Q_DECLARE_PRIVATE(QQuickSwipe)
 };
 
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index 45d3b15a..e5c98f4d 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Container
     \instantiates QQuickSwipeView
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-navigation
     \ingroup qtquickcontrols2-containers
     \brief Enables the user to navigate pages by swiping sideways.
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 380c37ec..439950d8 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickSwitch
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-buttons
     \brief An option button that can be toggled on or off.
 
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 190152b8..fbdae418 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
     \inherits ItemDelegate
     \instantiates QQuickSwitchDelegate
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-delegates
     \brief An item delegate that can be toggled on or off.
 
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index b4225060..a980a725 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
     \inherits Container
     \instantiates QQuickTabBar
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-navigation
     \ingroup qtquickcontrols2-containers
     \brief A bar with icons allowing to switch between different views or subtasks.
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp
index 617cdac3..14c21991 100644
--- a/src/quicktemplates2/qquicktabbutton.cpp
+++ b/src/quicktemplates2/qquicktabbutton.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits AbstractButton
     \instantiates QQuickTabButton
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-navigation
     \brief A tab button control that can be found on a TabBar.
 
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 69af1700..11fe7393 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
     \inherits TextEdit
     \instantiates QQuickTextArea
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief A multi line text input control.
 
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index bcbb7f1b..18a5932a 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE
     \inherits TextInput
     \instantiates QQuickTextField
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief A single line text input control.
 
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index edf0bebf..9342c27a 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
@@ -35,15 +35,16 @@
 ****************************************************************************/
 
 #include "qquicktoolbar_p.h"
-#include "qquickframe_p_p.h"
+#include "qquickpane_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype ToolBar
-    \inherits Frame
+    \inherits Pane
     \instantiates QQuickToolBar
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief A container with context-sensitive controls.
 
@@ -90,7 +91,7 @@ QT_BEGIN_NAMESPACE
     \sa ApplicationWindow, ToolButton, {Customizing ToolBar}, {Container Controls}
 */
 
-class QQuickToolBarPrivate : public QQuickFramePrivate
+class QQuickToolBarPrivate : public QQuickPanePrivate
 {
 public:
     QQuickToolBarPrivate() : position(QQuickToolBar::Header) { }
@@ -99,7 +100,7 @@ public:
 };
 
 QQuickToolBar::QQuickToolBar(QQuickItem *parent) :
-    QQuickFrame(*(new QQuickToolBarPrivate), parent)
+    QQuickPane(*(new QQuickToolBarPrivate), parent)
 {
 }
 
diff --git a/src/quicktemplates2/qquicktoolbar_p.h b/src/quicktemplates2/qquicktoolbar_p.h
index be0cf666..9fd85e40 100644
--- a/src/quicktemplates2/qquicktoolbar_p.h
+++ b/src/quicktemplates2/qquicktoolbar_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickTemplates2/private/qquickframe_p.h>
+#include <QtQuickTemplates2/private/qquickpane_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickToolBarPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolBar : public QQuickFrame
+class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolBar : public QQuickPane
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp
index c0bb529d..c1f47b97 100644
--- a/src/quicktemplates2/qquicktoolbutton.cpp
+++ b/src/quicktemplates2/qquicktoolbutton.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Button
     \instantiates QQuickToolButton
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-buttons
     \brief A button with a layout suitable for a ToolBar.
 
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 92ca7b80..3eee830b 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
     \inherits Popup
     \instantiates QQuickToolTip
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-popups
     \brief Provides tool tips for any control.
 
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index 852803f0..580859ef 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
     \inherits Control
     \instantiates QQuickTumbler
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-input
     \brief A spinnable wheel of items that can be selected.
 
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 20b5a551..50933c20 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1013,91 +1013,121 @@ TestCase {
         }
     }
 
+    function indexOf(array, item) {
+        for (var idx = 0; idx < array.length; ++idx) {
+            if (item === array[idx])
+                return idx;
+        }
+        return -1
+    }
+
+    function findOverlay(window, popup) {
+        var item = popup.contentItem.parent
+        var idx = indexOf(window.overlay.children, item)
+        return window.overlay.children[idx - 1]
+    }
+
     function test_overlay() {
         var window = overlayTest.createObject(testCase)
         verify(window)
 
         window.requestActivate()
         tryCompare(window, "active", true)
-        compare(window.overlay.modal.opacity, 0.0)
-        compare(window.overlay.modeless.opacity, 0.0)
+        compare(window.overlay.children.length, 6) // 3 drawers + 3 overlays
+
+        var firstOverlay = findOverlay(window, window.firstDrawer)
+        verify(firstOverlay)
+        compare(firstOverlay.opacity, 0.0)
+        compare(firstOverlay.z, window.firstDrawer.z)
+        compare(indexOf(window.overlay.children, firstOverlay),
+                indexOf(window.overlay.children, window.firstDrawer.contentItem.parent) - 1)
+
+        var secondOverlay = findOverlay(window, window.secondDrawer)
+        verify(secondOverlay)
+        compare(secondOverlay.opacity, 0.0)
+        compare(secondOverlay.z, window.secondDrawer.z)
+        compare(indexOf(window.overlay.children, secondOverlay),
+                indexOf(window.overlay.children, window.secondDrawer.contentItem.parent) - 1)
+
+        var upperOverlay = findOverlay(window, window.upperDrawer)
+        verify(upperOverlay)
+        compare(upperOverlay.opacity, 0.0)
+        compare(upperOverlay.z, window.upperDrawer.z)
+        compare(indexOf(window.overlay.children, upperOverlay),
+                indexOf(window.overlay.children, window.upperDrawer.contentItem.parent) - 1)
 
         window.firstDrawer.open()
-        compare(window.overlay.modal.z, 1.0)
-        tryCompare(window.overlay.modal, "opacity", 1.0)
+        compare(firstOverlay.z, 1.0)
+        tryCompare(firstOverlay, "opacity", 1.0)
         window.firstDrawer.close()
-        tryCompare(window.overlay.modal, "opacity", 0.0)
+        tryCompare(firstOverlay, "opacity", 0.0)
+        tryCompare(window.firstDrawer, "visible", false)
 
         window.secondDrawer.open()
-        compare(window.overlay.modal.z, 1.0)
-        tryCompare(window.overlay.modal, "opacity", 1.0)
+        compare(secondOverlay.z, 1.0)
+        tryCompare(secondOverlay, "opacity", 1.0)
         window.secondDrawer.close()
-        tryCompare(window.overlay.modal, "opacity", 0.0)
+        tryCompare(secondOverlay, "opacity", 0.0)
+        tryCompare(window.secondDrawer, "visible", false)
 
         window.firstDrawer.open()
         window.secondDrawer.open()
-        compare(window.overlay.modal.z, 1.0)
-        tryCompare(window.overlay.modal, "opacity", 1.0)
+        tryCompare(firstOverlay, "opacity", 1.0)
+        tryCompare(secondOverlay, "opacity", 1.0)
         window.firstDrawer.close()
         window.secondDrawer.close()
-        tryCompare(window.overlay.modal, "opacity", 0.0)
+        tryCompare(firstOverlay, "opacity", 0.0)
+        tryCompare(secondOverlay, "opacity", 0.0)
 
+        var modalOverlay = findOverlay(window, window.modalPopup)
+        verify(!modalOverlay)
         window.modalPopup.open()
-        compare(window.overlay.modal.z, 1.0)
+        modalOverlay = findOverlay(window, window.modalPopup)
+        verify(modalOverlay)
+        compare(modalOverlay.z, window.modalPopup.z)
         compare(window.modalPopup.visible, true)
-        tryCompare(window.overlay.modal, "opacity", 1.0)
+        tryCompare(modalOverlay, "opacity", 1.0)
 
+        var modelessOverlay = findOverlay(window, window.modelessPopup)
+        verify(!modelessOverlay)
         window.modelessPopup.open()
-        compare(window.overlay.modeless.z, 3.0)
+        modelessOverlay = findOverlay(window, window.modelessPopup)
+        verify(modelessOverlay)
+        compare(modelessOverlay.z, window.modelessPopup.z)
         compare(window.modelessPopup.visible, true)
-        tryCompare(window.overlay.modeless, "opacity", 1.0)
+        tryCompare(modelessOverlay, "opacity", 1.0)
 
         window.modelessPopup.close()
+        tryCompare(modelessOverlay, "opacity", 0.0)
         tryCompare(window.modelessPopup, "visible", false)
-        tryCompare(window.overlay.modeless, "opacity", 0.0)
-        compare(window.overlay.modeless.z, 0.0)
+        modelessOverlay = findOverlay(window, window.modelessPopup)
+        verify(!modelessOverlay)
 
         compare(window.modalPopup.visible, true)
-        compare(window.overlay.modal.opacity, 1.0)
+        compare(modalOverlay.opacity, 1.0)
 
         window.modalPopup.close()
+        tryCompare(modalOverlay, "opacity", 0.0)
         tryCompare(window.modalPopup, "visible", false)
-        tryCompare(window.overlay.modal, "opacity", 0.0)
-        compare(window.overlay.modal.z, 1.0)
+        modalOverlay = findOverlay(window, window.modalPopup)
+        verify(!modalOverlay)
 
+        var countBefore = window.overlay.children.length
         window.plainPopup.open()
         tryCompare(window.plainPopup, "visible", true)
-        compare(window.overlay.modal.opacity, 0.0)
-        compare(window.overlay.modeless.opacity, 0.0)
+        compare(window.overlay.children.length, countBefore + 1) // only popup added, no overlays involved
 
         window.plainPopup.close()
         tryCompare(window.plainPopup, "visible", false)
-        compare(window.overlay.modal.opacity, 0.0)
-        compare(window.overlay.modeless.opacity, 0.0)
+        compare(window.overlay.children.length, countBefore) // only popup removed, no overlays involved
 
         window.modalPopupWithoutDim.open()
         tryCompare(window.modalPopupWithoutDim, "visible", true)
-        compare(window.overlay.modal.opacity, 0.0)
-        compare(window.overlay.modeless.opacity, 0.0)
+        compare(window.overlay.children.length, countBefore + 1) // only popup added, no overlays involved
 
         window.modalPopupWithoutDim.close()
         tryCompare(window.modalPopupWithoutDim, "visible", false)
-        compare(window.overlay.modal.opacity, 0.0)
-        compare(window.overlay.modeless.opacity, 0.0)
-
-        window.upperDrawer.open()
-        compare(window.overlay.modal.z, 1.0)
-        tryCompare(window.overlay.modal, "opacity", 1.0)
-        window.upperDrawer.close()
-        tryCompare(window.overlay.modal, "opacity", 0.0)
-
-        window.firstDrawer.open()
-        window.upperDrawer.open()
-        compare(window.overlay.modal.z, 1.0)
-        tryCompare(window.overlay.modal, "opacity", 1.0)
-        window.firstDrawer.close()
-        window.upperDrawer.close()
-        tryCompare(window.overlay.modal, "opacity", 0.0)
+        compare(window.overlay.children.length, countBefore) // only popup added, no overlays involved
 
         window.destroy()
     }
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index ea775b5b..d8422706 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -89,7 +89,9 @@ TestCase {
         compare(control.stepSize, 1)
         compare(control.editable, false)
         compare(control.up.pressed, false)
+        compare(control.up.indicator.enabled, true)
         compare(control.down.pressed, false)
+        compare(control.down.indicator.enabled, false)
 
         control.destroy()
     }
@@ -118,23 +120,40 @@ TestCase {
         compare(control.from, 0)
         compare(control.to, 100)
         compare(control.value, 50)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, true)
 
         control.value = 1000
         compare(control.value, 100)
+        compare(control.up.indicator.enabled, false)
+        compare(control.down.indicator.enabled, true)
 
         control.value = -1
         compare(control.value, 0)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, false)
 
         control.from = 25
         compare(control.from, 25)
         compare(control.value, 25)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, false)
 
         control.to = 75
         compare(control.to, 75)
         compare(control.value, 25)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, false)
 
         control.value = 50
         compare(control.value, 50)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, true)
+
+        control.to = 40;
+        compare(control.value, 40)
+        compare(control.up.indicator.enabled, false)
+        compare(control.down.indicator.enabled, true)
 
         control.destroy()
     }
@@ -146,15 +165,23 @@ TestCase {
         compare(control.from, 100)
         compare(control.to, -100)
         compare(control.value, 0)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, true)
 
         control.value = 200
         compare(control.value, 100)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, false)
 
         control.value = -200
         compare(control.value, -100)
+        compare(control.up.indicator.enabled, false)
+        compare(control.down.indicator.enabled, true)
 
         control.value = 0
         compare(control.value, 0)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, true)
 
         control.destroy()
     }
@@ -180,9 +207,28 @@ TestCase {
         compare(control.down.pressed, false)
         compare(control.value, 50)
 
+        // Disable the up button and try again.
+        control.value = control.to
+        compare(control.up.indicator.enabled, false)
+
+        mousePress(control.up.indicator)
+        compare(upPressedSpy.count, 2)
+        compare(control.up.pressed, false)
+        compare(downPressedSpy.count, 0)
+        compare(control.down.pressed, false)
+        compare(control.value, control.to)
+
+        mouseRelease(control.up.indicator)
+        compare(upPressedSpy.count, 2)
+        compare(control.up.pressed, false)
+        compare(downPressedSpy.count, 0)
+        compare(control.down.pressed, false)
+        compare(control.value, control.to)
+
         downPressedSpy.target = control.down
         verify(downPressedSpy.valid)
 
+        control.value = 50;
         mousePress(control.down.indicator)
         compare(downPressedSpy.count, 1)
         compare(control.down.pressed, true)
@@ -197,6 +243,24 @@ TestCase {
         compare(control.up.pressed, false)
         compare(control.value, 0)
 
+        // Disable the down button and try again.
+        control.value = control.from
+        compare(control.down.indicator.enabled, false)
+
+        mousePress(control.down.indicator)
+        compare(downPressedSpy.count, 2)
+        compare(control.down.pressed, false)
+        compare(upPressedSpy.count, 2)
+        compare(control.up.pressed, false)
+        compare(control.value, control.from)
+
+        mouseRelease(control.down.indicator)
+        compare(downPressedSpy.count, 2)
+        compare(control.down.pressed, false)
+        compare(upPressedSpy.count, 2)
+        compare(control.up.pressed, false)
+        compare(control.value, control.from)
+
         control.destroy()
     }
 
@@ -253,32 +317,42 @@ TestCase {
         compare(control.stepSize, 25)
 
         for (var d2 = 1; d2 <= 10; ++d2) {
+            var wasDownEnabled = control.value > control.from
             keyPress(Qt.Key_Down)
-            compare(control.down.pressed, true)
+            compare(control.down.pressed, wasDownEnabled)
             compare(control.up.pressed, false)
-            compare(downPressedSpy.count, ++downPressedCount)
+            if (wasDownEnabled)
+                ++downPressedCount
+            compare(downPressedSpy.count, downPressedCount)
 
             compare(control.value, Math.max(0, 50 - d2 * 25))
 
             keyRelease(Qt.Key_Down)
             compare(control.down.pressed, false)
             compare(control.up.pressed, false)
-            compare(downPressedSpy.count, ++downPressedCount)
+            if (wasDownEnabled)
+                ++downPressedCount
+            compare(downPressedSpy.count, downPressedCount)
         }
         compare(control.value, 0)
 
         for (var i2 = 1; i2 <= 10; ++i2) {
+            var wasUpEnabled = control.value < control.to
             keyPress(Qt.Key_Up)
-            compare(control.up.pressed, true)
+            compare(control.up.pressed, wasUpEnabled)
             compare(control.down.pressed, false)
-            compare(upPressedSpy.count, ++upPressedCount)
+            if (wasUpEnabled)
+                ++upPressedCount
+            compare(upPressedSpy.count, upPressedCount)
 
             compare(control.value, Math.min(99, i2 * 25))
 
             keyRelease(Qt.Key_Up)
             compare(control.down.pressed, false)
             compare(control.up.pressed, false)
-            compare(upPressedSpy.count, ++upPressedCount)
+            if (wasUpEnabled)
+                ++upPressedCount
+            compare(upPressedSpy.count, upPressedCount)
         }
         compare(control.value, 99)
 
@@ -385,4 +459,23 @@ TestCase {
 
         control.destroy()
     }
+
+    function test_initiallyDisabledIndicators_data() {
+        return [
+            { tag: "down disabled", from: 0, value: 0, to: 99, upEnabled: true, downEnabled: false },
+            { tag: "up disabled", from: 0, value: 99, to: 99, upEnabled: false, downEnabled: true },
+            { tag: "inverted, down disabled", from: 99, value: 99, to: 0, upEnabled: true, downEnabled: false },
+            { tag: "inverted, up disabled", from: 99, value: 0, to: 0, upEnabled: false, downEnabled: true }
+        ]
+    }
+
+    function test_initiallyDisabledIndicators(data) {
+        var control = spinBox.createObject(testCase, { from: data.from, value: data.value, to: data.to })
+        verify(control)
+
+        compare(control.up.indicator.enabled, data.upEnabled)
+        compare(control.down.indicator.enabled, data.downEnabled)
+
+        control.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 59b37e8d..6666589f 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -79,8 +79,8 @@ TestCase {
             id: swipeDelegate
             text: "SwipeDelegate"
             width: 150
-            exposure.left: greenLeftComponent
-            exposure.right: redRightComponent
+            swipe.left: greenLeftComponent
+            swipe.right: redRightComponent
         }
     }
 
@@ -89,9 +89,9 @@ TestCase {
         verify(control);
 
         compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset);
-        compare(control.exposure.position, 0);
+        compare(control.swipe.position, 0);
         verify(!control.pressed);
-        verify(!control.exposure.active);
+        verify(!control.swipe.complete);
 
         control.destroy();
     }
@@ -105,25 +105,25 @@ TestCase {
     // Assumes that the delegate is smaller than the width of the control.
     function swipe(control, from, to) {
         // Sanity check.
-        compare(control.exposure.position, from);
+        compare(control.swipe.position, from);
 
         var distance = (to - from) * control.width;
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
         mouseMove(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton);
         mouseRelease(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, to);
-
-        if (control.exposure.position === -1.0) {
-            if (control.exposure.right)
-                verify(control.exposure.rightItem);
-            else if (control.exposure.behind)
-                verify(control.exposure.behindItem);
-        } else if (control.exposure.position === 1.0) {
-            if (control.exposure.left)
-                verify(control.exposure.leftItem);
-            else if (control.exposure.behind)
-                verify(control.exposure.behindItem);
+        compare(control.swipe.position, to);
+
+        if (control.swipe.position === -1.0) {
+            if (control.swipe.right)
+                verify(control.swipe.rightItem);
+            else if (control.swipe.behind)
+                verify(control.swipe.behindItem);
+        } else if (control.swipe.position === 1.0) {
+            if (control.swipe.left)
+                verify(control.swipe.leftItem);
+            else if (control.swipe.behind)
+                verify(control.swipe.behindItem);
         }
     }
 
@@ -133,57 +133,57 @@ TestCase {
 
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
             ":78:9: QML SwipeDelegate: cannot set both behind and left/right properties")
-        control.exposure.behind = itemComponent;
+        control.swipe.behind = itemComponent;
 
         // Shouldn't be any warnings when unsetting delegates.
-        control.exposure.left = null;
-        compare(control.exposure.leftItem, null);
+        control.swipe.left = null;
+        compare(control.swipe.leftItem, null);
 
         // right is still set.
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
             ":78:9: QML SwipeDelegate: cannot set both behind and left/right properties")
-        control.exposure.behind = itemComponent;
+        control.swipe.behind = itemComponent;
 
-        control.exposure.right = null;
-        compare(control.exposure.rightItem, null);
+        control.swipe.right = null;
+        compare(control.swipe.rightItem, null);
 
-        control.exposure.behind = itemComponent;
+        control.swipe.behind = itemComponent;
 
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
             ":78:9: QML SwipeDelegate: cannot set both behind and left/right properties")
-        control.exposure.left = itemComponent;
+        control.swipe.left = itemComponent;
 
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
             ":78:9: QML SwipeDelegate: cannot set both behind and left/right properties")
-        control.exposure.right = itemComponent;
+        control.swipe.right = itemComponent;
 
-        control.exposure.behind = null;
-        control.exposure.left = greenLeftComponent;
-        control.exposure.right = redRightComponent;
+        control.swipe.behind = null;
+        control.swipe.left = greenLeftComponent;
+        control.swipe.right = redRightComponent;
 
         // Test that the user is warned when attempting to set or unset left or
         // right item while they're exposed.
         // First, try the left item.
         swipe(control, 0.0, 1.0);
 
-        var oldLeft = control.exposure.left;
-        var oldLeftItem = control.exposure.leftItem;
+        var oldLeft = control.swipe.left;
+        var oldLeftItem = control.swipe.leftItem;
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":78:9: QML SwipeDelegate: left/right/behind properties may only be set when exposure.position is 0")
-        control.exposure.left = null;
-        compare(control.exposure.left, oldLeft);
-        compare(control.exposure.leftItem, oldLeftItem);
+            ":78:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
+        control.swipe.left = null;
+        compare(control.swipe.left, oldLeft);
+        compare(control.swipe.leftItem, oldLeftItem);
 
         // Try the same thing with the right item.
         swipe(control, 1.0, -1.0);
 
-        var oldRight = control.exposure.right;
-        var oldRightItem = control.exposure.rightItem;
+        var oldRight = control.swipe.right;
+        var oldRightItem = control.swipe.rightItem;
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":78:9: QML SwipeDelegate: left/right/behind properties may only be set when exposure.position is 0")
-        control.exposure.right = null;
-        compare(control.exposure.right, oldRight);
-        compare(control.exposure.rightItem, oldRightItem);
+            ":78:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
+        control.swipe.right = null;
+        compare(control.swipe.right, oldRight);
+        compare(control.swipe.rightItem, oldRightItem);
 
         // Return to the default position.
         swipe(control, -1.0, 0.0);
@@ -191,25 +191,25 @@ TestCase {
         tryCompare(control.background, "x", 0, 1000);
 
         // Try the same thing with the behind item.
-        control.exposure.left = null;
-        verify(!control.exposure.left);
-        verify(!control.exposure.leftItem);
-        control.exposure.right = null;
-        verify(!control.exposure.right);
-        verify(!control.exposure.rightItem);
-        control.exposure.behind = greenLeftComponent;
-        verify(control.exposure.behind);
-        verify(!control.exposure.behindItem);
+        control.swipe.left = null;
+        verify(!control.swipe.left);
+        verify(!control.swipe.leftItem);
+        control.swipe.right = null;
+        verify(!control.swipe.right);
+        verify(!control.swipe.rightItem);
+        control.swipe.behind = greenLeftComponent;
+        verify(control.swipe.behind);
+        verify(!control.swipe.behindItem);
 
         swipe(control, 0.0, 1.0);
 
-        var oldBehind = control.exposure.behind;
-        var oldBehindItem = control.exposure.behindItem;
+        var oldBehind = control.swipe.behind;
+        var oldBehindItem = control.swipe.behindItem;
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":78:9: QML SwipeDelegate: left/right/behind properties may only be set when exposure.position is 0")
-        control.exposure.behind = null;
-        compare(control.exposure.behind, oldBehind);
-        compare(control.exposure.behindItem, oldBehindItem);
+            ":78:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
+        control.swipe.behind = null;
+        compare(control.swipe.behind, oldBehind);
+        compare(control.swipe.behindItem, oldBehindItem);
 
         control.destroy();
     }
@@ -229,89 +229,89 @@ TestCase {
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, 0.0);
-        verify(!control.exposure.active);
+        compare(control.swipe.position, 0.0);
+        verify(!control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
-        verify(!control.exposure.leftItem);
-        verify(!control.exposure.rightItem);
+        verify(!control.swipe.leftItem);
+        verify(!control.swipe.rightItem);
 
         // Drag to the right so that leftItem is created and visible.
         mouseMove(control, control.width / 2 + overDragDistance, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, overDragDistance / control.width);
-        verify(!control.exposure.active);
-        verify(control.exposure.leftItem);
-        verify(control.exposure.leftItem.visible);
-        compare(control.exposure.leftItem.parent, control);
-        compare(control.exposure.leftItem.objectName, "leftItem");
-        verify(!control.exposure.rightItem);
+        compare(control.swipe.position, overDragDistance / control.width);
+        verify(!control.swipe.complete);
+        verify(control.swipe.leftItem);
+        verify(control.swipe.leftItem.visible);
+        compare(control.swipe.leftItem.parent, control);
+        compare(control.swipe.leftItem.objectName, "leftItem");
+        verify(!control.swipe.rightItem);
 
         // Go back to 0.
         mouseMove(control, control.width / 2, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, 0.0);
-        verify(!control.exposure.active);
-        verify(control.exposure.leftItem);
-        verify(control.exposure.leftItem.visible);
-        compare(control.exposure.leftItem.parent, control);
-        compare(control.exposure.leftItem.objectName, "leftItem");
-        verify(!control.exposure.rightItem);
+        compare(control.swipe.position, 0.0);
+        verify(!control.swipe.complete);
+        verify(control.swipe.leftItem);
+        verify(control.swipe.leftItem.visible);
+        compare(control.swipe.leftItem.parent, control);
+        compare(control.swipe.leftItem.objectName, "leftItem");
+        verify(!control.swipe.rightItem);
 
         // Try the other direction. The right item should be created and visible,
         // and the left item should be hidden.
         mouseMove(control, control.width / 2 - overDragDistance, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, -overDragDistance / control.width);
-        verify(!control.exposure.active);
-        verify(control.exposure.leftItem);
-        verify(!control.exposure.leftItem.visible);
-        verify(control.exposure.rightItem);
-        verify(control.exposure.rightItem.visible);
-        compare(control.exposure.rightItem.parent, control);
-        compare(control.exposure.rightItem.objectName, "rightItem");
+        compare(control.swipe.position, -overDragDistance / control.width);
+        verify(!control.swipe.complete);
+        verify(control.swipe.leftItem);
+        verify(!control.swipe.leftItem.visible);
+        verify(control.swipe.rightItem);
+        verify(control.swipe.rightItem.visible);
+        compare(control.swipe.rightItem.parent, control);
+        compare(control.swipe.rightItem.objectName, "rightItem");
 
         // Now release outside the right edge of the control.
         mouseMove(control, control.width * 1.1, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, 0.6);
-        verify(!control.exposure.active);
-        verify(control.exposure.leftItem);
-        verify(control.exposure.leftItem.visible);
-        verify(control.exposure.rightItem);
-        verify(!control.exposure.rightItem.visible);
+        compare(control.swipe.position, 0.6);
+        verify(!control.swipe.complete);
+        verify(control.swipe.leftItem);
+        verify(control.swipe.leftItem.visible);
+        verify(control.swipe.rightItem);
+        verify(!control.swipe.rightItem.visible);
 
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width / 2, control.height / 2);
         verify(!control.pressed);
-        compare(control.exposure.position, 1.0);
-        verify(control.exposure.active);
+        compare(control.swipe.position, 1.0);
+        verify(control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
-        verify(control.exposure.leftItem);
-        verify(control.exposure.leftItem.visible);
-        verify(control.exposure.rightItem);
-        verify(!control.exposure.rightItem.visible);
+        verify(control.swipe.leftItem);
+        verify(control.swipe.leftItem.visible);
+        verify(control.swipe.rightItem);
+        verify(!control.swipe.rightItem.visible);
         tryCompare(control.contentItem, "x", control.width + control.leftPadding);
 
         // Swiping from the right and releasing early should return position to 1.0.
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, 1.0);
-        // exposed should still be true, because we haven't moved yet, and hence
+        compare(control.swipe.position, 1.0);
+        // complete should still be true, because we haven't moved yet, and hence
         // haven't started grabbing behind's mouse events.
-        verify(control.exposure.active);
+        verify(control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
 
         mouseMove(control, control.width / 2 - overDragDistance, control.height / 2);
         verify(control.pressed);
-        verify(!control.exposure.active);
-        compare(control.exposure.position, 1.0 - overDragDistance / control.width);
+        verify(!control.swipe.complete);
+        compare(control.swipe.position, 1.0 - overDragDistance / control.width);
 
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width * 0.4, control.height / 2);
         verify(!control.pressed);
-        compare(control.exposure.position, 1.0);
-        verify(control.exposure.active);
+        compare(control.swipe.position, 1.0);
+        verify(control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
         tryCompare(control.contentItem, "x", control.width + control.leftPadding);
 
@@ -319,20 +319,20 @@ TestCase {
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, 1.0);
-        verify(control.exposure.active);
+        compare(control.swipe.position, 1.0);
+        verify(control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
 
         mouseMove(control, control.width * -0.1, control.height / 2);
         verify(control.pressed);
-        verify(!control.exposure.active);
-        compare(control.exposure.position, 0.4);
+        verify(!control.swipe.complete);
+        compare(control.swipe.position, 0.4);
 
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width * -0.1, control.height / 2);
         verify(!control.pressed);
-        compare(control.exposure.position, 0.0);
-        verify(!control.exposure.active);
+        compare(control.swipe.position, 0.0);
+        verify(!control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
         tryCompare(control.contentItem, "x", control.leftPadding);
 
@@ -362,19 +362,19 @@ TestCase {
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, 0.0);
-        verify(!control.exposure.active);
+        compare(control.swipe.position, 0.0);
+        verify(!control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
-        verify(!control.exposure.leftItem);
-        verify(!control.exposure.rightItem);
+        verify(!control.swipe.leftItem);
+        verify(!control.swipe.rightItem);
 
         // Swipe quickly to the side over a distance that is longer than the drag threshold,
         // quicker than the expose velocity threshold, but shorter than the halfway mark.
         mouseMove(control, control.width / 2 + distance, control.height / 2);
         verify(control.pressed);
-        compare(control.exposure.position, distance / control.width);
-        verify(control.exposure.position < 0.5);
-        verify(!control.exposure.active);
+        compare(control.swipe.position, distance / control.width);
+        verify(control.swipe.position < 0.5);
+        verify(!control.swipe.complete);
 
         var expectedVisibleItem;
         var expectedVisibleObjectName;
@@ -382,13 +382,13 @@ TestCase {
         var expectedContentItemX;
         if (distance > 0) {
             expectedVisibleObjectName = "leftItem";
-            expectedVisibleItem = control.exposure.leftItem;
-            expectedHiddenItem = control.exposure.rightItem;
+            expectedVisibleItem = control.swipe.leftItem;
+            expectedHiddenItem = control.swipe.rightItem;
             expectedContentItemX = control.width + control.leftPadding;
         } else {
             expectedVisibleObjectName = "rightItem";
-            expectedVisibleItem = control.exposure.rightItem;
-            expectedHiddenItem = control.exposure.leftItem;
+            expectedVisibleItem = control.swipe.rightItem;
+            expectedHiddenItem = control.swipe.leftItem;
             expectedContentItemX = -control.width + control.leftPadding;
         }
         verify(expectedVisibleItem);
@@ -402,8 +402,8 @@ TestCase {
         // and hence that the second timestamp isn't zero (can happen with e.g. release builds).
         mouseRelease(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton, Qt.NoModifier, 30);
         verify(!control.pressed);
-        compare(control.exposure.position, data.direction);
-        verify(control.exposure.active);
+        compare(control.swipe.position, data.direction);
+        verify(control.swipe.complete);
         verify(mouseSignalSequenceSpy.success);
         verify(expectedVisibleItem);
         verify(expectedVisibleItem.visible);
@@ -418,7 +418,7 @@ TestCase {
         SwipeDelegate {
             text: "SwipeDelegate"
             width: 150
-            exposure.right: Button {
+            swipe.right: Button {
                 width: parent.width
                 height: parent.height
                 text: "Boo!"
@@ -433,14 +433,14 @@ TestCase {
         // The button should be pressed instead of the SwipeDelegate.
         mouseDrag(control, control.width / 2, control.height / 2,  -control.width, 0);
         verify(!control.pressed);
-        compare(control.exposure.position, -1.0);
-        verify(control.exposure.rightItem);
-        verify(control.exposure.rightItem.visible);
-        compare(control.exposure.rightItem.parent, control);
+        compare(control.swipe.position, -1.0);
+        verify(control.swipe.rightItem);
+        verify(control.swipe.rightItem.visible);
+        compare(control.swipe.rightItem.parent, control);
 
         mousePress(control, control.width / 2, control.height / 2);
         verify(!control.pressed);
-        var button = control.exposure.rightItem;
+        var button = control.swipe.rightItem;
         verify(button.pressed);
 
         mouseRelease(control, control.width / 2, control.height / 2);
@@ -449,7 +449,7 @@ TestCase {
         // Returning back to a position of 0 and pressing on the control should
         // result in the control being pressed.
         mouseDrag(control, control.width / 2, control.height / 2, control.width * 0.6, 0);
-        compare(control.exposure.position, 0);
+        compare(control.swipe.position, 0);
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
         verify(!button.pressed);
@@ -524,7 +524,7 @@ TestCase {
                 text: modelData
                 width: listView.width
 
-                onClicked: if (exposure.active) ListView.view.model.remove(index)
+                onClicked: if (swipe.complete) ListView.view.model.remove(index)
 
                 property alias removeAnimation: onRemoveAnimation
 
@@ -549,8 +549,8 @@ TestCase {
                     }
                 }
 
-                exposure.left: Rectangle {
-                    color: rootDelegate.exposure.active && rootDelegate.pressed ? "#333" : "#444"
+                swipe.left: Rectangle {
+                    color: rootDelegate.swipe.complete && rootDelegate.pressed ? "#333" : "#444"
                     anchors.fill: parent
 
                     Label {
@@ -573,18 +573,18 @@ TestCase {
         var firstItem = listView.itemAt(0, 0);
         mousePress(listView, firstItem.width / 2, firstItem.height / 2);
         verify(firstItem.pressed);
-        compare(firstItem.exposure.position, 0.0);
-        verify(!firstItem.exposure.active);
+        compare(firstItem.swipe.position, 0.0);
+        verify(!firstItem.swipe.complete);
 
         mouseMove(listView, firstItem.width * 1.1, firstItem.height / 2);
         verify(firstItem.pressed);
-        compare(firstItem.exposure.position, 0.6);
-        verify(!firstItem.exposure.active);
+        compare(firstItem.swipe.position, 0.6);
+        verify(!firstItem.swipe.complete);
 
         mouseRelease(listView, firstItem.width / 2, firstItem.height / 2);
         verify(!firstItem.pressed);
-        compare(firstItem.exposure.position, 1.0);
-        verify(firstItem.exposure.active);
+        compare(firstItem.swipe.position, 1.0);
+        verify(firstItem.swipe.complete);
         compare(listView.count, 3);
 
         // Wait for it to settle down.
@@ -617,14 +617,14 @@ TestCase {
             width: 150
             text: "SwipeDelegate"
 
-            exposure.left: Rectangle {
+            swipe.left: Rectangle {
                 x: delegate.background.x - width
                 width: delegate.width
                 height: delegate.height
                 color: "green"
             }
 
-            exposure.right: Rectangle {
+            swipe.right: Rectangle {
                 x: delegate.background.x + delegate.background.width
                 width: delegate.width
                 height: delegate.height
@@ -640,14 +640,14 @@ TestCase {
             width: 150
             text: "SwipeDelegate"
 
-            exposure.left: Rectangle {
+            swipe.left: Rectangle {
                 anchors.right: delegate.background.left
                 width: delegate.width
                 height: delegate.height
                 color: "green"
             }
 
-            exposure.right: Rectangle {
+            swipe.right: Rectangle {
                 anchors.left: delegate.background.right
                 width: delegate.width
                 height: delegate.height
@@ -669,8 +669,8 @@ TestCase {
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
         mouseMove(control, control.width, control.height / 2, Qt.LeftButton);
-        verify(control.exposure.leftItem);
-        compare(control.exposure.leftItem.x, -control.width / 2);
+        verify(control.swipe.leftItem);
+        compare(control.swipe.leftItem.x, -control.width / 2);
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton);
 
         control.destroy();
@@ -683,11 +683,11 @@ TestCase {
         // Should be limited within the range -1.0 to 1.0.
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
         mouseMove(control, control.width * 1.5, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 1.0);
+        compare(control.swipe.position, 1.0);
         mouseMove(control, control.width * 1.6, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 1.0);
+        compare(control.swipe.position, 1.0);
         mouseMove(control, control.width * -1.6, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, -1.0);
+        compare(control.swipe.position, -1.0);
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton);
 
         control.destroy();
@@ -712,34 +712,34 @@ TestCase {
         }
     }
 
-    // exposure.position should be scaled to the width of the relevant delegate,
+    // swipe.position should be scaled to the width of the relevant delegate,
     // and it shouldn't be possible to drag past the delegate (so that content behind the control is visible).
     function test_delegateWidth() {
         var control = emptySwipeDelegateComponent.createObject(testCase);
         verify(control);
 
-        control.exposure.left = smallLeftComponent;
+        control.swipe.left = smallLeftComponent;
 
         // Ensure that the position is scaled to the width of the currently visible delegate.
         var overDragDistance = dragDistance * 1.1;
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
         mouseMove(control, control.width / 2 + overDragDistance, control.height / 2, Qt.LeftButton);
-        verify(control.exposure.leftItem);
-        compare(control.exposure.position, overDragDistance / control.exposure.leftItem.width);
+        verify(control.swipe.leftItem);
+        compare(control.swipe.position, overDragDistance / control.swipe.leftItem.width);
 
-        mouseMove(control, control.width / 2 + control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 1.0);
+        mouseMove(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 1.0);
 
         // Ensure that it's not possible to drag past the (left) delegate.
-        mouseMove(control, control.width / 2 + control.exposure.leftItem.width + 1, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 1.0);
+        mouseMove(control, control.width / 2 + control.swipe.leftItem.width + 1, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 1.0);
 
         // Now release over the right side; the position should be 1.0 and the background
         // should be "anchored" to the right side of the left delegate item.
-        mouseMove(control, control.width / 2 + control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
-        mouseRelease(control, control.width / 2 + control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 1.0);
-        tryCompare(control.background, "x", control.exposure.leftItem.width, 1000);
+        mouseMove(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseRelease(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 1.0);
+        tryCompare(control.background, "x", control.swipe.leftItem.width, 1000);
 
         control.destroy();
     }
@@ -754,51 +754,51 @@ TestCase {
         signalName: "visibleChanged"
     }
 
-    function test_positionAfterExposureMadeActive() {
+    function test_positionAfterSwipeCompleted() {
         var control = swipeDelegateComponent.createObject(testCase);
         verify(control);
 
         // Ensure that both delegates are constructed.
         mousePress(control, 0, control.height / 2, Qt.LeftButton);
         mouseMove(control, control.width * 1.1, control.height / 2, Qt.LeftButton);
-        verify(control.exposure.leftItem);
+        verify(control.swipe.leftItem);
         mouseMove(control, control.width * -0.1, control.height / 2, Qt.LeftButton);
-        verify(control.exposure.rightItem);
+        verify(control.swipe.rightItem);
 
         // Expose the left delegate.
-        mouseMove(control, control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
-        mouseRelease(control, control.exposure.leftItem.width, control.height / 2);
-        verify(control.exposure.active);
-        compare(control.exposure.position, 1.0);
+        mouseMove(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseRelease(control, control.swipe.leftItem.width, control.height / 2);
+        verify(control.swipe.complete);
+        compare(control.swipe.position, 1.0);
 
-        leftVisibleSpy.target = control.exposure.leftItem;
-        rightVisibleSpy.target = control.exposure.rightItem;
+        leftVisibleSpy.target = control.swipe.leftItem;
+        rightVisibleSpy.target = control.swipe.rightItem;
 
         // Swipe from right to left without exposing the right item,
         // and make sure that the right item never becomes visible
         // (and hence that the left item never loses visibility).
-        mousePress(control, control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
+        mousePress(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
         compare(leftVisibleSpy.count, 0);
         compare(rightVisibleSpy.count, 0);
-        var newX = control.exposure.leftItem.width - dragDistance * 1.1;
+        var newX = control.swipe.leftItem.width - dragDistance * 1.1;
         mouseMove(control, newX, control.height / 2, Qt.LeftButton, Qt.LeftButton);
         compare(leftVisibleSpy.count, 0);
         compare(rightVisibleSpy.count, 0);
-        compare(control.exposure.position, newX / control.exposure.leftItem.width);
+        compare(control.swipe.position, newX / control.swipe.leftItem.width);
 
         mouseMove(control, 0, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 0);
+        compare(control.swipe.position, 0);
 
         // Test swiping over a distance that is greater than the width of the left item.
         mouseMove(control, -1, control.height / 2, Qt.LeftButton);
-        verify(control.exposure.rightItem);
-        compare(control.exposure.position, -1 / control.exposure.rightItem.width);
+        verify(control.swipe.rightItem);
+        compare(control.swipe.position, -1 / control.swipe.rightItem.width);
 
         // Now go back to 1.0.
-        mouseMove(control, control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 1.0);
-        tryCompare(control.background, "x", control.exposure.leftItem.width, 1000);
-        mouseRelease(control, control.exposure.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 1.0);
+        tryCompare(control.background, "x", control.swipe.leftItem.width, 1000);
+        mouseRelease(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
 
         control.destroy();
     }
@@ -808,22 +808,22 @@ TestCase {
 //        id: behindSwipeDelegateComponent
 //        SwipeDelegate {
 //            anchors.centerIn: parent
-//            exposure.behind: Rectangle {
+//            swipe.behind: Rectangle {
 //                onXChanged: print("x changed", x)
 //                anchors.left: {
-//                    print("anchors.left expression", exposure.position)
-//                    exposure.position < 0 ? parent.background.right : undefined
+//                    print("anchors.left expression", swipe.position)
+//                    swipe.position < 0 ? parent.background.right : undefined
 //                }
 //                anchors.right: {
-//                    print("anchors.right expression", exposure.position)
-//                    exposure.position > 0 ? parent.background.left : undefined
+//                    print("anchors.right expression", swipe.position)
+//                    swipe.position > 0 ? parent.background.left : undefined
 //                }
 //                width: parent.width
 //                height: parent.height
 //                color: "green"
 //            }
-//            exposure.left: null
-//            exposure.right: null
+//            swipe.left: null
+//            swipe.right: null
 //            Rectangle {
 //                anchors.fill: parent
 //                color: "transparent"
@@ -838,15 +838,15 @@ TestCase {
             text: "SwipeDelegate"
             width: 150
             anchors.centerIn: parent
-            exposure.behind: Rectangle {
-                x: exposure.position < 0 ? parent.background.x + parent.background.width
-                    : (exposure.position > 0 ? parent.background.x - width : 0)
+            swipe.behind: Rectangle {
+                x: swipe.position < 0 ? parent.background.x + parent.background.width
+                    : (swipe.position > 0 ? parent.background.x - width : 0)
                 width: parent.width
                 height: parent.height
                 color: "green"
             }
-            exposure.left: null
-            exposure.right: null
+            swipe.left: null
+            swipe.right: null
         }
     }
 
@@ -855,34 +855,34 @@ TestCase {
         verify(control);
 
         swipe(control, 0.0, 1.0);
-        verify(control.exposure.behindItem.visible);
-        compare(control.exposure.behindItem.x, control.background.x - control.background.width);
+        verify(control.swipe.behindItem.visible);
+        compare(control.swipe.behindItem.x, control.background.x - control.background.width);
 
         swipe(control, 1.0, -1.0);
-        verify(control.exposure.behindItem.visible);
-        compare(control.exposure.behindItem.x, control.background.x + control.background.width);
+        verify(control.swipe.behindItem.visible);
+        compare(control.swipe.behindItem.x, control.background.x + control.background.width);
 
         swipe(control, -1.0, 1.0);
-        verify(control.exposure.behindItem.visible);
-        compare(control.exposure.behindItem.x, control.background.x - control.background.width);
+        verify(control.swipe.behindItem.visible);
+        compare(control.swipe.behindItem.x, control.background.x - control.background.width);
 
         // Should be possible to "wrap" with a behind delegate specified.
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2 + control.exposure.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, -0.2);
-        mouseRelease(control, control.width / 2 + control.exposure.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 0.0);
+        mouseMove(control, control.width / 2 + control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, -0.2);
+        mouseRelease(control, control.width / 2 + control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 0.0);
 
         // Try wrapping the other way.
         swipe(control, 0.0, -1.0);
-        verify(control.exposure.behindItem.visible);
-        compare(control.exposure.behindItem.x, control.background.x + control.background.width);
+        verify(control.swipe.behindItem.visible);
+        compare(control.swipe.behindItem.x, control.background.x + control.background.width);
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2 - control.exposure.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 0.2);
-        mouseRelease(control, control.width / 2 - control.exposure.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
-        compare(control.exposure.position, 0.0);
+        mouseMove(control, control.width / 2 - control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 0.2);
+        mouseRelease(control, control.width / 2 - control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
+        compare(control.swipe.position, 0.0);
 
         control.destroy();
     }
diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml
index 5d98a707..593b5ccb 100644
--- a/tests/auto/material/data/tst_material.qml
+++ b/tests/auto/material/data/tst_material.qml
@@ -162,6 +162,14 @@ TestCase {
         }
     }
 
+    // need to be synced with QQuickMaterialStyle::themeShade()
+    function themeshade(theme) {
+        if (theme === Material.Light)
+            return Material.Shade500
+        else
+            return Material.Shade200
+    }
+
     function test_defaults() {
         var control = button.createObject(testCase)
         verify(control)
@@ -183,9 +191,8 @@ TestCase {
         control.Material.foreground = Material.Blue
         control.Material.theme = Material.Dark
         compare(control.Material.primary, Material.color(Material.Green))
-        expectFail("", "QTBUG-53556")
-        compare(control.Material.accent, Material.color(Material.Brown))
-        compare(control.Material.background, Material.color(Material.Red))
+        compare(control.Material.accent, Material.color(Material.Brown, themeshade(control.Material.theme)))
+        compare(control.Material.background, Material.color(Material.Red, themeshade(control.Material.theme)))
         compare(control.Material.foreground, Material.color(Material.Blue))
         compare(control.Material.theme, Material.Dark)
         control.destroy()
@@ -195,9 +202,8 @@ TestCase {
         var control = styledButton.createObject(testCase)
         verify(control)
         compare(control.Material.primary, Material.color(Material.DeepOrange))
-        expectFail("", "QTBUG-53556")
-        compare(control.Material.accent, Material.color(Material.DeepPurple))
-        compare(control.Material.background, Material.color(Material.Green))
+        compare(control.Material.accent, Material.color(Material.DeepPurple, themeshade(control.Material.theme)))
+        compare(control.Material.background, Material.color(Material.Green, themeshade(control.Material.theme)))
         compare(control.Material.foreground, Material.color(Material.Blue))
         compare(control.Material.theme, Material.Dark)
         control.Material.primary = undefined
@@ -252,8 +258,6 @@ TestCase {
 
         var grandChild1 = button.createObject(child1)
         var grandChild2 = button.createObject(child2)
-        if (data.tag == "primary" || data.tag == "accent")
-            expectFail("", "QTBUG-53556")
         compare(grandChild1.Material[prop], child1.Material[prop])
         compare(grandChild2.Material[prop], child2.Material[prop])
 
@@ -400,9 +404,8 @@ TestCase {
         compare(container.menu.Material.primary, Material.color(Material.Blue))
         compare(child.Material.primary, Material.color(Material.Blue))
         compare(container.Material.accent, Material.color(Material.Red))
-        expectFail("", "QTBUG-53556")
-        compare(container.menu.Material.accent, Material.color(Material.Red))
-        compare(child.Material.accent, Material.color(Material.Red))
+        compare(container.menu.Material.accent, Material.color(Material.Red, themeshade(container.menu.Material.theme)))
+        compare(child.Material.accent, Material.color(Material.Red, themeshade(child.Material.theme)))
         container.destroy()
     }
 
@@ -426,9 +429,8 @@ TestCase {
         compare(window.combo.Material.primary, Material.color(Material.Blue))
         compare(child.Material.primary, Material.color(Material.Blue))
         compare(window.Material.accent, Material.color(Material.Red))
-        expectFail("", "QTBUG-53556")
-        compare(window.combo.Material.accent, Material.color(Material.Red))
-        compare(child.Material.accent, Material.color(Material.Red))
+        compare(window.combo.Material.accent, Material.color(Material.Red, themeshade(window.combo.Material.theme)))
+        compare(child.Material.accent, Material.color(Material.Red, themeshade(child.Material.theme)))
         window.destroy()
     }
 
diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp
index 97cbb474..3da32407 100644
--- a/tests/auto/popup/tst_popup.cpp
+++ b/tests/auto/popup/tst_popup.cpp
@@ -105,13 +105,11 @@ void tst_popup::overlay()
     QVERIFY(overlayPressedSignal.isValid());
     QVERIFY(overlayReleasedSignal.isValid());
 
-    QTest::mousePress(window, Qt::LeftButton);
-    QCOMPARE(overlayPressedSignal.count(), 1);
-    QCOMPARE(overlayReleasedSignal.count(), 0);
+    QVERIFY(!overlay->isVisible()); // no popups open
 
-    QTest::mouseRelease(window, Qt::LeftButton);
-    QCOMPARE(overlayPressedSignal.count(), 1);
-    QCOMPARE(overlayReleasedSignal.count(), 0); // no modal popups open
+    QTest::mouseClick(window, Qt::LeftButton);
+    QCOMPARE(overlayPressedSignal.count(), 0);
+    QCOMPARE(overlayReleasedSignal.count(), 0);
 
     QQuickPopup *popup = helper.window->property("popup").value<QQuickPopup*>();
     QVERIFY(popup);
@@ -119,10 +117,27 @@ void tst_popup::overlay()
     QQuickButton *button = helper.window->property("button").value<QQuickButton*>();
     QVERIFY(button);
 
+    popup->open();
+    QVERIFY(popup->isVisible());
+    QVERIFY(overlay->isVisible());
+
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
+    QCOMPARE(overlayPressedSignal.count(), 1);
+    QCOMPARE(overlayReleasedSignal.count(), 0);
+
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
+    QCOMPARE(overlayPressedSignal.count(), 1);
+    QCOMPARE(overlayReleasedSignal.count(), 0); // no modal-popups open
+
+    popup->close();
+    QVERIFY(!popup->isVisible());
+    QVERIFY(!overlay->isVisible());
+
     popup->setModal(true);
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QVERIFY(overlay->isVisible());
 
     QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     QCOMPARE(overlayPressedSignal.count(), 2);
@@ -133,6 +148,7 @@ void tst_popup::overlay()
     QCOMPARE(overlayReleasedSignal.count(), 1);
 
     QVERIFY(!popup->isVisible());
+    QVERIFY(overlay->isVisible());
 }
 
 void tst_popup::windowChange()
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
index 37241d25..d019368e 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
@@ -54,9 +54,9 @@ Window {
         text: "SwipeDelegate"
         anchors.centerIn: parent
 
-        exposure.left: null
-        exposure.right: null
-        exposure.behind: Rectangle {
+        swipe.left: null
+        swipe.right: null
+        swipe.behind: Rectangle {
             width: swipeDelegate.width
             height: swipeDelegate.height
             color: swipeDelegate.pressed ? "#333" : "#444"
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
index fd56db9d..ecc7924e 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
@@ -54,7 +54,7 @@ Window {
         text: "SwipeDelegate"
         anchors.centerIn: parent
 
-        exposure.left: Rectangle {
+        swipe.left: Rectangle {
             width: swipeDelegate.width
             height: swipeDelegate.height
             color: swipeDelegate.pressed ? "#333" : "#444"
@@ -67,7 +67,7 @@ Window {
             }
         }
 
-        exposure.right: Rectangle {
+        swipe.right: Rectangle {
             width: swipeDelegate.width
             height: swipeDelegate.height
             color: swipeDelegate.pressed ? "#333" : "#444"
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
index a7f73580..9dfee7f5 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
@@ -54,7 +54,7 @@ Window {
         text: "SwipeDelegate"
         anchors.centerIn: parent
 
-        exposure.left: Rectangle {
+        swipe.left: Rectangle {
             width: swipeDelegate.width
             height: swipeDelegate.height
             color: swipeDelegate.pressed ? "#333" : "#444"
@@ -66,7 +66,7 @@ Window {
             }
         }
 
-        exposure.right: Rectangle {
+        swipe.right: Rectangle {
             anchors.fill: parent
             width: swipeDelegate.width
             height: swipeDelegate.height
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index a85fd870..9c843e7b 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -2,6 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
     gifs \
     fonts \
+    styles \
     testbench
 
 qtHaveModule(widgets): SUBDIRS += viewinqwidget
diff --git a/tests/manual/styles/styles.cpp b/tests/manual/styles/styles.cpp
new file mode 100644
index 00000000..4e9c7517
--- /dev/null
+++ b/tests/manual/styles/styles.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    engine.load(QUrl("qrc:/styles.qml"));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+
+    return app.exec();
+}
diff --git a/tests/manual/styles/styles.pro b/tests/manual/styles/styles.pro
new file mode 100644
index 00000000..060ab4f7
--- /dev/null
+++ b/tests/manual/styles/styles.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+TARGET = styles
+QT += quick quickcontrols2
+
+SOURCES += \
+    styles.cpp
+
+RESOURCES += \
+    styles.qml
diff --git a/tests/manual/styles/styles.qml b/tests/manual/styles/styles.qml
new file mode 100644
index 00000000..277604eb
--- /dev/null
+++ b/tests/manual/styles/styles.qml
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Layouts 1.3
+import QtQuick.Controls 2.0
+
+ApplicationWindow {
+    id: window
+
+    visible: true
+    minimumWidth: column.implicitWidth + 80
+    minimumHeight: column.implicitHeight + 80
+    title: "Qt Quick Controls 2 - Styles"
+
+    // for taking frameless screenshots:
+    // flags: Qt.Window | Qt.FramelessWindowHint
+
+    ColumnLayout {
+        id: column
+
+        spacing: 20
+        anchors.fill: parent
+        anchors.margins: 40
+
+        GroupBox {
+            title: "Font Size"
+            topPadding: 30
+            background.visible: false
+
+            ColumnLayout {
+                anchors.fill: parent
+                anchors.leftMargin: 20
+
+                RadioButton { leftPadding: 0; text: "Small" }
+                RadioButton { leftPadding: 0; text: "Medium"; checked: true }
+                RadioButton { leftPadding: 0; text: "Large" }
+            }
+        }
+
+        GroupBox {
+            title: "Audio"
+            topPadding: 30
+            background.visible: false
+
+            GridLayout {
+                columns: 2
+                columnSpacing: 30
+                anchors.fill: parent
+                anchors.leftMargin: 20
+
+                Label { text: "Volume" }
+                Slider { value: 1.0 }
+                Label { text: "Bass" }
+                Slider { value: 0.75 }
+                Label { text: "Treble" }
+                Slider { value: 0.5 }
+            }
+        }
+
+        Button {
+            text: "Save"
+            Layout.alignment: Qt.AlignRight
+        }
+
+        Item { Layout.fillHeight: true }
+    }
+}
author	Liang Qi <liang.qi@qt.io>	2016-06-01 13:18:06 +0200
committer	Liang Qi <liang.qi@qt.io>	2016-06-01 13:19:21 +0200
commit	14e08bafc88824f3d16602b04b5e60ae8c4005b0 (patch)
tree	47a831782fe60e26e6bba7ff8e5a0c3ac0a81c42
parent	2ebb1fdcafaba9d3b0e7fbb42ccd5c3ffde38fbf (diff)
parent	ceaf6177a8be6db22e629ff05a625e278025b071 (diff)