Get rid of the remaining qdoc markers in the Default style

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

37 files changed, 10 insertions, 169 deletions

diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index 44c61355..9be1f046 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -47,7 +47,6 @@ T.BusyIndicator {
 
     padding: 6
 
-    //! [contentItem]
     contentItem: BusyRing {
         id: ring
         implicitWidth: 48
@@ -61,5 +60,4 @@ T.BusyIndicator {
             running: control.visible && control.running
         }
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index cf1f6c99..1a974eed 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -50,7 +50,6 @@ T.Button {
     leftPadding: padding + 2
     rightPadding: padding + 2
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -60,9 +59,7 @@ T.Button {
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
@@ -73,5 +70,4 @@ T.Button {
         border.color: "#0066ff"
         border.width: control.visualFocus ? 2 : 0
     }
-    //! [background]
 }
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 52ce20ef..632097b1 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -52,15 +52,12 @@ T.CheckBox {
     padding: 6
     spacing: 6
 
-    //! [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
@@ -74,5 +71,4 @@ T.CheckBox {
         verticalAlignment: Text.AlignVCenter
         opacity: enabled ? 1 : 0.3
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index dcef7f77..96cb48e0 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -52,7 +52,6 @@ T.CheckDelegate {
     padding: 12
     spacing: 12
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0
@@ -65,23 +64,18 @@ T.CheckDelegate {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [indicator]
     indicator: CheckIndicator {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
 
         control: control
     }
-    //! [indicator]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted
         color: control.down ? "#bdbebf" : "#eeeeee"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 791b5da6..31f2e5d9 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -54,16 +54,13 @@ T.ComboBox {
     leftPadding: padding + 6
     rightPadding: padding + 6
 
-    //! [delegate]
     delegate: ItemDelegate {
         width: control.popup.width
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
         font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
         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.height: height
         opacity: enabled ? 1 : 0.3
     }
-    //! [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
@@ -87,9 +82,7 @@ T.ComboBox {
         elide: Text.ElideRight
         opacity: enabled ? 1 : 0.3
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 120
         implicitHeight: 40
@@ -99,9 +92,7 @@ T.ComboBox {
         border.color: "#0066ff"
         border.width: control.visualFocus ? 2 : 0
     }
-    //! [background]
 
-    //! [popup]
     popup: T.Popup {
         y: control.height - (control.visualFocus ? 0 : 1)
         width: control.width
@@ -132,5 +123,4 @@ T.ComboBox {
 
         background: Rectangle { }
     }
-    //! [popup]
 }
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index aa138126..cd4d6ba2 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -45,7 +45,6 @@ T.Dial {
     implicitWidth: 184
     implicitHeight: 184
 
-    //! [background]
     background: DialRing {
         width: control.availableWidth
         height: control.availableHeight
@@ -53,9 +52,7 @@ T.Dial {
         progress: control.position
         opacity: control.enabled ? 1 : 0.3
     }
-    //! [background]
 
-    //! [handle]
     handle: Image {
         id: handleItem
         x: background.x + background.width / 2 - handle.width / 2
@@ -78,5 +75,4 @@ T.Dial {
             }
         ]
     }
-    //! [handle]
 }
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml
index 9791bf0c..6e9ab71f 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/Drawer.qml
@@ -53,19 +53,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 {
         Rectangle {
             readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge
@@ -76,5 +68,4 @@ T.Drawer {
             y: control.edge === Qt.TopEdge ? parent.height - 1 : 0
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index cb2ffd35..b7968cb4 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -48,14 +48,10 @@ T.Frame {
 
     padding: 12
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: "transparent"
         border.color: "#bdbebf"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index 0e9d79fc..31f4963f 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -52,11 +52,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
@@ -68,9 +65,7 @@ T.GroupBox {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [label]
 
-    //! [background]
     background: Rectangle {
         y: control.topPadding - control.padding
         width: parent.width
@@ -79,5 +74,4 @@ T.GroupBox {
         color: "transparent"
         border.color: "#bdbebf"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index d884a328..519ef3bf 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -50,7 +50,6 @@ T.ItemDelegate {
     padding: 12
     spacing: 12
 
-    //! [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
@@ -63,14 +62,11 @@ T.ItemDelegate {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted || control.visualFocus
         color: control.visualFocus ? (control.pressed ? "#cce0ff" : "#e5efff") : (control.down ? "#bdbebf" : "#eeeeee")
     }
-    //! [background]
 }
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index e349a89d..d9a97cee 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -48,7 +48,6 @@ T.Menu {
 
     margins: 0
 
-    //! [contentItem]
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
@@ -60,14 +59,11 @@ T.Menu {
 
         ScrollIndicator.vertical: ScrollIndicator {}
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40
         color: "#ffffff"
         border.color: "#353637"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index ead943b0..69f00900 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -49,7 +49,6 @@ T.MenuItem {
 
     padding: 6
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0
@@ -62,9 +61,7 @@ T.MenuItem {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [indicator]
     indicator: Image {
         x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
         y: control.topPadding + (control.availableHeight - height) / 2
@@ -72,9 +69,7 @@ T.MenuItem {
         visible: control.checked
         source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : ""
     }
-    //! [indicator]
 
-    //! [background]
     background: Item {
         implicitWidth: 200
         implicitHeight: 40
@@ -87,5 +82,4 @@ T.MenuItem {
             color: control.visualFocus || control.down ? "#eeeeee" : "transparent"
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml
index 3cbb1569..4ed7efb1 100644
--- a/src/imports/controls/Page.qml
+++ b/src/imports/controls/Page.qml
@@ -40,13 +40,9 @@ import QtQuick.Templates 2.0 as T
 T.Page {
     id: control
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: "#ffffff"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 5b61acd5..933bc839 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -48,7 +48,6 @@ T.PageIndicator {
     padding: 6
     spacing: 6
 
-    //! [delegate]
     delegate: Rectangle {
         implicitWidth: 8
         implicitHeight: 8
@@ -59,9 +58,7 @@ T.PageIndicator {
         opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45
         Behavior on opacity { OpacityAnimator { duration: 100 } }
     }
-    //! [delegate]
 
-    //! [contentItem]
     contentItem: Row {
         spacing: control.spacing
 
@@ -70,5 +67,4 @@ T.PageIndicator {
             delegate: control.delegate
         }
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml
index eb79129c..feb8eb58 100644
--- a/src/imports/controls/Pane.qml
+++ b/src/imports/controls/Pane.qml
@@ -48,13 +48,9 @@ T.Pane {
 
     padding: 12
 
-    //! [contentItem]
     contentItem: Item { }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: "#ffffff"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index fb312b18..45e990ee 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/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: 6
@@ -61,9 +60,7 @@ T.ProgressBar {
             running: control.visible && control.indeterminate
         }
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 6
@@ -74,5 +71,4 @@ T.ProgressBar {
 
         color: "#e4e4e4"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index a1a5d1a1..1100273a 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -52,15 +52,12 @@ T.RadioButton {
     padding: 6
     spacing: 6
 
-    //! [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
@@ -74,5 +71,4 @@ T.RadioButton {
         verticalAlignment: Text.AlignVCenter
         opacity: enabled ? 1 : 0.3
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml
index d745054a..620417a8 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/RadioDelegate.qml
@@ -52,7 +52,6 @@ T.RadioDelegate {
     padding: 12
     spacing: 12
 
-    //! [contentItem]
     contentItem: Text {
         leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0
@@ -65,23 +64,18 @@ T.RadioDelegate {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [indicator]
     indicator: RadioIndicator {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
 
         control: control
     }
-    //! [indicator]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted
         color: control.down ? "#bdbebf" : "#eeeeee"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index dae3ffe7..181550a4 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -49,7 +49,6 @@ T.RangeSlider {
 
     padding: 6
 
-    //! [firstHandle]
     first.handle: Rectangle {
         x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
         y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height))
@@ -62,9 +61,7 @@ T.RangeSlider {
 
         readonly property bool horizontal: control.orientation === Qt.Horizontal
     }
-    //! [firstHandle]
 
-    //! [secondHandle]
     second.handle: Rectangle {
         x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
         y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height))
@@ -77,9 +74,7 @@ T.RangeSlider {
 
         readonly property bool horizontal: control.orientation === Qt.Horizontal
     }
-    //! [secondHandle]
 
-    //! [background]
     background: Rectangle {
         x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2)
         y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0)
@@ -93,5 +88,4 @@ T.RangeSlider {
 
         readonly property bool horizontal: control.orientation === Qt.Horizontal
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index 8ccbc328..c77463aa 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -47,7 +47,6 @@ T.ScrollBar {
 
     padding: 2
 
-    //! [contentItem]
     contentItem: Rectangle {
         id: handle
 
@@ -73,5 +72,4 @@ T.ScrollBar {
             }
         }
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index cd7b53fd..c129e5b8 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -47,7 +47,6 @@ T.ScrollIndicator {
 
     padding: 2
 
-    //! [contentItem]
     contentItem: Rectangle {
         id: indicator
 
@@ -74,5 +73,4 @@ T.ScrollIndicator {
             }
         ]
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 31f4a989..5e4dc699 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -47,7 +47,6 @@ T.Slider {
 
     padding: 6
 
-    //! [handle]
     handle: Rectangle {
         x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
         y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))
@@ -60,9 +59,7 @@ T.Slider {
 
         readonly property bool horizontal: control.orientation === Qt.Horizontal
     }
-    //! [handle]
 
-    //! [background]
     background: Rectangle {
         x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2)
         y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0)
@@ -76,5 +73,4 @@ T.Slider {
 
         readonly property bool horizontal: control.orientation === Qt.Horizontal
     }
-    //! [background]
 }
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index de1228d1..dee368e2 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -54,15 +54,12 @@ T.SpinBox {
     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))
 
-    //! [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 {
         z: 2
         text: control.textFromValue(control.value, control.locale)
@@ -90,9 +87,7 @@ T.SpinBox {
             border.width: 2
         }
     }
-    //! [contentItem]
 
-    //! [up.indicator]
     up.indicator: Rectangle {
         x: control.mirrored ? 0 : parent.width - width
         height: parent.height
@@ -115,9 +110,7 @@ T.SpinBox {
             color: enabled ? "#353637" : "#bdbebf"
         }
     }
-    //! [up.indicator]
 
-    //! [down.indicator]
     down.indicator: Rectangle {
         x: control.mirrored ? parent.width - width : 0
         height: parent.height
@@ -133,12 +126,9 @@ T.SpinBox {
             color: enabled ? "#353637" : "#bdbebf"
         }
     }
-    //! [down.indicator]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 140
         border.color: "#e0e0e0"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml
index aa95c6a7..f70ecf97 100644
--- a/src/imports/controls/StackView.qml
+++ b/src/imports/controls/StackView.qml
@@ -41,39 +41,27 @@ import QtQuick.Templates 2.0 as T
 T.StackView {
     id: control
 
-    //! [popEnter]
     popEnter: Transition {
         XAnimator { from: (control.mirrored ? -1 : 1) * -control.width; to: 0; duration: 400; easing.type: Easing.OutCubic }
     }
-    //! [popEnter]
 
-    //! [popExit]
     popExit: Transition {
         XAnimator { from: 0; to: (control.mirrored ? -1 : 1) * control.width; duration: 400; easing.type: Easing.OutCubic }
     }
-    //! [popExit]
 
-    //! [pushEnter]
     pushEnter: Transition {
         XAnimator { from: (control.mirrored ? -1 : 1) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic }
     }
-    //! [pushEnter]
 
-    //! [pushExit]
     pushExit: Transition {
         XAnimator { from: 0; to: (control.mirrored ? -1 : 1) * -control.width; duration: 400; easing.type: Easing.OutCubic }
     }
-    //! [pushExit]
 
-    //! [replaceEnter]
     replaceEnter: Transition {
         XAnimator { from: (control.mirrored ? -1 : 1) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic }
     }
-    //! [replaceEnter]
 
-    //! [replaceExit]
     replaceExit: Transition {
         XAnimator { from: 0; to: (control.mirrored ? -1 : 1) * -control.width; duration: 400; easing.type: Easing.OutCubic }
     }
-    //! [replaceExit]
 }
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml
index 7ffd5a29..6c84dae0 100644
--- a/src/imports/controls/SwipeDelegate.qml
+++ b/src/imports/controls/SwipeDelegate.qml
@@ -50,7 +50,6 @@ T.SwipeDelegate {
     padding: 12
     spacing: 12
 
-    //! [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
@@ -71,9 +70,7 @@ T.SwipeDelegate {
             }
         }
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         color: control.visualFocus ? (control.down ? "#cce0ff" : "#e5efff") : (control.down ? "#bdbebf" : "#ffffff")
 
@@ -85,5 +82,4 @@ T.SwipeDelegate {
             }
         }
     }
-    //! [background]
 }
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml
index 71676f12..48147d86 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/SwipeView.qml
@@ -48,7 +48,6 @@ T.SwipeView {
 
     Accessible.role: Accessible.PageTabList
 
-    //! [contentItem]
     contentItem: ListView {
         model: control.contentModel
         currentIndex: control.currentIndex
@@ -63,5 +62,4 @@ T.SwipeView {
         preferredHighlightEnd: 0
         highlightMoveDuration: 250
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 0810626f..b4717d05 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -52,15 +52,12 @@ T.Switch {
     padding: 6
     spacing: 6
 
-    //! [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
@@ -73,5 +70,4 @@ T.Switch {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index 430fc8ec..f5383628 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -52,15 +52,12 @@ T.SwitchDelegate {
     padding: 12
     spacing: 12
 
-    //! [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.indicator && !control.mirrored ? 0 : control.indicator.width + control.spacing
         rightPadding: control.indicator && control.mirrored ? 0 : control.indicator.width + control.spacing
@@ -73,14 +70,11 @@ T.SwitchDelegate {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted
         color: control.down ? "#bdbebf" : "#eeeeee"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index 6a575167..22b5329e 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -47,7 +47,6 @@ T.TabBar {
 
     spacing: 1
 
-    //! [contentItem]
     contentItem: ListView {
         implicitWidth: contentWidth
         implicitHeight: 40
@@ -66,9 +65,6 @@ T.TabBar {
         preferredHighlightBegin: 40
         preferredHighlightEnd: width - 40
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle { }
-    //! [background]
 }
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index 56b57602..2c5b2708 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -48,7 +48,6 @@ T.TabButton {
 
     padding: 6
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -58,12 +57,9 @@ T.TabButton {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitHeight: 40
         color: control.down ? (control.checked ? "#e4e4e4" : "#585a5c") : (control.checked ? "transparent" : "#353637")
     }
-    //! [background]
 }
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 35703940..fc07e7bb 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -72,7 +72,6 @@ T.TextField {
         elide: Text.ElideRight
     }
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40
@@ -80,5 +79,4 @@ T.TextField {
         color: control.enabled ? "#ffffff" : "#353637"
         border.color: control.activeFocus ? "#0066ff" : (control.enabled ? "#bdbebf" : "transparent")
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index a787df61..02b6c6f3 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -46,14 +46,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: 40
         color: "#eeeeee"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 2887d6b4..1fda5ba3 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -48,7 +48,6 @@ T.ToolButton {
 
     padding: 6
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
@@ -57,9 +56,7 @@ T.ToolButton {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         implicitWidth: 40
         implicitHeight: 40
@@ -68,5 +65,4 @@ T.ToolButton {
         opacity: control.down ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0
         visible: control.down || (control.enabled && (control.checked || control.highlighted))
     }
-    //! [background]
 }
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml
index 876e2274..322757c7 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/ToolTip.qml
@@ -54,17 +54,13 @@ T.ToolTip {
 
     closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
 
-    //! [contentItem]
     contentItem: Text {
         text: control.text
         font: control.font
         // TODO: wrapMode: Label.Wrap
     }
-    //! [contentItem]
 
-    //! [background]
     background: Rectangle {
         border.color: "#353637"
     }
-    //! [background]
 }
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml
index 13bc0859..571d8089 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/Tumbler.qml
@@ -43,7 +43,6 @@ T.Tumbler {
     implicitWidth: 60
     implicitHeight: 200
 
-    //! [delegate]
     delegate: Text {
         id: label
         text: modelData
@@ -53,9 +52,7 @@ T.Tumbler {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
-    //! [delegate]
 
-    //! [contentItem]
     contentItem: PathView {
         id: pathView
         model: control.model
@@ -77,5 +74,4 @@ T.Tumbler {
 
         property real delegateHeight: control.availableHeight / control.visibleItemCount
     }
-    //! [contentItem]
 }
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index e83e418e..a9a48343 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -35,7 +35,6 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquic
 # Note: paths passed to \example command must contain the parent directory, e.g.
 # \example controls/tabs
 exampledirs += ../../../../examples/quickcontrols2 \
-               ../ \
                ../../../quicktemplates2 \
                ../../calendar \
                ../../../../tests/auto/controls/data \
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 2939a0ea..466f1b89 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -420,7 +420,16 @@ void QQuickSpinBox::setEditable(bool editable)
     This property holds the input text validator for editable spinboxes. By
     default, SpinBox uses \l IntValidator to accept input of integer numbers.
 
-    \snippet SpinBox.qml validator
+    \code
+    SpinBox {
+        id: control
+        validator: IntValidator {
+            locale: control.locale.name
+            bottom: Math.min(control.from, control.to)
+            top: Math.max(control.from, control.to)
+        }
+    }
+    \endcode
 
     \sa editable, textFromValue, valueFromText, {Control::locale}{locale}
 */