369 files changed, 243 insertions, 243 deletions

diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-applicationwindow-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-applicationwindow-wireframe.png
index f31378004a..f31378004a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-applicationwindow-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-applicationwindow-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-basic-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-basic-thumbnail.png
index e971a7aaec..e971a7aaec 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-basic-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-basic-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-basic.png b/src/quickcontrols/doc/images/qtquickcontrols-basic.png
index 099db17038..099db17038 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-basic.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-basic.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator-custom.png
index fefae223ef..fefae223ef 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.gif b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.gif
index 653d200f3c..653d200f3c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.png b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.png
index 4be09579bb..4be09579bb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-busyindicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-busyindicator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-button-custom.png
index 46d3e3eb5e..46d3e3eb5e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-flat.gif b/src/quickcontrols/doc/images/qtquickcontrols-button-flat.gif
index e2bd8b6fcf..e2bd8b6fcf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-flat.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-flat.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-highlighted.gif b/src/quickcontrols/doc/images/qtquickcontrols-button-highlighted.gif
index 7de076d3d0..7de076d3d0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-highlighted.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-highlighted.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-icononly.png b/src/quickcontrols/doc/images/qtquickcontrols-button-icononly.png
index 9c8dd0f43f..9c8dd0f43f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-icononly.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-icononly.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-textbesideicon.png b/src/quickcontrols/doc/images/qtquickcontrols-button-textbesideicon.png
index 3dc64fb92b..3dc64fb92b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-textbesideicon.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-textbesideicon.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-textonly.png b/src/quickcontrols/doc/images/qtquickcontrols-button-textonly.png
index 737beb165f..737beb165f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-textonly.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-textonly.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button-textundericon.png b/src/quickcontrols/doc/images/qtquickcontrols-button-textundericon.png
index 37c40c7c66..37c40c7c66 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button-textundericon.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button-textundericon.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-button.gif b/src/quickcontrols/doc/images/qtquickcontrols-button.gif
index 10d626a331..10d626a331 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-button.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-button.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-calendarmodel.png b/src/quickcontrols/doc/images/qtquickcontrols-calendarmodel.png
index a017682326..a017682326 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-calendarmodel.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-calendarmodel.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-custom.png
index c6c3d1bcbd..c6c3d1bcbd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-group.png b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-group.png
index d5a0d51be6..d5a0d51be6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-group.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-group.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-tristate.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-tristate.gif
index 56a1586795..56a1586795 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox-tristate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox-tristate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkbox.gif
index d70c0ee4b9..d70c0ee4b9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkbox.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkbox.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-custom.png
index c0dd06892c..c0dd06892c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-tristate.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-tristate.gif
index 8d058d6c54..8d058d6c54 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate-tristate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate.gif
index da3fab98a4..da3fab98a4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-checkdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-checkdelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-combobox-custom.png
index 4f7206dc78..4f7206dc78 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols-combobox-delegate.png
index cf31064895..cf31064895 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox-delegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-popup.png b/src/quickcontrols/doc/images/qtquickcontrols-combobox-popup.png
index cf31064895..cf31064895 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox-popup.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox-popup.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-combobox.gif b/src/quickcontrols/doc/images/qtquickcontrols-combobox.gif
index 966a2d4ae5..966a2d4ae5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-combobox.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-combobox.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-control.png b/src/quickcontrols/doc/images/qtquickcontrols-control.png
index 0f004a89dd..0f004a89dd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-control.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-control.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-control.svg b/src/quickcontrols/doc/images/qtquickcontrols-control.svg
index 4b2057d197..62745cc35e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-control.svg
+++ b/src/quickcontrols/doc/images/qtquickcontrols-control.svg
@@ -15,8 +15,8 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="qtquickcontrols2-control.svg"
-   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols2-control.png"
+   sodipodi:docname="qtquickcontrols-control.svg"
+   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols-control.png"
    inkscape:export-xdpi="192"
    inkscape:export-ydpi="192">
   <defs
@@ -602,7 +602,7 @@
          id="flowPara4144"
          style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a">Background</flowPara><flowPara
          id="flowPara4146"
-         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
+         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
        style="fill:#d7e3f4;fill-opacity:1;stroke:none;stroke-width:22.32431984;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58381503"
        id="rect4148"
        width="360"
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-customize-buttons.png b/src/quickcontrols/doc/images/qtquickcontrols-customize-buttons.png
index 551e8a0cf7..551e8a0cf7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-customize-buttons.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-customize-buttons.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow-layout.png b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow-layout.png
index 3a816e85a9..3a816e85a9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow-layout.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow.png b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow.png
index 7548e22147..7548e22147 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dayofweekrow.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dayofweekrow.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton-custom.png
index a7bd7c19d8..a7bd7c19d8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton.gif b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton.gif
index 16a198f9cb..16a198f9cb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-delaybutton.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-delaybutton.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-dial-custom.png
index 6312c99933..6312c99933 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-handle.png b/src/quickcontrols/doc/images/qtquickcontrols-dial-handle.png
index 9e22b2e709..9e22b2e709 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-handle.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputMode.svgz b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputMode.svgz
index 005ab7b331..005ab7b331 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputMode.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputMode.svgz
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputmode.png b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputmode.png
index 5bbc41a49c..5bbc41a49c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-inputmode.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-inputmode.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-no-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols-dial-no-wrap.gif
index 24f6790b6d..24f6790b6d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-no-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-no-wrap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols-dial-wrap.gif
index cfb1fb5b10..cfb1fb5b10 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial-wrap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dial.png b/src/quickcontrols/doc/images/qtquickcontrols-dial.png
index 71c54113b7..71c54113b7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dial.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dial.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox-attached.png
index c17f38ac0c..c17f38ac0c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox-attached.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox.png b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox.png
index 33b5f45f4f..33b5f45f4f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-dialogbuttonbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-dialogbuttonbox.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-drawer-expanded-wireframe.png
index 0c92f86587..0c92f86587 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-expanded-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-drawer-expanded-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-drawer-wireframe.png
index 74806f17b7..74806f17b7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-drawer-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-drawer-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-drawer.gif b/src/quickcontrols/doc/images/qtquickcontrols-drawer.gif
index 736f34f66f..736f34f66f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-drawer.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-drawer.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-frame-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-frame-custom.png
index f628b20c20..f628b20c20 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-frame-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-frame-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-frame.png b/src/quickcontrols/doc/images/qtquickcontrols-frame.png
index e3cb31dc71..e3cb31dc71 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-frame.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-frame.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-palettes.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion-palettes.png
index d806116167..d806116167 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-palettes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion-palettes.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion-thumbnail.png
index c270c6efba..c270c6efba 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-violet.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion-violet.png
index 99e5b59786..99e5b59786 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion-violet.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion-violet.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-fusion.png b/src/quickcontrols/doc/images/qtquickcontrols-fusion.png
index 7119ef225d..7119ef225d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-fusion.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-fusion.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-checkable.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-checkable.png
index 820ad79c80..820ad79c80 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-checkable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-checkable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-custom.png
index 029679ced0..029679ced0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-label.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-label.png
index c26795a7a7..c26795a7a7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox-label.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox.png b/src/quickcontrols/doc/images/qtquickcontrols-groupbox.png
index ea2f9ea5c5..ea2f9ea5c5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-groupbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-groupbox.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-4x.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-4x.png
index bab99a5e55..bab99a5e55 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-4x.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-4x.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset-boundaries.png
index c42df81edc..c42df81edc 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset-boundaries.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset.png
index 0627d08590..0627d08590 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-inset.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-inset.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-padding.png
index 0a606c9926..0a606c9926 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-padding.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-stretchable.png
index 9598b13a1c..9598b13a1c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-resized-stretchable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-size.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-size.png
index db6453758f..db6453758f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch-size.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch-size.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch.svgz b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch.svgz
index 5a1a1094d1..5a1a1094d1 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-9-patch.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-9-patch.svgz
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization-dark.png
index 144ac97c87..144ac97c87 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization.svgz b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization.svgz
index fb8305638b..fb8305638b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-customization.svgz
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-customization.svgz
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine-thumbnail.png
index ecf2bb163d..ecf2bb163d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-imagine.png b/src/quickcontrols/doc/images/qtquickcontrols-imagine.png
index ffe2c267b2..ffe2c267b2 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-imagine.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-imagine.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-ios-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-ios-dark.png
index fd4609c729..fd4609c729 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-ios-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-ios-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-ios-light.png b/src/quickcontrols/doc/images/qtquickcontrols-ios-light.png
index f990078ddf..f990078ddf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-ios-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-ios-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate-custom.png
index 35f8892f16..35f8892f16 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.gif
index dccb6efcdb..dccb6efcdb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.png b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.png
index 7242f343a0..7242f343a0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-itemdelegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-itemdelegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-label-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-label-custom.png
index 5730ff23bf..5730ff23bf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-label-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-label-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-label.png b/src/quickcontrols/doc/images/qtquickcontrols-label.png
index 0bafcf8602..0bafcf8602 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-label.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-label.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-macos-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-macos-dark.png
index 97d8a5a4e7..97d8a5a4e7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-macos-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-macos-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-macos-light.png b/src/quickcontrols/doc/images/qtquickcontrols-macos-light.png
index 4a598ad498..4a598ad498 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-macos-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-macos-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-macos-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-macos-thumbnail.png
index 57fd98d63a..57fd98d63a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-macos-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-macos-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-accent.png b/src/quickcontrols/doc/images/qtquickcontrols-material-accent.png
index a85afc68ed..a85afc68ed 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-accent.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-accent.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-attributes.png b/src/quickcontrols/doc/images/qtquickcontrols-material-attributes.png
index bb54071d79..bb54071d79 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-attributes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-attributes.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-background.png b/src/quickcontrols/doc/images/qtquickcontrols-material-background.png
index 62028f523c..62028f523c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-background.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-background.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-material-dark.png
index f6e45b3b1c..f6e45b3b1c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-elevation.png b/src/quickcontrols/doc/images/qtquickcontrols-material-elevation.png
index d152f14529..d152f14529 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-elevation.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-elevation.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-foreground.png b/src/quickcontrols/doc/images/qtquickcontrols-material-foreground.png
index 0d0e1b651a..0d0e1b651a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-foreground.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-foreground.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-light.png b/src/quickcontrols/doc/images/qtquickcontrols-material-light.png
index c9abe2cb8b..c9abe2cb8b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-purple.png b/src/quickcontrols/doc/images/qtquickcontrols-material-purple.png
index b955736b0b..b955736b0b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-purple.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-purple.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-theme.png b/src/quickcontrols/doc/images/qtquickcontrols-material-theme.png
index 1d09a82580..1d09a82580 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-theme.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-theme.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-material-thumbnail.png
index d758ff1803..d758ff1803 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-dense.png b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-dense.png
index 02f39b7885..02f39b7885 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-dense.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-dense.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-normal.png b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-normal.png
index c1e366c531..c1e366c531 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-material-variant-normal.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-material-variant-normal.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menu-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-menu-custom.png
index 922bf591b5..922bf591b5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menu-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menu-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menu.gif b/src/quickcontrols/doc/images/qtquickcontrols-menu.gif
index 93a873a33a..93a873a33a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menu.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menu.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menu.png b/src/quickcontrols/doc/images/qtquickcontrols-menu.png
index 926c33eed2..926c33eed2 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menu.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menu.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menubar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-menubar-custom.png
index b6007e466d..b6007e466d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menubar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menubar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menubar.png b/src/quickcontrols/doc/images/qtquickcontrols-menubar.png
index 873b7a1960..873b7a1960 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menubar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menubar.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator-custom.png
index 78635b9c88..78635b9c88 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator.png b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator.png
index 35307817f6..35307817f6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-menuseparator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-menuseparator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid-layout.png b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid-layout.png
index f67501a751..f67501a751 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid-layout.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid.png b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid.png
index a2f9a47f70..a2f9a47f70 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-monthgrid.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-monthgrid.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-page-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-page-wireframe.png
index f612c243c4..f612c243c4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-page-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-page-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-custom.png
index a767a51aa0..a767a51aa0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-delegate.png
index 95acde70cf..95acde70cf 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator-delegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator.png b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator.png
index e2a0a157f6..e2a0a157f6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pageindicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pageindicator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pane-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-pane-custom.png
index 03a0369f56..03a0369f56 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pane-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pane-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-pane.png b/src/quickcontrols/doc/images/qtquickcontrols-pane.png
index 3801cc3efb..3801cc3efb 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-pane.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-pane.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-popup-custom.png
index cb7813d387..cb7813d387 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup-settings.png b/src/quickcontrols/doc/images/qtquickcontrols-popup-settings.png
index 5122158ef4..5122158ef4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup-settings.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup-settings.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup-transformorigin.png b/src/quickcontrols/doc/images/qtquickcontrols-popup-transformorigin.png
index 16d2617786..16d2617786 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup-transformorigin.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup-transformorigin.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup.png b/src/quickcontrols/doc/images/qtquickcontrols-popup.png
index 8fc424a854..8fc424a854 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-popup.svg b/src/quickcontrols/doc/images/qtquickcontrols-popup.svg
index e39f3dce21..8afa57c70c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-popup.svg
+++ b/src/quickcontrols/doc/images/qtquickcontrols-popup.svg
@@ -15,8 +15,8 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="qtquickcontrols2-control.svg"
-   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols2-control.png"
+   sodipodi:docname="qtquickcontrols-control.svg"
+   inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols-control.png"
    inkscape:export-xdpi="192"
    inkscape:export-ydpi="192">
   <defs
@@ -482,7 +482,7 @@
          id="flowPara4144"
          style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a">Background</flowPara><flowPara
          id="flowPara4146"
-         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
+         style="font-size:20.55734825px;line-height:1.25;fill:#ff2a2a"> </flowPara></flowRoot>    <rect
        style="fill:#d7e3f4;fill-opacity:1;stroke:none;stroke-width:22.32431984;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58381503"
        id="rect4148"
        width="360"
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-custom.png
index 9d73df2c25..9d73df2c25 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-indeterminate.gif b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-indeterminate.gif
index d6756d16fd..d6756d16fd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-progressbar-indeterminate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar.gif b/src/quickcontrols/doc/images/qtquickcontrols-progressbar.gif
index 49af5f45a1..49af5f45a1 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-progressbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-progressbar.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton-custom.png
index 5c85179f70..5c85179f70 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton.gif b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton.gif
index 4cbf3ed9d6..4cbf3ed9d6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiobutton.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiobutton.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate-custom.png
index 7d32699bf9..7d32699bf9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate.gif
index b6afd6fe6a..b6afd6fe6a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-radiodelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-radiodelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider-custom.png
index 47379a300d..47379a300d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider.gif b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider.gif
index db565b0a93..db565b0a93 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-rangeslider.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-rangeslider.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-roundbutton.png b/src/quickcontrols/doc/images/qtquickcontrols-roundbutton.png
index 4dce37f239..4dce37f239 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-roundbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-roundbutton.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-custom.png
index 690bc8beef..690bc8beef 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-non-attached.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-non-attached.png
index eba363dda2..eba363dda2 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-non-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-non-attached.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-nosnap.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-nosnap.gif
index f61ac5b46a..f61ac5b46a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-nosnap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-nosnap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snapalways.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snapalways.gif
index 438d4a3318..438d4a3318 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snapalways.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snapalways.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snaponrelease.gif
index c2fa67b027..c2fa67b027 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar-snaponrelease.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar-snaponrelease.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar.gif
index ed3ab607d9..ed3ab607d9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollbar.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-custom.png
index b1183bc52a..b1183bc52a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-non-attached.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-non-attached.png
index a61e048743..a61e048743 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator-non-attached.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator-non-attached.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator.gif b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator.gif
index 73007820f8..73007820f8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollindicator.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollindicator.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-custom.png
index 8f4bd92863..8f4bd92863 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-wireframe.png
index 8a39056aa9..8a39056aa9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollview-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview.png b/src/quickcontrols/doc/images/qtquickcontrols-scrollview.png
index 1a4039e1fd..1a4039e1fd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-scrollview.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-scrollview.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-selectionrectangle.png b/src/quickcontrols/doc/images/qtquickcontrols-selectionrectangle.png
index 69e47b2909..69e47b2909 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-selectionrectangle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-selectionrectangle.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-slider-custom.png
index dbbacb343f..dbbacb343f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-handle.png b/src/quickcontrols/doc/images/qtquickcontrols-slider-handle.png
index 5450d57480..5450d57480 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-handle.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-nosnap.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider-nosnap.gif
index ab233c5b93..ab233c5b93 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-nosnap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-nosnap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snapalways.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider-snapalways.gif
index 8eb4011fb5..8eb4011fb5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snapalways.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-snapalways.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snaponrelease.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider-snaponrelease.gif
index f3b1d5c7a9..f3b1d5c7a9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider-snaponrelease.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider-snaponrelease.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-slider.gif b/src/quickcontrols/doc/images/qtquickcontrols-slider.gif
index 2ee56334e0..2ee56334e0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-slider.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-slider.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-custom.png
index d1e883fc56..d1e883fc56 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-double.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-double.png
index d3f5876c4a..d3f5876c4a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-double.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-double.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-down.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-down.png
index 1d5dcf7b44..1d5dcf7b44 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-down.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-down.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-textual.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-textual.png
index 5513d6e67d..5513d6e67d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-textual.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-textual.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-up.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-up.png
index 1ee1c4798e..1ee1c4798e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox-up.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox-up.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox.png b/src/quickcontrols/doc/images/qtquickcontrols-spinbox.png
index 835bb1d67d..835bb1d67d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-spinbox.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-spinbox.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-splitview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-splitview-custom.png
index da820ccafe..da820ccafe 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-splitview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-splitview-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-stackview-custom.png
index 5ee6049e74..5ee6049e74 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-pop.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-pop.gif
index 1971c2e004..1971c2e004 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-pop.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-pop.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-push.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-push.gif
index 0218cc0f2f..0218cc0f2f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-push.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-push.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-replace.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-replace.gif
index 63a6b2b4b5..63a6b2b4b5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-replace.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-replace.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-unwind.gif b/src/quickcontrols/doc/images/qtquickcontrols-stackview-unwind.gif
index 28c051d866..28c051d866 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-unwind.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-unwind.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-visible.png b/src/quickcontrols/doc/images/qtquickcontrols-stackview-visible.png
index d937b417e6..d937b417e6 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-visible.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-visible.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-stackview-wireframe.png
index f28b5c67de..f28b5c67de 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-stackview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-stackview-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-styles.png b/src/quickcontrols/doc/images/qtquickcontrols-styles.png
index 992dd47eba..992dd47eba 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-styles.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-styles.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-behind.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-behind.gif
index 97d6a59277..97d6a59277 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-behind.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-behind.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-custom.png
index 5813b73cf4..5813b73cf4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-leading-trailing.gif
index 0641bd1400..0641bd1400 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate-leading-trailing.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate-leading-trailing.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate.gif
index 86c380b7b3..86c380b7b3 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipedelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipedelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-indicator.png b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-indicator.png
index 998ec9f7c9..998ec9f7c9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-indicator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-indicator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-wireframe.png
index 3cc2b83c4b..3cc2b83c4b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipeview-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview.gif b/src/quickcontrols/doc/images/qtquickcontrols-swipeview.gif
index 4af26c1058..4af26c1058 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-swipeview.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-swipeview.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch-checked.png b/src/quickcontrols/doc/images/qtquickcontrols-switch-checked.png
index 7a0cde1bad..7a0cde1bad 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch-checked.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-switch-custom.png
index 6d535ef96f..6d535ef96f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch.gif b/src/quickcontrols/doc/images/qtquickcontrols-switch.gif
index 5f956304a0..5f956304a0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switch.png b/src/quickcontrols/doc/images/qtquickcontrols-switch.png
index 7f613f3343..7f613f3343 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switch.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switch.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate-custom.png
index f5337e2c83..f5337e2c83 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate.gif b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate.gif
index 950b10731f..950b10731f 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-switchdelegate.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-switchdelegate.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-custom.png
index 8c8e4accd8..8c8e4accd8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-explicit.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-explicit.png
index b1de5f715e..b1de5f715e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-explicit.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-explicit.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-flickable.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-flickable.png
index 0c253f82d5..0c253f82d5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-flickable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-flickable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-wireframe.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-wireframe.png
index 35a64ae285..35a64ae285 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar-wireframe.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar-wireframe.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.gif b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.gif
index 31db1f9e7c..31db1f9e7c 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.png
index 9f113497db..9f113497db 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbar.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tabbutton.png b/src/quickcontrols/doc/images/qtquickcontrols-tabbutton.png
index 3df2f53147..3df2f53147 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tabbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tabbutton.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-textarea-custom.png
index 6220a13f39..6220a13f39 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textarea-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-scrollable.png b/src/quickcontrols/doc/images/qtquickcontrols-textarea-scrollable.png
index ae868a27da..ae868a27da 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textarea-scrollable.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textarea-scrollable.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textarea.png b/src/quickcontrols/doc/images/qtquickcontrols-textarea.png
index fc221bd757..fc221bd757 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textarea.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textarea.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-custom.png
index 9102317065..9102317065 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-disabled.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-disabled.png
index b143d21053..b143d21053 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-disabled.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-focused.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-focused.png
index de7f9599c9..de7f9599c9 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-focused.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-normal.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield-normal.png
index 4229c706ad..4229c706ad 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield-normal.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-textfield.png b/src/quickcontrols/doc/images/qtquickcontrols-textfield.png
index a008383a00..a008383a00 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-textfield.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-textfield.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbar-custom.png
index 425e5f8c64..425e5f8c64 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbar-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbar.png
index e5a33eee9a..e5a33eee9a 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbar.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbar.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton-custom.png
index b78269d087..b78269d087 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton.png b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton.png
index 610c1a7cb4..610c1a7cb4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolbutton.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolbutton.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator-custom.png
index 6703eeba53..6703eeba53 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator.png b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator.png
index 88ced12361..88ced12361 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-toolseparator.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-toolseparator.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-delay.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-delay.png
index 59813835b4..59813835b4 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-delay.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-delay.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-hover.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-hover.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-hover.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-hover.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-pressandhold.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-pressandhold.png
index 62a9cf844b..62a9cf844b 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-pressandhold.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-pressandhold.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-slider.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-slider.png
index a15e723a02..a15e723a02 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip-slider.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip-slider.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip.png b/src/quickcontrols/doc/images/qtquickcontrols-tooltip.png
index 4238d52a77..4238d52a77 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tooltip.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tooltip.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-treeviewdelegate.png b/src/quickcontrols/doc/images/qtquickcontrols-treeviewdelegate.png
index 4d1e74f5dd..4d1e74f5dd 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-treeviewdelegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-treeviewdelegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-custom.png b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-custom.png
index bbfa9b0cef..bbfa9b0cef 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-custom.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-custom.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-delegate.png
index a28da93e46..a28da93e46 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-delegate.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-wrap.gif
index 8f59eedcc7..8f59eedcc7 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler-wrap.gif
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler-wrap.gif
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler.png b/src/quickcontrols/doc/images/qtquickcontrols-tumbler.png
index 38339dfa25..38339dfa25 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-tumbler.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-tumbler.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-accent.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-accent.png
index e1d74f7a91..e1d74f7a91 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-accent.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-accent.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-attributes.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-attributes.png
index 7a7ef347fc..7a7ef347fc 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-attributes.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-attributes.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-background.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-background.png
index 4f1bfbd284..4f1bfbd284 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-background.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-background.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-button.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-button.png
index 6c764ec97e..6c764ec97e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-button.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-button.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-dark.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-dark.png
index 952651dca0..952651dca0 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-dark.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-dark.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-foreground.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-foreground.png
index b0ecf23a9e..b0ecf23a9e 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-foreground.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-foreground.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-light.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-light.png
index e65447a4c5..e65447a4c5 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-light.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-light.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-theme.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-theme.png
index d128134636..d128134636 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-theme.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-theme.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-thumbnail.png
index db7fe5b076..db7fe5b076 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-universal-violet.png b/src/quickcontrols/doc/images/qtquickcontrols-universal-violet.png
index ec459457a8..ec459457a8 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-universal-violet.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-universal-violet.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn-layout.png
index 19fbeefd49..19fbeefd49 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn-layout.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn-layout.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn.png b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn.png
index a73cccd544..a73cccd544 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-weeknumbercolumn.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-weeknumbercolumn.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-windows-thumbnail.png b/src/quickcontrols/doc/images/qtquickcontrols-windows-thumbnail.png
index 15408d3bba..15408d3bba 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-windows-thumbnail.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-windows-thumbnail.png
diff --git a/src/quickcontrols/doc/images/qtquickcontrols2-windows.png b/src/quickcontrols/doc/images/qtquickcontrols-windows.png
index 324a03412d..324a03412d 100644
--- a/src/quickcontrols/doc/images/qtquickcontrols2-windows.png
+++ b/src/quickcontrols/doc/images/qtquickcontrols-windows.png
diff --git a/src/quickcontrols/doc/qtquickcontrols.qdocconf b/src/quickcontrols/doc/qtquickcontrols.qdocconf
index 285141b14b..c7f886ec39 100644
--- a/src/quickcontrols/doc/qtquickcontrols.qdocconf
+++ b/src/quickcontrols/doc/qtquickcontrols.qdocconf
@@ -1,8 +1,8 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
 include(manifest-meta.qdocconf)
 
-moduleheader            = QtQuickControls2
+moduleheader            = QtQuickControls
 
 project                 = QtQuickControls
 description             = Qt Quick Controls Reference Documentation
@@ -34,21 +34,21 @@ depends = qtcore qtgui qtdoc qtqml qtqmlmodels qtquick qtsql qtwidgets qtlabspla
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
 # \example controls/tabs
-exampledirs += ../../../examples/quickcontrols2 \
-               ../../quicktemplates2 \
+exampledirs += ../../../examples/quickcontrols \
+               ../../quicktemplates \
                ../ \
                snippets
 
 examples.fileextensions += "*.conf"
 
-examplesinstallpath = quickcontrols2
+examplesinstallpath = quickcontrols
 
-headerdirs += ../../quicktemplates2 \
+headerdirs += ../../quicktemplates \
               ..
 
-sourcedirs += ../../quicktemplates2 \
+sourcedirs += ../../quicktemplates \
               .. \
-              ../../quicktemplates2/doc/src \
+              ../../quicktemplates/doc/src \
               src
 
 # Exclude .qml files from the doc build to prevent conflicts with .qml files
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-action.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml
index 4f50ba46d7..4f50ba46d7 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-action.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml
index 3eefb11110..3eefb11110 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-busyindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml
index cf197a18ae..cf197a18ae 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml
index 027ecb4ed8..027ecb4ed8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml
index c2dce1d99a..c2dce1d99a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml
index 4b12b8acc2..4b12b8acc2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-button-textonly.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-calendarmodel.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml
index af2777b123..af2777b123 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-calendarmodel.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml
index a7421af39c..a7421af39c 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml
index 0d676be397..0d676be397 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkbox-group.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml
index a4f4b84d18..a4f4b84d18 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-accepted.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml
index 6f5eff6b55..6f5eff6b55 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-accepted.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml
index 2481f6dcf8..2481f6dcf8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-find.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml
index 2513002264..2513002264 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-find.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml
index 8c636a3d5c..8c636a3d5c 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-popup.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-textat.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml
index 8910ba3237..8910ba3237 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-textat.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-valuerole.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml
index 8d32201799..8d32201799 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-combobox-valuerole.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml
index 2358f252e0..2358f252e0 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml
index 2188b4ccf1..2188b4ccf1 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dayofweekrow.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml
index a8b17ab36a..a8b17ab36a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-delaybutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml
index f1efc22c4d..f1efc22c4d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dial-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml
index ba1580a4df..ba1580a4df 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml
index d70c9921e2..d70c9921e2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog-modeless.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml
index 4d774c4e10..4d774c4e10 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialog.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml
index ef85771bfd..ef85771bfd 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml
index 13a927520f..13a927520f 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml
index de3e1a2327..de3e1a2327 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml
index fcb128db54..fcb128db54 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-frame.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml
index 0ab0822aca..0ab0822aca 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-checkable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml
index 34d9df8a63..34d9df8a63 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml
index 98282ed348..98282ed348 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-groupbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-headerview-simple.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview-simple.qml
index 6f2e5fac45..6f2e5fac45 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-headerview-simple.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview-simple.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml
index 3212cbc762..3212cbc762 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml
index 49c12b1dff..49c12b1dff 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-itemdelegate.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-label-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml
index 79bc9d3c13..79bc9d3c13 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-label-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-label.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml
index 7ca63d0251..7ca63d0251 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-label.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml
index 71a84fac82..71a84fac82 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-accent.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml
index f9f1dd0915..f9f1dd0915 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-background.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml
index 4f8b27e7ef..4f8b27e7ef 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-elevation.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml
index b4a7743c16..b4a7743c16 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-foreground.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml
index 4e5bf81cd9..4e5bf81cd9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-theme.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-variant.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml
index ad824f1e34..ad824f1e34 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-material-variant.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml
index f38d5f370a..f38d5f370a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-instantiator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml
index cda91182df..cda91182df 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menu-instantiator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml
index 2d2d15efdf..2d2d15efdf 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml
index 55064604b4..55064604b4 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menubar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml
index 2b66187e10..2b66187e10 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml
index 6be0de85bc..6be0de85bc 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-menuseparator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml
index 0620ee6d0b..0620ee6d0b 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-localization.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml
index 56a801ab75..56a801ab75 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid-localization.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml
index c630edbe26..c630edbe26 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-monthgrid.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml
index d1537d73bf..d1537d73bf 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml
index 06ebb16fb1..06ebb16fb1 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-overlay-modeless.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-overview.cmake b/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake
index 6aa63152db..6aa63152db 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-overview.cmake
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml
index 5372c41f31..5372c41f31 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml
index e3e65beb22..e3e65beb22 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml
index 6929565825..6929565825 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pageindicator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml
index 96e3db1f37..96e3db1f37 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml
index ed1b80d4e8..ed1b80d4e8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-pane.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml
index 951dfa7d52..951dfa7d52 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml
index 5b9ec29fb2..5b9ec29fb2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-popup.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml
index 7158232081..7158232081 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-progressbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml
index 929fe7e8e2..929fe7e8e2 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiobutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml
index 5eb856b8b5..5eb856b8b5 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml
index 81bcb0d668..81bcb0d668 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-rangeslider-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml
index d83e4abc32..d83e4abc32 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-roundbutton.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml
index 5292bc5499..5292bc5499 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-active.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml
index 2a4faede61..2a4faede61 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml
index 6ba505b199..6ba505b199 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy.qml
index 7f08912e7e..7f08912e7e 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollbar-policy.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml
index 0f6afdfc4d..0f6afdfc4d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-active.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml
index f447fd4c94..f447fd4c94 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml
index 063c771f1b..063c771f1b 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml
index 2f23b9fd58..2f23b9fd58 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml
index 3f7bc8eb6d..3f7bc8eb6d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-interactive.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml
index 053e8e395a..053e8e395a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-listview.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml
index fa75cd14ed..fa75cd14ed 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview-policy.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml
index e7f1adf758..e7f1adf758 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-scrollview.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-selectionrectangle.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml
index a53941e824..a53941e824 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-selectionrectangle.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml
index 66e0bd7990..66e0bd7990 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-slider-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml
index b32106a5bd..b32106a5bd 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml
index fe2dfbd722..fe2dfbd722 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-double.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml
index 271cad0f07..271cad0f07 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox-textual.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml
index 24fac81ca6..24fac81ca6 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-spinbox.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml
index 0d5452c25d..0d5452c25d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml
index f12bfe1da8..f12bfe1da8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-splitview-handle-containmentmask.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml
index 381fbe6b95..381fbe6b95 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml
index d711a02e1a..d711a02e1a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-stackview-visible.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml
index 973511c418..973511c418 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml
index 4215ea9202..4215ea9202 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml
index fb2df4f6d3..fb2df4f6d3 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml
index e77bc9a3e8..e77bc9a3e8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml
index 1831d92b9f..1831d92b9f 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-swipeview-indicator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml
index 5ca4b96140..5ca4b96140 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-switch-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml
index 13cc7b4402..13cc7b4402 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml
index cdce972150..cdce972150 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml
index 2293984e30..2293984e30 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-explicit.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml
index 3851b226bd..3851b226bd 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar-flickable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml
index 3ce32c1c50..3ce32c1c50 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml
index c397092a8a..c397092a8a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tabbutton.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml
index 39a94e13cc..39a94e13cc 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml
index 7f915815e3..7f915815e3 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textarea-scrollable.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml
index c4d0c88c2a..c4d0c88c2a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml
index aa8639190c..aa8639190c 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-disabled.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml
index 62299eeabc..62299eeabc 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-focused.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml
index 72a5626142..72a5626142 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-textfield-normal.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml
index 2aabcbfbe3..2aabcbfbe3 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml
index cb07df80f6..cb07df80f6 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbar.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml
index 6ec46b0adf..6ec46b0adf 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolbutton-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml
index 201e04b0e8..201e04b0e8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml
index eb3543402d..eb3543402d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-toolseparator.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml
index 089e6d02b9..089e6d02b9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml
index 289334d20d..289334d20d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-hover.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml
index e209ce9ce9..e209ce9ce9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml
index 823e7f1842..823e7f1842 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip-slider.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml
index d0cf142376..d0cf142376 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tooltip.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml
index 3487e7316d..3487e7316d 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-custom.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml
index 1b39c2aa16..1b39c2aa16 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-listView.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml
index 30e90b2ba5..30e90b2ba5 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-pathView.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml
index a5d4b3585a..a5d4b3585a 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml
index 52aca6eea9..52aca6eea9 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-accent.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml
index 106549f789..106549f789 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-background.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml
index 491a4f94d4..491a4f94d4 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-foreground.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml
index 5ade2c7c55..5ade2c7c55 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-universal-theme.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml
index 6d1dd1ba79..6d1dd1ba79 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn-layout.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml
index e3c757a0b8..e3c757a0b8 100644
--- a/src/quickcontrols/doc/snippets/qtquickcontrols2-weeknumbercolumn.qml
+++ b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml
diff --git a/src/quickcontrols/doc/src/external-pages.qdoc b/src/quickcontrols/doc/src/external-pages.qdoc
index 0b1c99a7c1..591533c2c7 100644
--- a/src/quickcontrols/doc/src/external-pages.qdoc
+++ b/src/quickcontrols/doc/src/external-pages.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \externalpage https://doc.qt.io/qt-5/qtquickcontrols2-differences.html
+    \externalpage https://doc.qt.io/qt-5/qtquickcontrols-differences.html
     \title Qt 5.15: Qt Quick Controls vs Qt Quick Controls 1
 */
 
diff --git a/src/quickcontrols/doc/src/includes/qquickdial.qdocinc b/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
index 3370b3d8f3..37a2b50f62 100644
--- a/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
+++ b/src/quickcontrols/doc/src/includes/qquickdial.qdocinc
@@ -9,5 +9,5 @@ the value of the dial.
 The following image illustrates the directions in which the various input modes
 track movement:
 
-\image qtquickcontrols2-dial-inputmode.png
+\image qtquickcontrols-dial-inputmode.png
 //! [inputMode]
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-basic.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-basic.qdoc
index b87fe8b7db..174877a737 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-basic.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-basic.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-basic.html
+    \page qtquickcontrols-basic.html
     \title Basic Style
 
     The Basic style is a basic all-round style.
@@ -11,7 +11,7 @@
     performance for Qt Quick Controls. It is built with a minimal amount of Qt
     Quick primitives, and keeps animations and transitions to the minimum.
 
-    \image qtquickcontrols2-basic.png
+    \image qtquickcontrols-basic.png
 
     The style is selected by default when running Qt Quick Controls applications.
     It is built into the module's resources, so by default it is shipped with
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-buttons.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-buttons.qdoc
index b2256f0e60..fac1e7bad5 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-buttons.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-buttons.html
+    \page qtquickcontrols-buttons.html
     \title Button Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for button controls
 
     Qt Quick Controls offers a selection of button-like controls.
 
-    \annotatedlist qtquickcontrols2-buttons
+    \annotatedlist qtquickcontrols-buttons
 
     Each type of button has its own specific use case. The following
     sections offer guidelines for choosing the appropriate type of button,
@@ -25,7 +25,7 @@
     to perform an action. The most common examples are Apply, Cancel,
     Save, Close and Help.
 
-    \image qtquickcontrols2-button.gif
+    \image qtquickcontrols-button.gif
 
     Recommendations:
 
@@ -41,7 +41,7 @@
 
     \section1 CheckBox Control
 
-    \image qtquickcontrols2-checkbox.gif
+    \image qtquickcontrols-checkbox.gif
 
     \l CheckBox is used to build multi-selection option lists. Any number of
     options can be selected, including none, but the options should
@@ -80,7 +80,7 @@
     \l DelayButton is a button that incorporates a delay before triggering an action.
     This delay prevents accidental presses.
 
-    \image qtquickcontrols2-delaybutton.gif
+    \image qtquickcontrols-delaybutton.gif
 
     Recommendations:
     \list
@@ -92,7 +92,7 @@
 
     \section1 RadioButton Control
 
-    \image qtquickcontrols2-radiobutton.gif
+    \image qtquickcontrols-radiobutton.gif
 
     \l RadioButton is used to select only one option from a set of options.
     Selecting one option automatically deselects the one selected before.
@@ -122,7 +122,7 @@
     icon is circular. A circular RoundButton takes less space than a normal
     \l Button, and can also be used as a floating action button.
 
-    \image qtquickcontrols2-roundbutton.png
+    \image qtquickcontrols-roundbutton.png
 
     Recommendations:
 
@@ -135,7 +135,7 @@
 
     \section1 Switch Control
 
-    \image qtquickcontrols2-switch.png
+    \image qtquickcontrols-switch.png
 
     \l Switch represents a physical switch that allows users to choose between an "on"
     or "off" state.
@@ -153,7 +153,7 @@
 
     \section1 ToolButton Control
 
-    \image qtquickcontrols2-toolbutton.png
+    \image qtquickcontrols-toolbutton.png
 
     \l ToolButton is nearly identical to \l Button, but it has a graphical
     appearance that makes it more suitable for insertion into a \l ToolBar.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-configuration.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
index 02adbe5644..26fab0a2ce 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-configuration.html
+    \page qtquickcontrols-configuration.html
     \keyword Qt Quick Controls Configuration File
     \title Qt Quick Controls Configuration File
     \keyword Qt Quick Controls 2 Configuration File
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-containers.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-containers.qdoc
index bd840ebec8..08d91f294f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-containers.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-containers.html
+    \page qtquickcontrols-containers.html
     \title Container Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for container controls
 
     Qt Quick Controls offers a selection of container-like controls.
 
-    \annotatedlist qtquickcontrols2-containers
+    \annotatedlist qtquickcontrols-containers
 
     Each type of container can be used to group a set of controls together.
     The following sections offer guidelines for choosing the appropriate type
@@ -17,28 +17,28 @@
 
     \section1 ApplicationWindow Control
 
-    \image qtquickcontrols2-applicationwindow-wireframe.png
+    \image qtquickcontrols-applicationwindow-wireframe.png
 
     \l ApplicationWindow creates the root window of an application, and makes
     it easy to add an optional header and footer to that window.
 
     \section1 Frame Control
 
-    \image qtquickcontrols2-frame.png
+    \image qtquickcontrols-frame.png
 
     \l Frame is used to layout a logical group of controls together, within
     a visual frame.
 
     \section1 GroupBox Control
 
-    \image qtquickcontrols2-groupbox.png
+    \image qtquickcontrols-groupbox.png
 
     \l GroupBox is used to layout a logical group of controls together,
     within a titled visual frame.
 
     \section1 Page Control
 
-    \image qtquickcontrols2-page-wireframe.png
+    \image qtquickcontrols-page-wireframe.png
 
     \l Page provides page-specific header and footer items.
     It is perfectly possible to use ApplicationWindow for setting the header
@@ -47,7 +47,7 @@
 
     \section1 Pane Control
 
-    \image qtquickcontrols2-pane.png
+    \image qtquickcontrols-pane.png
 
     \l Pane provides a background color that matches with the application
     style and theme. Pane does not provide a layout of its own, but requires
@@ -56,13 +56,13 @@
 
     \section1 ScrollView Control
 
-    \image qtquickcontrols2-scrollview-wireframe.png
+    \image qtquickcontrols-scrollview-wireframe.png
 
     \l ScrollView provides scrolling for user-defined content.
 
     \section1 StackView Control
 
-    \image qtquickcontrols2-stackview-wireframe.png
+    \image qtquickcontrols-stackview-wireframe.png
 
     \l StackView organizes content pages into a stack using a last-in-first-out
     principle: the last item to be "pushed" onto the stack is the first one to
@@ -70,19 +70,19 @@
 
     \section1 SwipeView Control
 
-    \image qtquickcontrols2-swipeview-wireframe.png
+    \image qtquickcontrols-swipeview-wireframe.png
 
     \l SwipeView organizes content pages into a swipable strip.
 
     \section1 TabBar Control
 
-    \image qtquickcontrols2-tabbar-wireframe.png
+    \image qtquickcontrols-tabbar-wireframe.png
 
     \l TabBar organizes content pages into tabs.
 
     \section1 ToolBar Control
 
-    \image qtquickcontrols2-toolbar.png
+    \image qtquickcontrols-toolbar.png
 
     \l ToolBar is a container of application-wide and context-sensitive
     actions and controls.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-cppclasses.qdoc
index 10ae30a689..10ae30a689 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-cppclasses.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-cppclasses.qdoc
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-customize.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc
index e30d393771..19a2619164 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-customize.html
+    \page qtquickcontrols-customize.html
     \keyword Customizing Qt Quick Controls 2
     \title Customizing Qt Quick Controls
     \brief A set of UI controls to create user interfaces in Qt Quick
@@ -500,7 +500,7 @@
 
     The end result:
 
-    \image qtquickcontrols2-customize-buttons.png
+    \image qtquickcontrols-customize-buttons.png
 
     Note that the \c {import MyStyle 1.0} statement is only necessary
     because we are using the attached property belonging to \c MyStyle.
@@ -545,9 +545,9 @@
         BusyIndicator consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{contentItem}.
 
-        \image qtquickcontrols2-busyindicator-custom.png
+        \image qtquickcontrols-busyindicator-custom.png
 
-        \snippet qtquickcontrols2-busyindicator-custom.qml file
+        \snippet qtquickcontrols-busyindicator-custom.qml file
 
 
     \section2 Customizing Button
@@ -555,9 +555,9 @@
         Button consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-button-custom.png
+        \image qtquickcontrols-button-custom.png
 
-        \snippet qtquickcontrols2-button-custom.qml file
+        \snippet qtquickcontrols-button-custom.qml file
 
 
     \section2 Customizing CheckBox
@@ -565,18 +565,18 @@
         CheckBox consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-checkbox-custom.png
+        \image qtquickcontrols-checkbox-custom.png
 
-        \snippet qtquickcontrols2-checkbox-custom.qml file
+        \snippet qtquickcontrols-checkbox-custom.qml file
 
     \section2 Customizing CheckDelegate
 
         CheckDelegate consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-checkdelegate-custom.png
+        \image qtquickcontrols-checkdelegate-custom.png
 
-        \snippet qtquickcontrols2-checkdelegate-custom.qml file
+        \snippet qtquickcontrols-checkdelegate-custom.qml file
 
 
     \section2 Customizing ComboBox
@@ -585,9 +585,9 @@
         \l {Control::contentItem}{content item}, \l {ComboBox::popup}{popup},
         \l {ComboBox::indicator}{indicator}, and \l {ComboBox::delegate}{delegate}.
 
-        \image qtquickcontrols2-combobox-custom.png
+        \image qtquickcontrols-combobox-custom.png
 
-        \snippet qtquickcontrols2-combobox-custom.qml file
+        \snippet qtquickcontrols-combobox-custom.qml file
 
         As explained in \l {ComboBox Model Roles}, ComboBox supports multiple
         types of models. If you know that your ComboBox instances will only
@@ -605,7 +605,7 @@
         However, if you want to support all standard models, the more complex
         binding is necessary, and is explained in detail below.
 
-        \quotefromfile qtquickcontrols2-combobox-custom.qml
+        \quotefromfile qtquickcontrols-combobox-custom.qml
         \skipto control.textRole
         \printto Array.isArray
 
@@ -636,9 +636,9 @@
         DelayButton consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-delaybutton-custom.png
+        \image qtquickcontrols-delaybutton-custom.png
 
-        \snippet qtquickcontrols2-delaybutton-custom.qml file
+        \snippet qtquickcontrols-delaybutton-custom.qml file
 
 
     \section2 Customizing Dial
@@ -646,9 +646,9 @@
         Dial consists of two visual items: \l {Control::background}{background}
         and \l {Dial::handle}{handle}.
 
-        \image qtquickcontrols2-dial-custom.png
+        \image qtquickcontrols-dial-custom.png
 
-        \snippet qtquickcontrols2-dial-custom.qml file
+        \snippet qtquickcontrols-dial-custom.qml file
 
 
     \section2 Customizing Drawer
@@ -672,9 +672,9 @@
 
         Frame consists of one visual item: \l {Control::background}{background}.
 
-        \image qtquickcontrols2-frame-custom.png
+        \image qtquickcontrols-frame-custom.png
 
-        \snippet qtquickcontrols2-frame-custom.qml file
+        \snippet qtquickcontrols-frame-custom.qml file
 
 
     \section2 Customizing GroupBox
@@ -682,9 +682,9 @@
         GroupBox consists of two visual items: \l {Control::background}{background}
         and \l {GroupBox::label}{label}.
 
-        \image qtquickcontrols2-groupbox-custom.png
+        \image qtquickcontrols-groupbox-custom.png
 
-        \snippet qtquickcontrols2-groupbox-custom.qml file
+        \snippet qtquickcontrols-groupbox-custom.qml file
 
 
     \section2 Customizing ItemDelegate
@@ -692,18 +692,18 @@
         ItemDelegate consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-itemdelegate-custom.png
+        \image qtquickcontrols-itemdelegate-custom.png
 
-        \snippet qtquickcontrols2-itemdelegate-custom.qml file
+        \snippet qtquickcontrols-itemdelegate-custom.qml file
 
 
     \section2 Customizing Label
 
         Label can have a visual \l {Label::background}{background} item.
 
-        \image qtquickcontrols2-label-custom.png
+        \image qtquickcontrols-label-custom.png
 
-        \snippet qtquickcontrols2-label-custom.qml file
+        \snippet qtquickcontrols-label-custom.qml file
 
 
     \section2 Customizing Menu
@@ -717,9 +717,9 @@
                 \l {Control::contentItem}{content item}.
         \endlist
 
-        \image qtquickcontrols2-menu-custom.png
+        \image qtquickcontrols-menu-custom.png
 
-        \quotefromfile qtquickcontrols2-menu-custom.qml
+        \quotefromfile qtquickcontrols-menu-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \skipto Menu
@@ -732,9 +732,9 @@
         and MenuBarItem consists of two visual items: \l {Control::background}
         {background} and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-menubar-custom.png
+        \image qtquickcontrols-menubar-custom.png
 
-        \quotefromfile qtquickcontrols2-menubar-custom.qml
+        \quotefromfile qtquickcontrols-menubar-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \skipto MenuBar
@@ -745,18 +745,18 @@
 
         PageIndicator consists of a \l {Control::background}{background}, \l {Control::contentItem}{content item}, and \l {PageIndicator::delegate}{delegate}.
 
-        \image qtquickcontrols2-pageindicator-custom.png
+        \image qtquickcontrols-pageindicator-custom.png
 
-        \snippet qtquickcontrols2-pageindicator-custom.qml file
+        \snippet qtquickcontrols-pageindicator-custom.qml file
 
 
     \section2 Customizing Pane
 
         Pane consists of a \l {Control::background}{background}.
 
-        \image qtquickcontrols2-pane-custom.png
+        \image qtquickcontrols-pane-custom.png
 
-        \snippet qtquickcontrols2-pane-custom.qml file
+        \snippet qtquickcontrols-pane-custom.qml file
 
 
     \section2 Customizing Popup
@@ -764,9 +764,9 @@
         Popup consists of a \l {Popup::background}{background} and
         \l {Popup::contentItem}{content item}.
 
-        \image qtquickcontrols2-popup-custom.png
+        \image qtquickcontrols-popup-custom.png
 
-        \quotefromfile qtquickcontrols2-popup-custom.qml
+        \quotefromfile qtquickcontrols-popup-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \codeline
@@ -782,9 +782,9 @@
         ProgressBar consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-progressbar-custom.png
+        \image qtquickcontrols-progressbar-custom.png
 
-        \snippet qtquickcontrols2-progressbar-custom.qml file
+        \snippet qtquickcontrols-progressbar-custom.qml file
 
 
     \section2 Customizing RadioButton
@@ -792,9 +792,9 @@
         RadioButton consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{content item} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-radiobutton-custom.png
+        \image qtquickcontrols-radiobutton-custom.png
 
-        \snippet qtquickcontrols2-radiobutton-custom.qml file
+        \snippet qtquickcontrols-radiobutton-custom.qml file
 
 
     \section2 Customizing RadioDelegate
@@ -802,9 +802,9 @@
         RadioDelegate consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-radiodelegate-custom.png
+        \image qtquickcontrols-radiodelegate-custom.png
 
-        \snippet qtquickcontrols2-radiodelegate-custom.qml file
+        \snippet qtquickcontrols-radiodelegate-custom.qml file
 
 
     \section2 Customizing RangeSlider
@@ -814,9 +814,9 @@
         \l {RangeSlider::first}{first.handle} and
         \l {RangeSlider::second.handle}{second.handle}.
 
-        \image qtquickcontrols2-rangeslider-custom.png
+        \image qtquickcontrols-rangeslider-custom.png
 
-        \snippet qtquickcontrols2-rangeslider-custom.qml file
+        \snippet qtquickcontrols-rangeslider-custom.qml file
 
 
     \section2 Customizing RoundButton
@@ -830,9 +830,9 @@
         ScrollBar consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-scrollbar-custom.png
+        \image qtquickcontrols-scrollbar-custom.png
 
-        \snippet qtquickcontrols2-scrollbar-custom.qml file
+        \snippet qtquickcontrols-scrollbar-custom.qml file
 
 
     \section2 Customizing ScrollIndicator
@@ -840,9 +840,9 @@
         ScrollIndicator consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-scrollindicator-custom.png
+        \image qtquickcontrols-scrollindicator-custom.png
 
-        \snippet qtquickcontrols2-scrollindicator-custom.qml file
+        \snippet qtquickcontrols-scrollindicator-custom.qml file
 
 
     \section2 Customizing ScrollView
@@ -850,9 +850,9 @@
         ScrollView consists of a \l {Control::background}{background} item,
         and horizontal and vertical scroll bars.
 
-        \image qtquickcontrols2-scrollview-custom.png
+        \image qtquickcontrols-scrollview-custom.png
 
-        \snippet qtquickcontrols2-scrollview-custom.qml file
+        \snippet qtquickcontrols-scrollview-custom.qml file
 
 
     \section2 Customizing Slider
@@ -860,9 +860,9 @@
         Slider consists of two visual items: \l {Control::background}{background},
         and \l {Slider::handle}{handle}.
 
-        \image qtquickcontrols2-slider-custom.png
+        \image qtquickcontrols-slider-custom.png
 
-        \snippet qtquickcontrols2-slider-custom.qml file
+        \snippet qtquickcontrols-slider-custom.qml file
 
 
     \section2 Customizing SpinBox
@@ -871,18 +871,18 @@
         \l {Control::contentItem}{contentItem}, \l {SpinBox::up.indicator}{up indicator},
         and \l {SpinBox::down.indicator}{down indicator}.
 
-        \image qtquickcontrols2-spinbox-custom.png
+        \image qtquickcontrols-spinbox-custom.png
 
-        \snippet qtquickcontrols2-spinbox-custom.qml file
+        \snippet qtquickcontrols-spinbox-custom.qml file
 
 
     \section2 Customizing SplitView
 
         SplitView consists of a visual \l {SplitView::handle}{handle} delegate.
 
-        \image qtquickcontrols2-splitview-custom.png
+        \image qtquickcontrols-splitview-custom.png
 
-        \snippet qtquickcontrols2-splitview-custom.qml 1
+        \snippet qtquickcontrols-splitview-custom.qml 1
 
 
     \section2 Customizing StackView
@@ -891,7 +891,7 @@
         item, and it allows customizing the transitions that are used for
         push, pop, and replace operations.
 
-        \snippet qtquickcontrols2-stackview-custom.qml file
+        \snippet qtquickcontrols-stackview-custom.qml file
 
 
     \section2 Customizing SwipeDelegate
@@ -900,9 +900,9 @@
         \l {Control::contentItem}{content item}, \l {AbstractButton::indicator}{indicator},
         \c swipe.left, \c swipe.right, and \c swipe.behind.
 
-        \image qtquickcontrols2-swipedelegate-custom.png
+        \image qtquickcontrols-swipedelegate-custom.png
 
-        \snippet qtquickcontrols2-swipedelegate-custom.qml file
+        \snippet qtquickcontrols-swipedelegate-custom.qml file
 
 
     \section2 Customizing SwipeView
@@ -911,7 +911,7 @@
         item. The navigation is implemented by the \l {Control::contentItem}
         {content item}.
 
-        \snippet qtquickcontrols2-swipeview-custom.qml file
+        \snippet qtquickcontrols-swipeview-custom.qml file
 
 
     \section2 Customizing Switch
@@ -919,18 +919,18 @@
         Switch consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{content item} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-switch-custom.png
+        \image qtquickcontrols-switch-custom.png
 
-        \snippet qtquickcontrols2-switch-custom.qml file
+        \snippet qtquickcontrols-switch-custom.qml file
 
     \section2 Customizing SwitchDelegate
 
         SwitchDelegate consists of three visual items: \l {Control::background}{background},
         \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}.
 
-        \image qtquickcontrols2-switchdelegate-custom.png
+        \image qtquickcontrols-switchdelegate-custom.png
 
-        \snippet qtquickcontrols2-switchdelegate-custom.qml file
+        \snippet qtquickcontrols-switchdelegate-custom.qml file
 
 
     \section2 Customizing TabBar
@@ -938,9 +938,9 @@
         TabBar consists of two visual items: \l {Control::background}{background},
         and \l {Control::contentItem}{contentItem}.
 
-        \image qtquickcontrols2-tabbar-custom.png
+        \image qtquickcontrols-tabbar-custom.png
 
-        \snippet qtquickcontrols2-tabbar-custom.qml file
+        \snippet qtquickcontrols-tabbar-custom.qml file
 
 
     \section2 Customizing TabButton
@@ -953,27 +953,27 @@
 
         TextArea consists of a \l {TextArea::background}{background} item.
 
-        \image qtquickcontrols2-textarea-custom.png
+        \image qtquickcontrols-textarea-custom.png
 
-        \snippet qtquickcontrols2-textarea-custom.qml file
+        \snippet qtquickcontrols-textarea-custom.qml file
 
 
     \section2 Customizing TextField
 
         TextField consists of a \l {TextField::background}{background} item.
 
-        \image qtquickcontrols2-textfield-custom.png
+        \image qtquickcontrols-textfield-custom.png
 
-        \snippet qtquickcontrols2-textfield-custom.qml file
+        \snippet qtquickcontrols-textfield-custom.qml file
 
 
     \section2 Customizing ToolBar
 
         ToolBar consists of one visual item: \l {Control::background}{background}.
 
-        \image qtquickcontrols2-toolbar-custom.png
+        \image qtquickcontrols-toolbar-custom.png
 
-        \snippet qtquickcontrols2-toolbar-custom.qml file
+        \snippet qtquickcontrols-toolbar-custom.qml file
 
 
     \section2 Customizing ToolButton
@@ -981,9 +981,9 @@
         ToolButton consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-toolbutton-custom.png
+        \image qtquickcontrols-toolbutton-custom.png
 
-        \snippet qtquickcontrols2-toolbutton-custom.qml file
+        \snippet qtquickcontrols-toolbutton-custom.qml file
 
 
     \section2 Customizing ToolSeparator
@@ -991,9 +991,9 @@
         ToolSeparator consists of two visual items: \l {Control::background}{background}
         and \l {Control::contentItem}{content item}.
 
-        \image qtquickcontrols2-toolseparator-custom.png
+        \image qtquickcontrols-toolseparator-custom.png
 
-        \snippet qtquickcontrols2-toolseparator-custom.qml file
+        \snippet qtquickcontrols-toolseparator-custom.qml file
 
 
     \section2 Customizing ToolTip
@@ -1001,7 +1001,7 @@
         ToolTip consists of two visual items: \l {Popup::background}{background}
         and \l {Popup::contentItem}{content item}.
 
-        \quotefromfile qtquickcontrols2-tooltip-custom.qml
+        \quotefromfile qtquickcontrols-tooltip-custom.qml
         \skipto import QtQuick
         \printuntil import QtQuick.Controls
         \skipto ToolTip
@@ -1018,16 +1018,16 @@
         \l {Control::contentItem}{contentItem}, and
         \l {Tumbler::delegate}{delegate}.
 
-        \image qtquickcontrols2-tumbler-custom.png
+        \image qtquickcontrols-tumbler-custom.png
 
-        \snippet qtquickcontrols2-tumbler-custom.qml file
+        \snippet qtquickcontrols-tumbler-custom.qml file
 
         If you want to define your own contentItem, use either a \l ListView or
         \l PathView as the root item. For a wrapping Tumbler, use PathView:
 
-        \snippet qtquickcontrols2-tumbler-pathView.qml contentItem
+        \snippet qtquickcontrols-tumbler-pathView.qml contentItem
 
         For a non-wrapping Tumbler, use ListView:
 
-        \snippet qtquickcontrols2-tumbler-listView.qml contentItem
+        \snippet qtquickcontrols-tumbler-listView.qml contentItem
 */
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-delegates.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-delegates.qdoc
index 5d498ced1f..a3fee8b5ae 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-delegates.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-delegates.qdoc
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-delegates.html
+    \page qtquickcontrols-delegates.html
     \title Delegate Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for delegate controls
 
     Qt Quick Controls offers a selection of controls that are used as
     delegates in views.
 
-    \annotatedlist qtquickcontrols2-delegates
+    \annotatedlist qtquickcontrols-delegates
 
     Each type of delegate has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of delegate,
@@ -18,7 +18,7 @@
 
     \section1 CheckDelegate Control
 
-    \image qtquickcontrols2-checkdelegate.gif
+    \image qtquickcontrols-checkdelegate.gif
 
     \l CheckDelegate presents a checkable control that can be toggled on
     (checked) or off (unchecked). Check delegates are typically used to
@@ -28,14 +28,14 @@
 
     \section1 ItemDelegate Control
 
-    \image qtquickcontrols2-itemdelegate.gif
+    \image qtquickcontrols-itemdelegate.gif
 
     \l ItemDelegate presents a checkable control that can be pressed and
     clicked by the user.
 
     \section1 RadioDelegate Control
 
-    \image qtquickcontrols2-radiodelegate.gif
+    \image qtquickcontrols-radiodelegate.gif
 
     \l RadioDelegate presents a checkable control that can be toggled on
     (checked) or off (unchecked). Radio delegates are typically used to select
@@ -45,14 +45,14 @@
 
     \section1 SwipeDelegate Control
 
-    \image qtquickcontrols2-swipedelegate.gif
+    \image qtquickcontrols-swipedelegate.gif
 
     \l SwipeDelegate presents a view item that can be swiped left or right to
     expose more options or information.
 
     \section1 SwitchDelegate Control
 
-    \image qtquickcontrols2-switchdelegate.gif
+    \image qtquickcontrols-switchdelegate.gif
 
     \l SwitchDelegate presents a switchable delegate that can be toggled on or off.
 
@@ -60,7 +60,7 @@
 
     \section1 TreeViewDelegate Control
 
-    \image qtquickcontrols2-treeviewdelegate.png
+    \image qtquickcontrols-treeviewdelegate.png
 
     A \l TreeViewDelegate is a delegate that can be assigned to the delegate property
     of a TreeView.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-deployment.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-deployment.qdoc
index daea9eccf0..c4485c81f1 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-deployment.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-deployment.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-deployment.html
+    \page qtquickcontrols-deployment.html
     \title Deploying Qt Quick Controls Applications
 
     Deployment of Qt Quick Controls applications is very similar to
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-environment.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-environment.qdoc
index b939a6741a..fea7da1153 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-environment.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-environment.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-environment.html
+    \page qtquickcontrols-environment.html
     \title Supported Environment Variables in Qt Quick Controls
 
     This page contains a list of all environment variables that Qt Quick Controls
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-examples.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-examples.qdoc
index 505c6200f5..8cd6e7f914 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-examples.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-examples.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \group qtquickcontrols2-examples
+    \group qtquickcontrols-examples
     \ingroup all-examples
     \keyword Qt Quick Controls Examples
     \title Qt Quick Controls Examples
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-fileselectors.qdoc
index edd7b76d81..01c9b26bd2 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-fileselectors.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-fileselectors.html
+    \page qtquickcontrols-fileselectors.html
     \title Using File Selectors with Qt Quick Controls
 
     \l {QFileSelector}{File selectors} provide a convenient way of selecting
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-focus.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-focus.qdoc
index ff73e560a0..c39773020f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-focus.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-focus.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-focus.html
+    \page qtquickcontrols-focus.html
     \keyword Focus Management in Qt Quick Controls 2
     \title Focus Management in Qt Quick Controls
     \brief Overview of focus handling with Qt Quick Controls
@@ -18,7 +18,7 @@
     Qt Quick Controls offers a selection of controls that act as
     \l {Acquiring Focus and Focus Scopes}{focus scopes}:
 
-    \annotatedlist qtquickcontrols2-focusscopes
+    \annotatedlist qtquickcontrols-focusscopes
 
     \sa {Keyboard Focus in Qt Quick}
 */
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-fusion.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-fusion.qdoc
index 42fcd6e87c..d3c4199e7d 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-fusion.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-fusion.html
+    \page qtquickcontrols-fusion.html
     \title Fusion Style
 
     The Fusion style is a desktop-oriented style.
@@ -11,7 +11,7 @@
     look and feel. It implements the same design language as the
     \l {Qt Widget Gallery}{Fusion style for Qt Widgets}.
 
-    \image qtquickcontrols2-fusion.png
+    \image qtquickcontrols-fusion.png
 
     To run an application with the Fusion style, see
     \l {Using Styles in Qt Quick Controls}.
@@ -26,7 +26,7 @@
     The Fusion style uses the standard system \l[QtQuick]{Palette}
     to provide colors that match the desktop environment.
 
-    \image qtquickcontrols2-fusion-palettes.png
+    \image qtquickcontrols-fusion-palettes.png
 
     Custom palettes can be specified for any control,
     \l{Popup::palette}{popup}, or \l{Window::palette}{application window}.
@@ -56,7 +56,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-fusion-violet.png
+                \image qtquickcontrols-fusion-violet.png
     \endtable
 
     \b {See also} \l {Basic Style}, \l {Material Style}, \l {Universal Style}
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-gettingstarted.qdoc
index f8667579b6..1ab0c99bc6 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-gettingstarted.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-gettingstarted.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-gettingstarted.html
+    \page qtquickcontrols-gettingstarted.html
     \keyword Getting Started with Qt Quick Controls 2
     \title Getting Started with Qt Quick Controls
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-guidelines.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-guidelines.qdoc
index f9c8246be8..04e142f1c9 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-guidelines.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-guidelines.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-guidelines.html
+    \page qtquickcontrols-guidelines.html
     \keyword Qt Quick Controls Guidelines
     \title Qt Quick Controls Guidelines
     \keyword Qt Quick Controls 2 Guidelines
@@ -13,7 +13,7 @@
     Below you will find practical guidelines on how and when to use
     the controls.
 
-    \annotatedlist qtquickcontrols2-guidelines
+    \annotatedlist qtquickcontrols-guidelines
 
     \section1 Related Information
     \list
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-icons.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-icons.qdoc
index 4948461c1a..f9fbfa203f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-icons.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-icons.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-icons.html
+    \page qtquickcontrols-icons.html
     \keyword Icons in Qt Quick Controls 2
     \title Icons in Qt Quick Controls
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-imagine.qdoc
index 98bb726d00..2e476c3b24 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-imagine.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-imagine.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-imagine.html
+    \page qtquickcontrols-imagine.html
     \title Imagine Style
 
     The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...}
@@ -22,7 +22,7 @@
     set of images, but the images can be easily changed by providing a directory
     with images using a predefined naming convention.
 
-    \image qtquickcontrols2-imagine.png
+    \image qtquickcontrols-imagine.png
     \caption The Imagine style with the default images
 
     To run an application with the Imagine style, see
@@ -2273,7 +2273,7 @@
     represents a \l {Button}'s \l {Control::}{background}, alongside a
     magnified version (to make it easier to see the 9-patch lines):
 
-    \image qtquickcontrols2-imagine-9-patch-4x.png
+    \image qtquickcontrols-imagine-9-patch-4x.png
 
     The content of the image is 44 pixels wide by 32 pixels high. Every 9-patch
     image needs a one pixel thick line (collectively referred to as
@@ -2286,7 +2286,7 @@
     The 9-patch lines must be black, and the remaining areas must be transparent
     or white:
 
-    \image qtquickcontrols2-imagine-9-patch-size.png
+    \image qtquickcontrols-imagine-9-patch-size.png
 
     \section3 Stretchable Areas
 
@@ -2296,7 +2296,7 @@
     Below are examples of the 9-patch image being resized to one and a half
     times its original size in various dimensions:
 
-    \image qtquickcontrols2-imagine-9-patch-resized-stretchable.png
+    \image qtquickcontrols-imagine-9-patch-resized-stretchable.png
 
     Notice how the the rounded corners keep their original size, as they are
     outside the range of the lines.
@@ -2311,7 +2311,7 @@
     Below are more examples of the 9-patch image being resized, but this time
     demonstrating how the padding 9-patch lines work.
 
-    \image qtquickcontrols2-imagine-9-patch-resized-padding.png
+    \image qtquickcontrols-imagine-9-patch-resized-padding.png
 
     The \c contentItem can take up as much space as it needs within the shaded
     areas. If the padding lines are left out, the \c contentItem will take as
@@ -2327,13 +2327,13 @@
     Inset areas accounts for this by telling the control that a certain area of
     the 9-patch image should go outside of the control:
 
-    \image qtquickcontrols2-imagine-9-patch-inset.png
+    \image qtquickcontrols-imagine-9-patch-inset.png
 
     In the image below, the dashed line represents the button's clickable area,
     as well as the space that it will take up in a layout. The shadow is marked
     by the striped area behind it:
 
-    \image qtquickcontrols2-imagine-9-patch-inset-boundaries.png
+    \image qtquickcontrols-imagine-9-patch-inset-boundaries.png
 
     \section3 Exporting 9-Patch Images
 
@@ -2432,7 +2432,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-imagine-customization-dark.png
+                \image qtquickcontrols-imagine-customization-dark.png
     \endtable
 
     In addition to specifying the path in QML, it is also possible to specify
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-index.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-index.qdoc
index ea148e8568..ae16f75078 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-index.qdoc
@@ -12,7 +12,7 @@
     to build complete interfaces in Qt Quick. The module was introduced
     in Qt 5.7.
 
-    \image qtquickcontrols2-styles.png
+    \image qtquickcontrols-styles.png
 
     Qt Quick Controls comes with a selection of customizable styles.
     See \l {Styling Qt Quick Controls} for more details.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-indicators.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-indicators.qdoc
index 1526ec1b80..c8cd6e4f14 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-indicators.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-indicators.html
+    \page qtquickcontrols-indicators.html
     \title Indicator Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for indicator controls
 
     Qt Quick Controls offers a selection of indicator-like controls.
 
-    \annotatedlist qtquickcontrols2-indicators
+    \annotatedlist qtquickcontrols-indicators
 
     Each type of indicator has its own specific target use case. The following
     sections offer guidelines for choosing the appropriate type of indicator,
@@ -17,28 +17,28 @@
 
     \section1 BusyIndicator Control
 
-    \image qtquickcontrols2-busyindicator.png
+    \image qtquickcontrols-busyindicator.png
 
     BusyIndicator can be used to show that an operation is in progress,
     and that the UI has to wait for the operation to complete.
 
     \section1 PageIndicator Control
 
-    \image qtquickcontrols2-pageindicator.png
+    \image qtquickcontrols-pageindicator.png
 
     \l PageIndicator is used to indicate the currently active page in
     a container of multiple pages.
 
     \section1 ProgressBar Control
 
-    \image qtquickcontrols2-progressbar.gif
+    \image qtquickcontrols-progressbar.gif
 
     \l ProgressBar indicates the progress of an operation. The value should be
     updated regularly.
 
     \section1 ScrollBar Control
 
-    \image qtquickcontrols2-scrollbar.gif
+    \image qtquickcontrols-scrollbar.gif
 
     \l ScrollBar is an interactive bar that indicates the current scroll
     position, and can be used to scroll to a specific position in a
@@ -46,7 +46,7 @@
 
     \section1 ScrollIndicator Control
 
-    \image qtquickcontrols2-scrollindicator.gif
+    \image qtquickcontrols-scrollindicator.gif
 
     \l ScrollIndicator is a non-interactive indicator that indicates the
     current scroll position, and can be used to scroll to a specific position in a
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-input.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-input.qdoc
index 580438e8ac..80f5e857bd 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-input.qdoc
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-input.html
+    \page qtquickcontrols-input.html
     \title Input Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for input controls
 
     Qt Quick Controls offers a variety of input controls for both numeric
     and textual input.
 
-    \annotatedlist qtquickcontrols2-input
+    \annotatedlist qtquickcontrols-input
 
     Each type of input control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
@@ -18,7 +18,7 @@
 
     \section1 ComboBox Control
 
-    \image qtquickcontrols2-combobox.gif
+    \image qtquickcontrols-combobox.gif
 
     \l ComboBox is used to select a value from a static multiple-line drop-down list.
     It is not possible to add new values, and only one option can be selected.
@@ -35,7 +35,7 @@
 
     \section1 Dial Control
 
-    \image qtquickcontrols2-dial.png
+    \image qtquickcontrols-dial.png
 
     \l Dial is similar to a traditional dial knob that is found on devices such
     as stereos or industrial equipment.
@@ -57,13 +57,13 @@
 
     \section1 TextArea Control
 
-    \image qtquickcontrols2-textarea.png
+    \image qtquickcontrols-textarea.png
 
     \l TextArea is a multi-line text editor.
 
     \section1 TextField Control
 
-    \image qtquickcontrols2-textfield.png
+    \image qtquickcontrols-textfield.png
 
     \l TextField is a single line text editor.
 
@@ -71,13 +71,13 @@
 
     \section1 Slider Control
 
-    \image qtquickcontrols2-slider.gif
+    \image qtquickcontrols-slider.gif
 
     \l Slider is used to select a value by sliding a handle along a track.
 
     \section1 RangeSlider Control
 
-    \image qtquickcontrols2-rangeslider.gif
+    \image qtquickcontrols-rangeslider.gif
 
     \l RangeSlider is used to select a range specified by two values,
     by sliding each handle along a track.
@@ -86,7 +86,7 @@
 
     \section1 Tumbler Control
 
-    \image qtquickcontrols2-tumbler.png
+    \image qtquickcontrols-tumbler.png
 
     \l Tumbler is a spinnable wheel of items that can be selected.
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-ios.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-ios.qdoc
index 3ac7d51710..2c90552d20 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-ios.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-ios.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-ios.html
+    \page qtquickcontrols-ios.html
     \title iOS Style
 
     The iOS Style is a native-looking style for iOS based on image assets.
@@ -34,9 +34,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-ios-light.png
+            \li \image qtquickcontrols-ios-light.png
                 \caption The iOS style in light theme
-            \li \image qtquickcontrols2-ios-dark.png
+            \li \image qtquickcontrols-ios-dark.png
                 \caption The iOS style in dark theme
     \endtable
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-macos.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-macos.qdoc
index 911baf6c20..97d79c6278 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-macos.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-macos.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-macos.html
+    \page qtquickcontrols-macos.html
     \title macOS Style
 
     The macOS style is a style that looks native on macOS.
@@ -20,9 +20,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-macos-light.png
+            \li \image qtquickcontrols-macos-light.png
                 \caption The macOS style in light theme
-            \li \image qtquickcontrols2-macos-dark.png
+            \li \image qtquickcontrols-macos-dark.png
                 \caption The macOS style in dark theme
     \endtable
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-material.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc
index 8b9c74eabb..36e3b96a97 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-material.html
+    \page qtquickcontrols-material.html
     \title Material Style
 
     The Material Style is based on the Google Material Design Guidelines.
@@ -36,9 +36,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-material-light.png
+            \li \image qtquickcontrols-material-light.png
                 \caption The Material style in light theme
-            \li \image qtquickcontrols2-material-dark.png
+            \li \image qtquickcontrols-material-dark.png
                 \caption The Material style in dark theme
     \endtable
 
@@ -58,7 +58,7 @@
     \l {material-primary-attached-prop}{primary}, \l {material-accent-attached-prop}{accent},
     \l {material-foreground-attached-prop}{foreground}, and \l {material-background-attached-prop}{background}.
 
-    \image qtquickcontrols2-material-attributes.png
+    \image qtquickcontrols-material-attributes.png
 
     All attributes can be specified for any window or item, and they automatically
     propagate to children in the same manner as \l {Control::font}{fonts}. In the
@@ -89,7 +89,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-material-purple.png
+                \image qtquickcontrols-material-purple.png
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
@@ -217,9 +217,9 @@
     \table
         \row
             \li
-                \image qtquickcontrols2-material-variant-normal.png
+                \image qtquickcontrols-material-variant-normal.png
             \li
-                \image qtquickcontrols2-material-variant-dense.png
+                \image qtquickcontrols-material-variant-dense.png
     \endtable
 
     Note that the heights shown above may vary based on differences in fonts
@@ -240,9 +240,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-accent.qml 1
+                \snippet qtquickcontrols-material-accent.qml 1
             \li
-                \image qtquickcontrols2-material-accent.png
+                \image qtquickcontrols-material-accent.png
     \endtable
 
     \note Even though the accent can be any \l {colorvaluetypedocs}{color}, it is
@@ -264,9 +264,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-background.qml 1
+                \snippet qtquickcontrols-material-background.qml 1
             \li
-                \image qtquickcontrols2-material-background.png
+                \image qtquickcontrols-material-background.png
     \endtable
 
     \endstyleproperty
@@ -286,9 +286,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-elevation.qml 1
+                \snippet qtquickcontrols-material-elevation.qml 1
             \li
-                \image qtquickcontrols2-material-elevation.png
+                \image qtquickcontrols-material-elevation.png
     \endtable
 
     \endstyleproperty
@@ -306,9 +306,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-foreground.qml 1
+                \snippet qtquickcontrols-material-foreground.qml 1
             \li
-                \image qtquickcontrols2-material-foreground.png
+                \image qtquickcontrols-material-foreground.png
     \endtable
 
     \endstyleproperty
@@ -348,9 +348,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-material-theme.qml 1
+                \snippet qtquickcontrols-material-theme.qml 1
             \li
-                \image qtquickcontrols2-material-theme.png
+                \image qtquickcontrols-material-theme.png
     \endtable
 
     \endstyleproperty
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-menus.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-menus.qdoc
index 7d54b4f027..f2f5b76ae2 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-menus.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-menus.qdoc
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-menus.html
+    \page qtquickcontrols-menus.html
     \title Menu Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for menu controls
 
-    \annotatedlist qtquickcontrols2-menus
+    \annotatedlist qtquickcontrols-menus
 
     Each type of menu control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
@@ -15,7 +15,7 @@
 
     \section1 Menu Control
 
-    \image qtquickcontrols2-menu.png
+    \image qtquickcontrols-menu.png
 
     \l Menu control can be used for context menus; for example, after
     right-clicking. It can also be used for popup menus; for example, a
@@ -31,7 +31,7 @@
 
     \section1 MenuBar Control
 
-    \image qtquickcontrols2-menubar.png
+    \image qtquickcontrols-menubar.png
 
     \l MenuBar control can be used for window menu bars.
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-navigation.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-navigation.qdoc
index 2013fc8dfd..0f5b1b1dc0 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-navigation.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-navigation.qdoc
@@ -2,21 +2,21 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-navigation.html
+    \page qtquickcontrols-navigation.html
     \title Navigation Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for navigation controls
 
     Qt Quick Controls offers a selection of navigation models.
 
-    \annotatedlist qtquickcontrols2-navigation
+    \annotatedlist qtquickcontrols-navigation
 
     The following sections offer guidelines for choosing the appropriate type
     of navigation model, depending on the use case.
 
     \section1 StackView Control
 
-    \image qtquickcontrols2-stackview-wireframe.png
+    \image qtquickcontrols-stackview-wireframe.png
 
     \l StackView provides a stack-based navigation model which can be used
     with a set of interlinked pages. StackView works according to a last-in
@@ -25,7 +25,7 @@
 
     \section1 SwipeView Control
 
-    \image qtquickcontrols2-swipeview-wireframe.png
+    \image qtquickcontrols-swipeview-wireframe.png
 
     \l SwipeView provides a navigation model that simplifies horizontal paged
     scrolling. The page indicator on the bottom shows which is the presently
@@ -33,14 +33,14 @@
 
     \section1 TabBar Control
 
-    \image qtquickcontrols2-tabbar-wireframe.png
+    \image qtquickcontrols-tabbar-wireframe.png
 
     \l TabBar is a bar with icons or text that allows the user to switch
     between different subtasks, views, or modes.
 
     \section1 TabButton Control
 
-    \image qtquickcontrols2-tabbutton.png
+    \image qtquickcontrols-tabbutton.png
 
     \l TabButton is a button with a layout suitable for a TabBar control.
 */
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-popups.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-popups.qdoc
index 388443e24f..f803ce990a 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-popups.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-popups.qdoc
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-popups.html
+    \page qtquickcontrols-popups.html
     \title Popup Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for popup controls
 
-    \annotatedlist qtquickcontrols2-popups
+    \annotatedlist qtquickcontrols-popups
 
     Each type of popup control has its own specific target use case. The
     following sections offer guidelines for choosing the appropriate type
@@ -15,7 +15,7 @@
 
     \section1 Drawer Control
 
-    \image qtquickcontrols2-drawer-expanded-wireframe.png
+    \image qtquickcontrols-drawer-expanded-wireframe.png
 
     \l Drawer provides a swipe-based side panel, similar to those often used
     in touch interfaces to provide a central location for navigation.
@@ -26,7 +26,7 @@
 
     \section1 Menu Control
 
-    \image qtquickcontrols2-menu.png
+    \image qtquickcontrols-menu.png
 
     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.
@@ -35,7 +35,7 @@
 
     \section1 Popup Control
 
-    \image qtquickcontrols2-popup-settings.png
+    \image qtquickcontrols-popup-settings.png
 
     A \l Popup displays content over other application content.
     It prompts the user to make a decision or enter information.
@@ -53,7 +53,7 @@
 
     \section1 ToolTip Control
 
-    \image qtquickcontrols2-tooltip.png
+    \image qtquickcontrols-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.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-qmltypes.qdoc
index f1ff074b57..f1ff074b57 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-qmltypes.qdoc
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-separators.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-separators.qdoc
index 1105a5bf5f..7c8845aaff 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-separators.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-separators.qdoc
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-separators.html
+    \page qtquickcontrols-separators.html
     \title Separator Controls
-    \ingroup qtquickcontrols2-guidelines
+    \ingroup qtquickcontrols-guidelines
     \brief Guidelines for separator controls
 
     Qt Quick Controls offers a selection of separators.
 
-    \annotatedlist qtquickcontrols2-separators
+    \annotatedlist qtquickcontrols-separators
 
     Each type of separator has its own specific use case. The following
     sections offer guidelines for choosing the appropriate type of separator,
@@ -17,7 +17,7 @@
 
     \section1 MenuSeparator Control
 
-    \image qtquickcontrols2-menuseparator.png
+    \image qtquickcontrols-menuseparator.png
 
     \l MenuSeparator should be used to separate items (typically MenuItem
     controls) in a Menu. Grouping related menu items together makes it easier
@@ -27,7 +27,7 @@
 
     \section1 ToolSeparator Control
 
-    \image qtquickcontrols2-toolseparator.png
+    \image qtquickcontrols-toolseparator.png
 
     \l ToolSeparator should be used to separate items (typically ToolButton
     controls) in a ToolBar. It can be used in horizontal or vertical toolbars.
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-styles.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-styles.qdoc
index df79e08e3f..351732c9a3 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-styles.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-styles.html
+    \page qtquickcontrols-styles.html
     \title Styling Qt Quick Controls
 
     \section1 Available Styles
@@ -11,26 +11,26 @@
 
     \section2 Basic Style
 
-    \image qtquickcontrols2-basic-thumbnail.png
+    \image qtquickcontrols-basic-thumbnail.png
     The \l {Basic Style} is a simple and light-weight all-round style that offers
     the maximum performance for Qt Quick Controls.
 
     \section2 Fusion Style
 
-    \image qtquickcontrols2-fusion-thumbnail.png
+    \image qtquickcontrols-fusion-thumbnail.png
     The \l {Fusion Style} is a platform-agnostic style that offers a desktop-oriented
     look and feel for Qt Quick Controls.
 
     \section2 Imagine Style
 
-    \image qtquickcontrols2-imagine-thumbnail.png
+    \image qtquickcontrols-imagine-thumbnail.png
     The \l {Imagine Style} is based on image assets. The style comes with a default
     set of images which can easily be changed by providing a directory
     with images using a predefined naming convention.
 
     \section2 macOS Style
 
-    \image qtquickcontrols2-macos-thumbnail.png
+    \image qtquickcontrols-macos-thumbnail.png
     The \l {macOS Style} is a native-looking style for macOS.
     \note this style is only available for applications running on macOS.
 
@@ -42,7 +42,7 @@
 
     \section2 Material Style
 
-    \image qtquickcontrols2-material-thumbnail.png
+    \image qtquickcontrols-material-thumbnail.png
     The \l {Material Style} offers an appealing design based on the
     \l {https://www.google.com/design/spec/material-design/introduction.html}
     {Google Material Design Guidelines}, but requires more system resources than
@@ -50,14 +50,14 @@
 
     \section2 Universal Style
 
-    \image qtquickcontrols2-universal-thumbnail.png
+    \image qtquickcontrols-universal-thumbnail.png
     The \l {Universal Style} offers an appealing design based on the
     \l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines},
     but requires more system resources than the Basic style.
 
     \section2 Windows Style
 
-    \image qtquickcontrols2-windows-thumbnail.png
+    \image qtquickcontrols-windows-thumbnail.png
     The \l {Windows Style} is a native-looking style for Windows.
     \note this style is only available for applications running on Windows.
 
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-universal.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc
index 4dfdebb963..4c8db816d7 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-universal.html
+    \page qtquickcontrols-universal.html
     \title Universal Style
 
     The Universal Style is based on the Microsoft Universal Design Guidelines.
@@ -35,9 +35,9 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-universal-light.png
+            \li \image qtquickcontrols-universal-light.png
                 \caption The Universal style in light theme
-            \li \image qtquickcontrols2-universal-dark.png
+            \li \image qtquickcontrols-universal-dark.png
                 \caption The Universal style in dark theme
     \endtable
 
@@ -57,7 +57,7 @@
     \l {universal-accent-attached-prop}{accent}, \l {universal-foreground-attached-prop}{foreground}, and
     \l {universal-background-attached-prop}{background}.
 
-    \image qtquickcontrols2-universal-attributes.png
+    \image qtquickcontrols-universal-attributes.png
 
     Both attributes can be specified for any window or item, and they automatically
     propagate to children in the same manner as \l {Control::font}{fonts}. In the
@@ -88,7 +88,7 @@
                 }
                 \endqml
             \li
-                \image qtquickcontrols2-universal-violet.png
+                \image qtquickcontrols-universal-violet.png
     \endtable
 
     In addition to specifying the attributes in QML, it is also possible to
@@ -165,9 +165,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-accent.qml 1
+                \snippet qtquickcontrols-universal-accent.qml 1
             \li
-                \image qtquickcontrols2-universal-accent.png
+                \image qtquickcontrols-universal-accent.png
     \endtable
 
     \note Even though the accent can be any \l {colorvaluetypedocs}{color}, it is
@@ -189,9 +189,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-background.qml 1
+                \snippet qtquickcontrols-universal-background.qml 1
             \li
-                \image qtquickcontrols2-universal-background.png
+                \image qtquickcontrols-universal-background.png
     \endtable
 
     \endstyleproperty
@@ -209,9 +209,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-foreground.qml 1
+                \snippet qtquickcontrols-universal-foreground.qml 1
             \li
-                \image qtquickcontrols2-universal-foreground.png
+                \image qtquickcontrols-universal-foreground.png
     \endtable
 
     \styleproperty {Universal.theme} {enumeration} {universal-theme-attached-prop}
@@ -234,9 +234,9 @@
     \table
         \row
             \li
-                \snippet qtquickcontrols2-universal-theme.qml 1
+                \snippet qtquickcontrols-universal-theme.qml 1
             \li
-                \image qtquickcontrols2-universal-theme.png
+                \image qtquickcontrols-universal-theme.png
     \endtable
 
     \endstyleproperty
diff --git a/src/quickcontrols/doc/src/qtquickcontrols2-windows.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-windows.qdoc
index e068f3c86d..fee2ffa98f 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols2-windows.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-windows.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page qtquickcontrols2-windows.html
+    \page qtquickcontrols-windows.html
     \title Windows Style
 
     The Windows style is a style that looks native on Windows.
@@ -20,7 +20,7 @@
 
     \table
         \row
-            \li \image qtquickcontrols2-windows.png
+            \li \image qtquickcontrols-windows.png
                 \caption The Windows style
     \endtable