Docs: move qtquickcontrols qdoc files in the right place

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

75 files changed, 8 insertions, 7 deletions

diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index d3b0bbcc..ddf85666 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -5,6 +5,8 @@ IMPORT_VERSION = 2.0
 QT += qml quick
 QT += core-private gui-private qml-private quick-private quicktemplates-private
 
+QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf
+
 OTHER_FILES += \
     qmldir
 
diff --git a/src/templates/doc/images/qtquickcontrols2-busyindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
index 84cd2ed9..84cd2ed9 100644
--- a/src/templates/doc/images/qtquickcontrols2-busyindicator-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-busyindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png
index 87db05a1..87db05a1 100644
--- a/src/templates/doc/images/qtquickcontrols2-busyindicator-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-busyindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif
index 46633c34..46633c34 100644
--- a/src/templates/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif
diff --git a/src/templates/doc/images/qtquickcontrols2-button-background.png b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
index f8e9342c..f8e9342c 100644
--- a/src/templates/doc/images/qtquickcontrols2-button-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-button-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
index 9b9d1eb3..9b9d1eb3 100644
--- a/src/templates/doc/images/qtquickcontrols2-button-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
index 172bf9fe..172bf9fe 100644
--- a/src/templates/doc/images/qtquickcontrols2-button-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-button-label.png b/src/imports/controls/doc/images/qtquickcontrols2-button-label.png
index 6875fc06..6875fc06 100644
--- a/src/templates/doc/images/qtquickcontrols2-button-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-label.png
diff --git a/src/templates/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
index f59669a2..f59669a2 100644
--- a/src/templates/doc/images/qtquickcontrols2-button-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
index c9b14992..c9b14992 100644
--- a/src/templates/doc/images/qtquickcontrols2-button-pressed.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
diff --git a/src/templates/doc/images/qtquickcontrols2-button.gif b/src/imports/controls/doc/images/qtquickcontrols2-button.gif
index 9f08f458..9f08f458 100644
--- a/src/templates/doc/images/qtquickcontrols2-button.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button.gif
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
index 81198821..81198821 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
index f44428e0..f44428e0 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
index ca31061a..ca31061a 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
index 7847fb9b..7847fb9b 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
index 7c6148b6..7c6148b6 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png
index 5bef6df5..5bef6df5 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png
diff --git a/src/templates/doc/images/qtquickcontrols2-checkbox-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
index 790ebc93..790ebc93 100644
--- a/src/templates/doc/images/qtquickcontrols2-checkbox-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-frame-background.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
index e09960fc..e09960fc 100644
--- a/src/templates/doc/images/qtquickcontrols2-frame-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-frame-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png
index bfdf9c1b..bfdf9c1b 100644
--- a/src/templates/doc/images/qtquickcontrols2-frame-frame.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png
diff --git a/src/templates/doc/images/qtquickcontrols2-groupbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
index 36e9aa0f..36e9aa0f 100644
--- a/src/templates/doc/images/qtquickcontrols2-groupbox-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-groupbox-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png
index 11b075d7..11b075d7 100644
--- a/src/templates/doc/images/qtquickcontrols2-groupbox-frame.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png
diff --git a/src/templates/doc/images/qtquickcontrols2-groupbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
index 67ccb4c1..67ccb4c1 100644
--- a/src/templates/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
diff --git a/src/templates/doc/images/qtquickcontrols2-progressbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
index 0fd77835..0fd77835 100644
--- a/src/templates/doc/images/qtquickcontrols2-progressbar-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
index 4baf5c83..4baf5c83 100644
--- a/src/templates/doc/images/qtquickcontrols2-progressbar-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-progressbar-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png
index 02e888ed..02e888ed 100644
--- a/src/templates/doc/images/qtquickcontrols2-progressbar-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-progressbar-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
index 783d721d..783d721d 100644
--- a/src/templates/doc/images/qtquickcontrols2-progressbar-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
index 3ee9590e..3ee9590e 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
index 9f71b6b6..9f71b6b6 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
index f7fbcb7c..f7fbcb7c 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
index dfb8d51e..dfb8d51e 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
index f9e91709..f9e91709 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png
index 16c0ee08..16c0ee08 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png
diff --git a/src/templates/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
index 5a2d4bca..5a2d4bca 100644
--- a/src/templates/doc/images/qtquickcontrols2-radiobutton-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-scrollbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
index 770f546c..770f546c 100644
--- a/src/templates/doc/images/qtquickcontrols2-scrollbar-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-scrollbar-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png
index aafa90a7..aafa90a7 100644
--- a/src/templates/doc/images/qtquickcontrols2-scrollbar-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png
diff --git a/src/templates/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
index e8947aa0..e8947aa0 100644
--- a/src/templates/doc/images/qtquickcontrols2-scrollindicator-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-scrollindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png
index 9d969f16..9d969f16 100644
--- a/src/templates/doc/images/qtquickcontrols2-scrollindicator-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
index 35fb12ca..35fb12ca 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
index 7d4584f8..7d4584f8 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
index 7f9ad18b..7f9ad18b 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
index 7878e0f8..7878e0f8 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
index dac102de..dac102de 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider-track.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png
index 868fa420..868fa420 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider-track.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png
diff --git a/src/templates/doc/images/qtquickcontrols2-slider.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
index 59c94796..59c94796 100644
--- a/src/templates/doc/images/qtquickcontrols2-slider.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
index bfa24fe6..bfa24fe6 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
index fadf851a..fadf851a 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
index 328ff6a9..328ff6a9 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
index 795868b8..795868b8 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
index 5fc9c83b..5fc9c83b 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-label.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png
index 57deabc6..57deabc6 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
index a162e898..a162e898 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-switch.gif b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif
index b2e1b548..b2e1b548 100644
--- a/src/templates/doc/images/qtquickcontrols2-switch.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif
diff --git a/src/templates/doc/images/qtquickcontrols2-textfield-background.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
index a2908200..a2908200 100644
--- a/src/templates/doc/images/qtquickcontrols2-textfield-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-textfield-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
index bb5b779e..bb5b779e 100644
--- a/src/templates/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-textfield-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
index 5d8592c1..5d8592c1 100644
--- a/src/templates/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-textfield-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
index 26ad9c11..26ad9c11 100644
--- a/src/templates/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-textfield-placeholder.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png
index b040315f..b040315f 100644
--- a/src/templates/doc/images/qtquickcontrols2-textfield-placeholder.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
index 8f390b49..8f390b49 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
index fa883751..fa883751 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
index 794692b0..794692b0 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
index f52e4686..f52e4686 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
index 97e06e2c..97e06e2c 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
index 3eb3ba35..3eb3ba35 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
diff --git a/src/templates/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
index b066c565..b066c565 100644
--- a/src/templates/doc/images/qtquickcontrols2-togglebutton-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
diff --git a/src/templates/doc/images/qtquickcontrols2-toolbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
index 28d4fd98..28d4fd98 100644
--- a/src/templates/doc/images/qtquickcontrols2-toolbar-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-toolbar-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png
index 28d4fd98..28d4fd98 100644
--- a/src/templates/doc/images/qtquickcontrols2-toolbar-frame.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png
diff --git a/src/templates/doc/images/qtquickcontrols2-toolbutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
index fd105fee..fd105fee 100644
--- a/src/templates/doc/images/qtquickcontrols2-toolbutton-background.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
diff --git a/src/templates/doc/images/qtquickcontrols2-toolbutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png
index 7aae8dc8..7aae8dc8 100644
--- a/src/templates/doc/images/qtquickcontrols2-toolbutton-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png
diff --git a/src/templates/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index a67cc1f7..9e613328 100644
--- a/src/templates/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -28,14 +28,15 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquick
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Examples will be installed under quick/controls - 'controls' subdirectory
 # is given as part of \example commands
-exampledirs += ../../../examples/quick/controls \
-               ../../imports/controls \
-               ../../../tests/auto/snippets/data \
+exampledirs += ../../../../examples/quick/controls \
+               ../ \
+               ../../../templates \
+               ../../../../tests/auto/snippets/data \
                snippets
 examplesinstallpath = quick/controls
 
-headerdirs += ../
-sourcedirs += ../
+headerdirs += ../../../templates
+sourcedirs += ../../../templates
 
 imagedirs += images
 
diff --git a/src/templates/doc/snippets/basic-example.qml b/src/imports/controls/doc/snippets/basic-example.qml
index 62ab2466..62ab2466 100644
--- a/src/templates/doc/snippets/basic-example.qml
+++ b/src/imports/controls/doc/snippets/basic-example.qml
diff --git a/src/templates/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index b099b482..b099b482 100644
--- a/src/templates/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
diff --git a/src/templates/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index eefd6c3a..eefd6c3a 100644
--- a/src/templates/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
diff --git a/src/templates/doc/src/qtquickcontrols2.qdoc b/src/imports/controls/doc/src/qtquickcontrols2.qdoc
index 9b52b09e..9b52b09e 100644
--- a/src/templates/doc/src/qtquickcontrols2.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2.qdoc
diff --git a/src/templates/templates.pro b/src/templates/templates.pro
index ab189d64..51630961 100644
--- a/src/templates/templates.pro
+++ b/src/templates/templates.pro
@@ -7,8 +7,6 @@ QT += core-private gui-private qml-private quick-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
-QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf
-
 HEADERS += \
     $$PWD/qtquicktemplatesglobal_p.h