Flatten and rename example install path and directory structure

Change-Id: Ib04e79d72c37fa4507517da2d3b1c28ccd73eaed
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

53 files changed, 4 insertions, 4 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index ab3cd2b2..baa83d16 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    controls
+    quickcontrols2
diff --git a/examples/controls/gallery/gallery.cpp b/examples/quickcontrols2/gallery/gallery.cpp
index 778ecbc2..778ecbc2 100644
--- a/examples/controls/gallery/gallery.cpp
+++ b/examples/quickcontrols2/gallery/gallery.cpp
diff --git a/examples/controls/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro
index c31529b7..7f72c9ca 100644
--- a/examples/controls/gallery/gallery.pro
+++ b/examples/quickcontrols2/gallery/gallery.pro
@@ -11,5 +11,5 @@ OTHER_FILES += \
 RESOURCES += \
     gallery.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/gallery
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
 INSTALLS += target
diff --git a/examples/controls/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index ac808649..ac808649 100644
--- a/examples/controls/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
diff --git a/examples/controls/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc
index 89958333..89958333 100644
--- a/examples/controls/gallery/gallery.qrc
+++ b/examples/quickcontrols2/gallery/gallery.qrc
diff --git a/examples/controls/gallery/images/arrow.png b/examples/quickcontrols2/gallery/images/arrow.png
index 340139de..340139de 100644
--- a/examples/controls/gallery/images/arrow.png
+++ b/examples/quickcontrols2/gallery/images/arrow.png
diff --git a/examples/controls/gallery/images/arrow@2x.png b/examples/quickcontrols2/gallery/images/arrow@2x.png
index ef2016e9..ef2016e9 100644
--- a/examples/controls/gallery/images/arrow@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@2x.png
diff --git a/examples/controls/gallery/images/arrow@3x.png b/examples/quickcontrols2/gallery/images/arrow@3x.png
index 86c8506b..86c8506b 100644
--- a/examples/controls/gallery/images/arrow@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@3x.png
diff --git a/examples/controls/gallery/images/arrow@4x.png b/examples/quickcontrols2/gallery/images/arrow@4x.png
index ce70d95b..ce70d95b 100644
--- a/examples/controls/gallery/images/arrow@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@4x.png
diff --git a/examples/controls/gallery/images/arrows.png b/examples/quickcontrols2/gallery/images/arrows.png
index f77e01fa..f77e01fa 100644
--- a/examples/controls/gallery/images/arrows.png
+++ b/examples/quickcontrols2/gallery/images/arrows.png
diff --git a/examples/controls/gallery/images/arrows@2x.png b/examples/quickcontrols2/gallery/images/arrows@2x.png
index 9615d436..9615d436 100644
--- a/examples/controls/gallery/images/arrows@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@2x.png
diff --git a/examples/controls/gallery/images/arrows@3x.png b/examples/quickcontrols2/gallery/images/arrows@3x.png
index b6a53e1c..b6a53e1c 100644
--- a/examples/controls/gallery/images/arrows@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@3x.png
diff --git a/examples/controls/gallery/images/arrows@4x.png b/examples/quickcontrols2/gallery/images/arrows@4x.png
index 099ed1b5..099ed1b5 100644
--- a/examples/controls/gallery/images/arrows@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@4x.png
diff --git a/examples/controls/gallery/images/drawer.png b/examples/quickcontrols2/gallery/images/drawer.png
index 1e974efa..1e974efa 100644
--- a/examples/controls/gallery/images/drawer.png
+++ b/examples/quickcontrols2/gallery/images/drawer.png
diff --git a/examples/controls/gallery/images/drawer@2x.png b/examples/quickcontrols2/gallery/images/drawer@2x.png
index eba3b6cc..eba3b6cc 100644
--- a/examples/controls/gallery/images/drawer@2x.png
+++ b/examples/quickcontrols2/gallery/images/drawer@2x.png
diff --git a/examples/controls/gallery/images/drawer@3x.png b/examples/quickcontrols2/gallery/images/drawer@3x.png
index 3584ed6d..3584ed6d 100644
--- a/examples/controls/gallery/images/drawer@3x.png
+++ b/examples/quickcontrols2/gallery/images/drawer@3x.png
diff --git a/examples/controls/gallery/images/drawer@4x.png b/examples/quickcontrols2/gallery/images/drawer@4x.png
index 60d93aff..60d93aff 100644
--- a/examples/controls/gallery/images/drawer@4x.png
+++ b/examples/quickcontrols2/gallery/images/drawer@4x.png
diff --git a/examples/controls/gallery/images/menu.png b/examples/quickcontrols2/gallery/images/menu.png
index a10473d9..a10473d9 100644
--- a/examples/controls/gallery/images/menu.png
+++ b/examples/quickcontrols2/gallery/images/menu.png
diff --git a/examples/controls/gallery/images/menu@2x.png b/examples/quickcontrols2/gallery/images/menu@2x.png
index 649c2a08..649c2a08 100644
--- a/examples/controls/gallery/images/menu@2x.png
+++ b/examples/quickcontrols2/gallery/images/menu@2x.png
diff --git a/examples/controls/gallery/images/menu@3x.png b/examples/quickcontrols2/gallery/images/menu@3x.png
index 9554b695..9554b695 100644
--- a/examples/controls/gallery/images/menu@3x.png
+++ b/examples/quickcontrols2/gallery/images/menu@3x.png
diff --git a/examples/controls/gallery/images/menu@4x.png b/examples/quickcontrols2/gallery/images/menu@4x.png
index 187c171c..187c171c 100644
--- a/examples/controls/gallery/images/menu@4x.png
+++ b/examples/quickcontrols2/gallery/images/menu@4x.png
diff --git a/examples/controls/gallery/images/qt-logo.png b/examples/quickcontrols2/gallery/images/qt-logo.png
index 8b0772b0..8b0772b0 100644
--- a/examples/controls/gallery/images/qt-logo.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo.png
diff --git a/examples/controls/gallery/images/qt-logo@2x.png b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
index 0d1d499b..0d1d499b 100644
--- a/examples/controls/gallery/images/qt-logo@2x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
diff --git a/examples/controls/gallery/images/qt-logo@3x.png b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
index c9aae358..c9aae358 100644
--- a/examples/controls/gallery/images/qt-logo@3x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
diff --git a/examples/controls/gallery/images/qt-logo@4x.png b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
index ad0ebd03..ad0ebd03 100644
--- a/examples/controls/gallery/images/qt-logo@4x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
diff --git a/examples/controls/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
index 2d538216..2d538216 100644
--- a/examples/controls/gallery/pages/BusyIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
diff --git a/examples/controls/gallery/pages/ButtonPage.qml b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
index 4ac657d2..4ac657d2 100644
--- a/examples/controls/gallery/pages/ButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
diff --git a/examples/controls/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
index 861f144d..861f144d 100644
--- a/examples/controls/gallery/pages/CheckBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
diff --git a/examples/controls/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
index 3c497c48..3c497c48 100644
--- a/examples/controls/gallery/pages/ComboBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
diff --git a/examples/controls/gallery/pages/DialPage.qml b/examples/quickcontrols2/gallery/pages/DialPage.qml
index 5277d7b0..5277d7b0 100644
--- a/examples/controls/gallery/pages/DialPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DialPage.qml
diff --git a/examples/controls/gallery/pages/DrawerPage.qml b/examples/quickcontrols2/gallery/pages/DrawerPage.qml
index 910a0c7c..910a0c7c 100644
--- a/examples/controls/gallery/pages/DrawerPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DrawerPage.qml
diff --git a/examples/controls/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml
index 5b3ef4de..5b3ef4de 100644
--- a/examples/controls/gallery/pages/FramePage.qml
+++ b/examples/quickcontrols2/gallery/pages/FramePage.qml
diff --git a/examples/controls/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
index e9d67849..e9d67849 100644
--- a/examples/controls/gallery/pages/GroupBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
diff --git a/examples/controls/gallery/pages/MenuPage.qml b/examples/quickcontrols2/gallery/pages/MenuPage.qml
index 119be559..119be559 100644
--- a/examples/controls/gallery/pages/MenuPage.qml
+++ b/examples/quickcontrols2/gallery/pages/MenuPage.qml
diff --git a/examples/controls/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
index f8557f24..f8557f24 100644
--- a/examples/controls/gallery/pages/PageIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
diff --git a/examples/controls/gallery/pages/PopupPage.qml b/examples/quickcontrols2/gallery/pages/PopupPage.qml
index d2685969..d2685969 100644
--- a/examples/controls/gallery/pages/PopupPage.qml
+++ b/examples/quickcontrols2/gallery/pages/PopupPage.qml
diff --git a/examples/controls/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
index 7beb4125..7beb4125 100644
--- a/examples/controls/gallery/pages/ProgressBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
diff --git a/examples/controls/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
index fe6a751c..fe6a751c 100644
--- a/examples/controls/gallery/pages/RadioButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
diff --git a/examples/controls/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
index c41097df..c41097df 100644
--- a/examples/controls/gallery/pages/RangeSliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
diff --git a/examples/controls/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
index 0db1888d..0db1888d 100644
--- a/examples/controls/gallery/pages/ScrollBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
diff --git a/examples/controls/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
index 658b7d15..658b7d15 100644
--- a/examples/controls/gallery/pages/ScrollIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
diff --git a/examples/controls/gallery/pages/SliderPage.qml b/examples/quickcontrols2/gallery/pages/SliderPage.qml
index 550ccec9..550ccec9 100644
--- a/examples/controls/gallery/pages/SliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SliderPage.qml
diff --git a/examples/controls/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
index c309ce8e..c309ce8e 100644
--- a/examples/controls/gallery/pages/SpinBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
diff --git a/examples/controls/gallery/pages/StackViewPage.qml b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
index 42e1df43..42e1df43 100644
--- a/examples/controls/gallery/pages/StackViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
diff --git a/examples/controls/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
index 29739451..29739451 100644
--- a/examples/controls/gallery/pages/SwipeViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
diff --git a/examples/controls/gallery/pages/SwitchPage.qml b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
index ebb4f2ee..ebb4f2ee 100644
--- a/examples/controls/gallery/pages/SwitchPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
diff --git a/examples/controls/gallery/pages/TabBarPage.qml b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
index 0ab4a100..0ab4a100 100644
--- a/examples/controls/gallery/pages/TabBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
diff --git a/examples/controls/gallery/pages/TextAreaPage.qml b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
index 8ca759c8..8ca759c8 100644
--- a/examples/controls/gallery/pages/TextAreaPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
diff --git a/examples/controls/gallery/pages/TextFieldPage.qml b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
index 761d2fa6..761d2fa6 100644
--- a/examples/controls/gallery/pages/TextFieldPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
diff --git a/examples/controls/gallery/pages/TumblerPage.qml b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
index b15407e5..b15407e5 100644
--- a/examples/controls/gallery/pages/TumblerPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
diff --git a/examples/controls/gallery/qtlabscontrols.conf b/examples/quickcontrols2/gallery/qtlabscontrols.conf
index 8f176563..8f176563 100644
--- a/examples/controls/gallery/qtlabscontrols.conf
+++ b/examples/quickcontrols2/gallery/qtlabscontrols.conf
diff --git a/examples/controls/controls.pro b/examples/quickcontrols2/quickcontrols2.pro
index 889077f2..889077f2 100644
--- a/examples/controls/controls.pro
+++ b/examples/quickcontrols2/quickcontrols2.pro
diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf
index cfd5ec55..662892b2 100644
--- a/src/imports/controls/doc/qtlabscontrols.qdocconf
+++ b/src/imports/controls/doc/qtlabscontrols.qdocconf
@@ -28,14 +28,14 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquick
 # 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/controls \
+exampledirs += ../../../../examples/quickcontrols2 \
                ../ \
                ../../../templates \
                ../../calendar \
                ../../../../tests/auto/controls/data \
                snippets
 
-examplesinstallpath = qtquickcontrols2/controls
+examplesinstallpath = qtquickcontrols2/quickcontrols2
 
 headerdirs += ../../../templates \
               ../../calendar \