Universal: remove qdoc markers

The original plan was to include the default implementation (of all
styles, if we could make the snippets collapsiple) in the customization
docs. Since the default implementations tend to include internal types,
in the end we went the other way and wrote dedicated example snippets
for the customization docs. Therefore these markers no longer server a
purpose, but just add unnecessary extra bytes for the QML parser to
read.

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

35 files changed, 0 insertions, 167 deletions

diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml
index ef666417..fe2186a7 100644
--- a/src/imports/controls/universal/BusyIndicator.qml
+++ b/src/imports/controls/universal/BusyIndicator.qml
@@ -45,7 +45,6 @@ T.BusyIndicator {
     implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
     implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
 
-    //! [contentItem]
     contentItem: ProgressRing {
         id: ring
 
@@ -62,5 +61,4 @@ T.BusyIndicator {
             running: control.visible && control.running
         }
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index 60a2ac51..6954d31a 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -53,7 +53,6 @@ T.Button {
 
     property bool useSystemFocusVisuals: true
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -64,9 +63,7 @@ T.Button {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 32
         implicitHeight: 32
@@ -76,5 +73,4 @@ T.Button {
                control.enabled && (control.highlighted || control.checked) ? control.Universal.accent :
                                                                              control.Universal.baseLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml
index 262f16b1..a1c3ba6b 100644
--- a/src/imports/controls/universal/CheckBox.qml
+++ b/src/imports/controls/universal/CheckBox.qml
@@ -54,15 +54,12 @@ T.CheckBox {
 
     property bool useSystemFocusVisuals: true
 
-    //! [indicator]
     indicator: CheckIndicator {
         x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
@@ -77,5 +74,4 @@ T.CheckBox {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml
index 9441c7b0..c0ca272e 100644
--- a/src/imports/controls/universal/CheckDelegate.qml
+++ b/src/imports/controls/universal/CheckDelegate.qml
@@ -54,15 +54,12 @@ T.CheckDelegate {
     topPadding: padding - 1
     bottomPadding: padding + 1
 
-    //! [indicator]
     indicator: CheckIndicator {
         x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing
         rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing
@@ -77,9 +74,7 @@ T.CheckDelegate {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         visible: control.down || control.highlighted || control.visualFocus
         color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor
@@ -92,5 +87,4 @@ T.CheckDelegate {
         }
 
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 6d550aa2..007294b3 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -56,15 +56,12 @@ T.ComboBox {
     rightPadding: padding - 2
     bottomPadding: padding - 5
 
-    //! [delegate]
     delegate: ItemDelegate {
         width: control.width
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
         highlighted: control.highlightedIndex === index
     }
-    //! [delegate]
 
-    //! [indicator]
     indicator: Image {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
@@ -72,9 +69,7 @@ T.ComboBox {
         sourceSize.width: width
         sourceSize.height: height
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.mirrored && control.indicator ? control.indicator.width + control.spacing : 0
         rightPadding: !control.mirrored && control.indicator ? control.indicator.width + control.spacing : 0
@@ -88,9 +83,7 @@ T.ComboBox {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 120
         implicitHeight: 32
@@ -112,9 +105,7 @@ T.ComboBox {
             opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6
         }
     }
-    //! [background]
 
-    //! [popup]
     popup: T.Popup {
         width: control.width
         implicitHeight: Math.min(396, listview.contentHeight)
@@ -139,5 +130,4 @@ T.ComboBox {
             border.width: 1 // FlyoutBorderThemeThickness
         }
     }
-    //! [popup]
 }
diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index 466c6023..56cc7080 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -44,7 +44,6 @@ T.Dial {
     implicitWidth: 100
     implicitHeight: 100
 
-    //! [background]
     background: Rectangle {
         x: control.width / 2 - width / 2
         y: control.height / 2 - height / 2
@@ -55,9 +54,7 @@ T.Dial {
         border.color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumColor
         border.width: 2
     }
-    //! [background]
 
-    //! [handle]
     handle: Rectangle {
         implicitWidth: 20
         implicitHeight: 20
@@ -80,5 +77,4 @@ T.Dial {
             }
         ]
     }
-    //! [handle]
 }
diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml
index e23403ae..95fef8d1 100644
--- a/src/imports/controls/universal/Drawer.qml
+++ b/src/imports/controls/universal/Drawer.qml
@@ -52,19 +52,11 @@ T.Drawer {
     rightPadding: control.edge === Qt.LeftEdge
     bottomPadding: control.edge === Qt.TopEdge
 
-    //! [enter]
     enter: Transition { SmoothedAnimation { velocity: 5 } }
-    //! [enter]
-
-    //! [exit]
     exit: Transition { SmoothedAnimation { velocity: 5 } }
-    //! [exit]
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: control.Universal.chromeMediumLowColor
         Rectangle {
@@ -76,5 +68,4 @@ T.Drawer {
             y: control.edge === Qt.TopEdge ? parent.height - 1 : 0
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml
index 8d8b9d71..d5b327c1 100644
--- a/src/imports/controls/universal/Frame.qml
+++ b/src/imports/controls/universal/Frame.qml
@@ -49,14 +49,10 @@ T.Frame {
 
     padding: 12
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: "transparent"
         border.color: control.Universal.chromeDisabledLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index a163fb11..c75c81a6 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -53,11 +53,8 @@ T.GroupBox {
     padding: 12
     topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0)
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [label]
     label: Text {
         x: control.leftPadding
         width: control.availableWidth
@@ -71,9 +68,7 @@ T.GroupBox {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [label]
 
-    //! [background]
     background: Rectangle {
         y: control.topPadding - control.padding
         width: parent.width
@@ -82,5 +77,4 @@ T.GroupBox {
         color: "transparent"
         border.color: control.Universal.chromeDisabledLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml
index af239e4c..6822d658 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/imports/controls/universal/ItemDelegate.qml
@@ -54,7 +54,6 @@ T.ItemDelegate {
     topPadding: padding - 1
     bottomPadding: padding + 1
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0
         rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0
@@ -69,9 +68,7 @@ T.ItemDelegate {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         visible: control.down || control.highlighted || control.visualFocus
         color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor
@@ -84,5 +81,4 @@ T.ItemDelegate {
         }
 
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml
index d506feac..5ee2c243 100644
--- a/src/imports/controls/universal/Menu.qml
+++ b/src/imports/controls/universal/Menu.qml
@@ -49,7 +49,6 @@ T.Menu {
 
     margins: 0
 
-    //! [contentItem]
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
@@ -61,9 +60,7 @@ T.Menu {
 
         ScrollIndicator.vertical: ScrollIndicator {}
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40
@@ -71,5 +68,4 @@ T.Menu {
         border.color: control.Universal.chromeHighColor
         border.width: 1 // FlyoutBorderThemeThickness
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml
index 342c0d70..d8fdbcd0 100644
--- a/src/imports/controls/universal/MenuItem.qml
+++ b/src/imports/controls/universal/MenuItem.qml
@@ -53,7 +53,6 @@ T.MenuItem {
     bottomPadding: padding + 1
     spacing: 12
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.mirrored ? control.indicator.width + control.spacing : 0
@@ -66,9 +65,7 @@ T.MenuItem {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [indicator]
     indicator: Image {
         x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
@@ -78,9 +75,7 @@ T.MenuItem {
         sourceSize.width: width
         sourceSize.height: height
     }
-    //! [indicator]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40
@@ -98,5 +93,4 @@ T.MenuItem {
             opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml
index f4509b4b..3150715f 100644
--- a/src/imports/controls/universal/Page.qml
+++ b/src/imports/controls/universal/Page.qml
@@ -41,13 +41,9 @@ import QtQuick.Controls.Universal 2.0
 T.Page {
     id: control
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: control.Universal.background
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml
index 636f0297..0c4e3b80 100644
--- a/src/imports/controls/universal/PageIndicator.qml
+++ b/src/imports/controls/universal/PageIndicator.qml
@@ -49,7 +49,6 @@ T.PageIndicator {
     padding: 6
     spacing: 7
 
-    //! [delegate]
     delegate: Rectangle {
         implicitWidth: 5
         implicitHeight: 5
@@ -58,9 +57,7 @@ T.PageIndicator {
         color: index === control.currentIndex ? control.Universal.baseMediumHighColor :
                                       pressed ? control.Universal.baseMediumLowColor : control.Universal.baseLowColor
     }
-    //! [delegate]
 
-    //! [contentItem]
     contentItem: Row {
         spacing: control.spacing
 
@@ -69,5 +66,4 @@ T.PageIndicator {
             delegate: control.delegate
         }
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml
index 7a97da55..cd62b65c 100644
--- a/src/imports/controls/universal/Pane.qml
+++ b/src/imports/controls/universal/Pane.qml
@@ -49,13 +49,9 @@ T.Pane {
 
     padding: 12
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: control.Universal.background
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml
index b8df774e..66d1aeb8 100644
--- a/src/imports/controls/universal/ProgressBar.qml
+++ b/src/imports/controls/universal/ProgressBar.qml
@@ -47,7 +47,6 @@ T.ProgressBar {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
-    //! [contentItem]
     contentItem: ProgressStrip {
         id: strip
         implicitHeight: 10
@@ -63,9 +62,7 @@ T.ProgressBar {
             running: control.visible && control.indeterminate
         }
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 10
@@ -78,5 +75,4 @@ T.ProgressBar {
         visible: !control.indeterminate
         color: control.Universal.baseLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml
index b2f29661..b8986488 100644
--- a/src/imports/controls/universal/RadioButton.qml
+++ b/src/imports/controls/universal/RadioButton.qml
@@ -54,15 +54,12 @@ T.RadioButton {
 
     property bool useSystemFocusVisuals: true
 
-    //! [indicator]
     indicator: RadioIndicator {
         x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
@@ -77,5 +74,4 @@ T.RadioButton {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml
index 8bf05d2d..09f86f15 100644
--- a/src/imports/controls/universal/RadioDelegate.qml
+++ b/src/imports/controls/universal/RadioDelegate.qml
@@ -56,15 +56,12 @@ T.RadioDelegate {
 
     property Item control
 
-    //! [indicator]
     indicator: RadioIndicator {
         x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing
         rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing
@@ -79,9 +76,7 @@ T.RadioDelegate {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         visible: control.down || control.highlighted || control.visualFocus
         color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor
@@ -94,5 +89,4 @@ T.RadioDelegate {
         }
 
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml
index 061f95dd..fd220521 100644
--- a/src/imports/controls/universal/RangeSlider.qml
+++ b/src/imports/controls/universal/RangeSlider.qml
@@ -52,7 +52,6 @@ T.RangeSlider {
 
     padding: 6
 
-    //! [firstHandle]
     first.handle: Rectangle {
         implicitWidth: horizontal ? 8 : 24
         implicitHeight: horizontal ? 24 : 8
@@ -65,9 +64,7 @@ T.RangeSlider {
         radius: 4
         color: control.first.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor
     }
-    //! [firstHandle]
 
-    //! [secondHandle]
     second.handle: Rectangle {
         implicitWidth: horizontal ? 8 : 24
         implicitHeight: horizontal ? 24 : 8
@@ -80,9 +77,7 @@ T.RangeSlider {
         radius: 4
         color: control.second.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor
     }
-    //! [secondHandle]
 
-    //! [background]
     background: Item {
         implicitWidth: horizontal ? 200 : 18
         implicitHeight: horizontal ? 18 : 200
@@ -114,5 +109,4 @@ T.RangeSlider {
             color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml
index 19087384..1ac627a7 100644
--- a/src/imports/controls/universal/ScrollBar.qml
+++ b/src/imports/controls/universal/ScrollBar.qml
@@ -48,7 +48,6 @@ T.ScrollBar {
 
     // TODO: arrows
 
-    //! [contentItem]
     contentItem: Rectangle {
         implicitWidth: 12
         implicitHeight: 12
@@ -57,9 +56,7 @@ T.ScrollBar {
         visible: control.size < 1.0
         opacity: 0.0
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 12
         implicitHeight: 12
@@ -68,7 +65,6 @@ T.ScrollBar {
         visible: control.size < 1.0
         opacity: 0.0
     }
-    //! [background]
 
     states: [
         State {
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml
index 9f9f3fcf..ce289ce3 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/imports/controls/universal/ScrollIndicator.qml
@@ -46,7 +46,6 @@ T.ScrollIndicator {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
-    //! [contentItem]
     contentItem: Rectangle {
         id: indicator
 
@@ -78,5 +77,4 @@ T.ScrollIndicator {
             }
         ]
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml
index 9662acdf..5aa336ee 100644
--- a/src/imports/controls/universal/Slider.qml
+++ b/src/imports/controls/universal/Slider.qml
@@ -52,7 +52,6 @@ T.Slider {
 
     property bool useSystemFocusVisuals: true
 
-    //! [handle]
     handle: Rectangle {
         implicitWidth: horizontal ? 8 : 24
         implicitHeight: horizontal ? 24 : 8
@@ -65,9 +64,7 @@ T.Slider {
         radius: 4
         color: control.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor
     }
-    //! [handle]
 
-    //! [background]
     background: Item {
         implicitWidth: horizontal ? 200 : 18
         implicitHeight: horizontal ? 18 : 200
@@ -99,5 +96,4 @@ T.Slider {
             color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 4654aa01..d3647114 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -60,15 +60,12 @@ T.SpinBox {
 
     Universal.theme: activeFocus ? Universal.Light : undefined
 
-    //! [validator]
     validator: IntValidator {
         locale: control.locale.name
         bottom: Math.min(control.from, control.to)
         top: Math.max(control.from, control.to)
     }
-    //! [validator]
 
-    //! [contentItem]
     contentItem: TextInput {
         text: control.textFromValue(control.value, control.locale)
 
@@ -84,9 +81,7 @@ T.SpinBox {
         validator: control.validator
         inputMethodHints: Qt.ImhFormattedNumbersOnly
     }
-    //! [contentItem]
 
-    //! [up.indicator]
     up.indicator: Item {
         implicitWidth: 28
         height: parent.height + 4
@@ -112,9 +107,7 @@ T.SpinBox {
             sourceSize.height: height
         }
     }
-    //! [up.indicator]
 
-    //! [down.indicator]
     down.indicator: Item {
         implicitWidth: 28
         height: parent.height + 4
@@ -140,9 +133,7 @@ T.SpinBox {
             sourceSize.height: height
         }
     }
-    //! [down.indicator]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 60 + 28 // TextControlThemeMinWidth - 4 (border)
         implicitHeight: 28 // TextControlThemeMinHeight - 4 (border)
@@ -152,5 +143,4 @@ T.SpinBox {
                        control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor
         color: control.enabled ? control.Universal.background : control.Universal.baseLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml
index 60239429..4f37bb76 100644
--- a/src/imports/controls/universal/StackView.qml
+++ b/src/imports/controls/universal/StackView.qml
@@ -41,48 +41,36 @@ import QtQuick.Controls.Universal 2.0
 T.StackView {
     id: control
 
-    //! [popEnter]
     popEnter: Transition {
         ParallelAnimation {
             NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint }
             NumberAnimation { property: "x"; from: (control.mirrored ? -0.3 : 0.3) * -control.width; to: 0; duration: 400; easing.type: Easing.OutCubic }
         }
     }
-    //! [popEnter]
 
-    //! [popExit]
     popExit: Transition {
         NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint }
     }
-    //! [popExit]
 
-    //! [pushEnter]
     pushEnter: Transition {
         ParallelAnimation {
             NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint }
             NumberAnimation { property: "x"; from: (control.mirrored ? -0.3 : 0.3) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic }
         }
     }
-    //! [pushEnter]
 
-    //! [pushExit]
     pushExit: Transition {
         NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint }
     }
-    //! [pushExit]
 
-    //! [replaceEnter]
     replaceEnter: Transition {
         ParallelAnimation {
             NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint }
             NumberAnimation { property: "x"; from: (control.mirrored ? -0.3 : 0.3) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic }
         }
     }
-    //! [replaceEnter]
 
-    //! [replaceExit]
     replaceExit: Transition {
         NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint }
     }
-    //! [replaceExit]
 }
diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml
index d11983e3..82c1e744 100644
--- a/src/imports/controls/universal/SwipeDelegate.qml
+++ b/src/imports/controls/universal/SwipeDelegate.qml
@@ -54,7 +54,6 @@ T.SwipeDelegate {
     topPadding: padding - 1
     bottomPadding: padding + 1
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0
         rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0
@@ -78,9 +77,7 @@ T.SwipeDelegate {
             }
         }
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: control.Universal.background
 
@@ -105,5 +102,4 @@ T.SwipeDelegate {
             }
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml
index 988b328f..b42361dc 100644
--- a/src/imports/controls/universal/Switch.qml
+++ b/src/imports/controls/universal/Switch.qml
@@ -53,15 +53,12 @@ T.Switch {
 
     property bool useSystemFocusVisuals: true
 
-    //! [indicator]
     indicator: SwitchIndicator {
         x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
@@ -76,5 +73,4 @@ T.Switch {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml
index 43a1c4e2..558f5cfb 100644
--- a/src/imports/controls/universal/SwitchDelegate.qml
+++ b/src/imports/controls/universal/SwitchDelegate.qml
@@ -54,15 +54,12 @@ T.SwitchDelegate {
     topPadding: padding - 1
     bottomPadding: padding + 1
 
-    //! [indicator]
     indicator: SwitchIndicator {
         x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
         control: control
     }
-    //! [indicator]
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing
         rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing
@@ -77,9 +74,7 @@ T.SwitchDelegate {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         visible: control.down || control.highlighted || control.visualFocus
         color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor
@@ -92,5 +87,4 @@ T.SwitchDelegate {
         }
 
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml
index b25137c1..7c2e83a6 100644
--- a/src/imports/controls/universal/TabBar.qml
+++ b/src/imports/controls/universal/TabBar.qml
@@ -46,7 +46,6 @@ T.TabBar {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
-    //! [contentItem]
     contentItem: PathView {
         implicitWidth: 200
         implicitHeight: 48
@@ -68,13 +67,10 @@ T.TabBar {
             }
         }
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 48
         color: control.Universal.background
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml
index 3a1845a5..d503c86a 100644
--- a/src/imports/controls/universal/TabButton.qml
+++ b/src/imports/controls/universal/TabButton.qml
@@ -49,7 +49,6 @@ T.TabButton {
 
     padding: 12 // PivotItemMargin
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -60,5 +59,4 @@ T.TabButton {
         opacity: control.checked || control.down ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml
index b4c38135..5ca490e7 100644
--- a/src/imports/controls/universal/TextArea.qml
+++ b/src/imports/controls/universal/TextArea.qml
@@ -78,7 +78,6 @@ T.TextArea {
         elide: Text.ElideRight
     }
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 60 // TextControlThemeMinWidth - 4 (border)
         implicitHeight: 28 // TextControlThemeMinHeight - 4 (border)
@@ -88,5 +87,4 @@ T.TextArea {
                        control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor
         color: control.enabled ? control.Universal.background : control.Universal.baseLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml
index 041cf0e8..13587b5a 100644
--- a/src/imports/controls/universal/TextField.qml
+++ b/src/imports/controls/universal/TextField.qml
@@ -79,7 +79,6 @@ T.TextField {
         elide: Text.ElideRight
     }
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 60 // TextControlThemeMinWidth - 4 (border)
         implicitHeight: 28 // TextControlThemeMinHeight - 4 (border)
@@ -89,5 +88,4 @@ T.TextField {
                        control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor
         color: control.enabled ? control.Universal.background : control.Universal.baseLowColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml
index 721d817e..48e200c0 100644
--- a/src/imports/controls/universal/ToolBar.qml
+++ b/src/imports/controls/universal/ToolBar.qml
@@ -47,14 +47,10 @@ T.ToolBar {
     contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitHeight: 48 // AppBarThemeCompactHeight
         color: control.Universal.chromeMediumColor
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index 525623b5..cb87130d 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -51,7 +51,6 @@ T.ToolButton {
 
     property bool useSystemFocusVisuals: true
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -62,9 +61,7 @@ T.ToolButton {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 68
         implicitHeight: 48 // AppBarThemeCompactHeight
@@ -72,5 +69,4 @@ T.ToolButton {
         color: control.down ? control.Universal.listMediumColor :
                control.enabled && (control.highlighted || control.checked) ? control.Universal.accent : "transparent"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml
index 16576811..423e729d 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/imports/controls/universal/ToolTip.qml
@@ -56,7 +56,6 @@ T.ToolTip {
 
     closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -64,13 +63,10 @@ T.ToolTip {
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: control.Universal.chromeMediumLowColor
         border.color: control.Universal.chromeHighColor
         border.width: 1 // ToolTipBorderThemeThickness
     }
-    //! [background]
 }
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml
index 6869f1eb..7b134b84 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/imports/controls/universal/Tumbler.qml
@@ -45,7 +45,6 @@ T.Tumbler {
     implicitWidth: 60
     implicitHeight: 200
 
-    //! [delegate]
     delegate: Text {
         text: modelData
         font: control.font
@@ -54,9 +53,7 @@ T.Tumbler {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
-    //! [delegate]
 
-    //! [contentItem]
     contentItem: PathView {
         id: pathView
         model: control.model
@@ -78,5 +75,4 @@ T.Tumbler {
 
         property real delegateHeight: control.availableHeight / control.visibleItemCount
     }
-    //! [contentItem]
 }