Move Qt Quick Shapes examples back under Qt Quick

In order to be accessible from Qt Creator, the modules either has
to have a separate landing page and qdocconf, or we need it under
the same subdirectory as everything else. We currently want
Qt Quick Shapes to be like Qt Quick Particles and be documented
as part of Qt Quick, so the examples move back into a quickshapes/
subdirectory of examples/quick (like with examples/quick/particles/)

Pick-to: 6.7
Change-Id: Ib7aaa75da7c4c9eeca6edb5ede7952598f37df89
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

95 files changed, 19 insertions, 19 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 5fde502f51..6d80d3a5d3 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -6,7 +6,6 @@ qt_examples_build_begin(EXTERNAL_BUILD)
 add_subdirectory(qml)
 if(TARGET Qt6::Quick)
     add_subdirectory(quick)
-    add_subdirectory(quickshapes)
 endif()
 if(TARGET Qt6::QuickTemplates2)
     add_subdirectory(quickcontrols)
diff --git a/examples/examples.pro b/examples/examples.pro
index 711becc5fe..b73064e0c7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS += qml
-qtHaveModule(quick): SUBDIRS += quick quickcontrols quickshapes
+qtHaveModule(quick): SUBDIRS += quick quickcontrols
 
diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt
index a91f108386..f1f3ecaa24 100644
--- a/examples/quick/CMakeLists.txt
+++ b/examples/quick/CMakeLists.txt
@@ -35,6 +35,7 @@ endif()
 if(TARGET Qt6::QuickWidgets AND TARGET Qt6::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
     add_subdirectory(quickwidgets)
 endif()
+add_subdirectory(quickshapes)
 
 # qt_examples_build_end() misses at least some of these due to some
 # source subdirectories being added multiple times. See QTBUG-96159.
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 70e2accc33..b9fb3b48d1 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -24,7 +24,8 @@ SUBDIRS =   quick-accessibility \
             window \
             particles \
             itemvariablerefreshrate \
-            multieffect
+            multieffect \
+            quickshapes
 
 #OpenGL Support Required
 qtConfig(opengl(es1|es2)?) {
diff --git a/examples/quickshapes/CMakeLists.txt b/examples/quick/quickshapes/CMakeLists.txt
index a40227711a..a40227711a 100644
--- a/examples/quickshapes/CMakeLists.txt
+++ b/examples/quick/quickshapes/CMakeLists.txt
diff --git a/examples/quick/quickshapes/quickshapes.pro b/examples/quick/quickshapes/quickshapes.pro
new file mode 100644
index 0000000000..80465eb81d
--- /dev/null
+++ b/examples/quick/quickshapes/quickshapes.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = shapes weatherforecast
diff --git a/examples/quickshapes/shapes/CMakeLists.txt b/examples/quick/quickshapes/shapes/CMakeLists.txt
index 351baa5267..d0d35b0560 100644
--- a/examples/quickshapes/shapes/CMakeLists.txt
+++ b/examples/quick/quickshapes/shapes/CMakeLists.txt
@@ -8,13 +8,13 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickshapes/shapes")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quickshapes/shapes")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
 qt_standard_project_setup(REQUIRES 6.5)
 
-add_subdirectory("../../quick/shared" "shared")
+add_subdirectory("../../shared" "shared")
 
 qt_add_executable(shapesexample
     WIN32
diff --git a/examples/quickshapes/shapes/arcDirection.qml b/examples/quick/quickshapes/shapes/arcDirection.qml
index 60ec181380..60ec181380 100644
--- a/examples/quickshapes/shapes/arcDirection.qml
+++ b/examples/quick/quickshapes/shapes/arcDirection.qml
diff --git a/examples/quickshapes/shapes/arcRotation.qml b/examples/quick/quickshapes/shapes/arcRotation.qml
index 2433280698..2433280698 100644
--- a/examples/quickshapes/shapes/arcRotation.qml
+++ b/examples/quick/quickshapes/shapes/arcRotation.qml
diff --git a/examples/quickshapes/shapes/capStyles.qml b/examples/quick/quickshapes/shapes/capStyles.qml
index 7fc7a4e2b9..7fc7a4e2b9 100644
--- a/examples/quickshapes/shapes/capStyles.qml
+++ b/examples/quick/quickshapes/shapes/capStyles.qml
diff --git a/examples/quickshapes/shapes/clippedtigers.qml b/examples/quick/quickshapes/shapes/clippedtigers.qml
index 8885f60dd7..8885f60dd7 100644
--- a/examples/quickshapes/shapes/clippedtigers.qml
+++ b/examples/quick/quickshapes/shapes/clippedtigers.qml
diff --git a/examples/quickshapes/shapes/cubicCurve.qml b/examples/quick/quickshapes/shapes/cubicCurve.qml
index 3fa4ed6f4b..3fa4ed6f4b 100644
--- a/examples/quickshapes/shapes/cubicCurve.qml
+++ b/examples/quick/quickshapes/shapes/cubicCurve.qml
diff --git a/examples/quickshapes/shapes/dashPattern.qml b/examples/quick/quickshapes/shapes/dashPattern.qml
index 742f8622e9..742f8622e9 100644
--- a/examples/quickshapes/shapes/dashPattern.qml
+++ b/examples/quick/quickshapes/shapes/dashPattern.qml
diff --git a/examples/quickshapes/shapes/doc/images/qml-shapes-example.png b/examples/quick/quickshapes/shapes/doc/images/qml-shapes-example.png
index 055fc244ea..055fc244ea 100644
--- a/examples/quickshapes/shapes/doc/images/qml-shapes-example.png
+++ b/examples/quick/quickshapes/shapes/doc/images/qml-shapes-example.png
diff --git a/examples/quickshapes/shapes/doc/src/shapes.qdoc b/examples/quick/quickshapes/shapes/doc/src/shapes.qdoc
index d5aea450c4..eb9f5da52d 100644
--- a/examples/quickshapes/shapes/doc/src/shapes.qdoc
+++ b/examples/quick/quickshapes/shapes/doc/src/shapes.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 /*!
     \title Qt Quick Examples - Shapes
-    \example shapes
+    \example quickshapes/shapes
     \image qml-shapes-example.png
     \brief A Qt Quick example demonstrating the use of shape items.
     \ingroup qtquickexamples
diff --git a/examples/quickshapes/shapes/ellipticalArcs.qml b/examples/quick/quickshapes/shapes/ellipticalArcs.qml
index d2b65cb4c1..d2b65cb4c1 100644
--- a/examples/quickshapes/shapes/ellipticalArcs.qml
+++ b/examples/quick/quickshapes/shapes/ellipticalArcs.qml
diff --git a/examples/quickshapes/shapes/fillRules.qml b/examples/quick/quickshapes/shapes/fillRules.qml
index 1e96af94e7..1e96af94e7 100644
--- a/examples/quickshapes/shapes/fillRules.qml
+++ b/examples/quick/quickshapes/shapes/fillRules.qml
diff --git a/examples/quickshapes/shapes/gradientSpreadModes.qml b/examples/quick/quickshapes/shapes/gradientSpreadModes.qml
index ba2dc2b734..ba2dc2b734 100644
--- a/examples/quickshapes/shapes/gradientSpreadModes.qml
+++ b/examples/quick/quickshapes/shapes/gradientSpreadModes.qml
diff --git a/examples/quickshapes/shapes/interactive.qml b/examples/quick/quickshapes/shapes/interactive.qml
index 0525f4eed3..0525f4eed3 100644
--- a/examples/quickshapes/shapes/interactive.qml
+++ b/examples/quick/quickshapes/shapes/interactive.qml
diff --git a/examples/quickshapes/shapes/joinStyles.qml b/examples/quick/quickshapes/shapes/joinStyles.qml
index 127cb50fbe..127cb50fbe 100644
--- a/examples/quickshapes/shapes/joinStyles.qml
+++ b/examples/quick/quickshapes/shapes/joinStyles.qml
diff --git a/examples/quickshapes/shapes/largeOrSmallArc.qml b/examples/quick/quickshapes/shapes/largeOrSmallArc.qml
index 0d887d162d..0d887d162d 100644
--- a/examples/quickshapes/shapes/largeOrSmallArc.qml
+++ b/examples/quick/quickshapes/shapes/largeOrSmallArc.qml
diff --git a/examples/quickshapes/shapes/linearGradient.qml b/examples/quick/quickshapes/shapes/linearGradient.qml
index cb89be7e6b..cb89be7e6b 100644
--- a/examples/quickshapes/shapes/linearGradient.qml
+++ b/examples/quick/quickshapes/shapes/linearGradient.qml
diff --git a/examples/quickshapes/shapes/main.cpp b/examples/quick/quickshapes/shapes/main.cpp
index 4114c3f388..f8a895da83 100644
--- a/examples/quickshapes/shapes/main.cpp
+++ b/examples/quick/quickshapes/shapes/main.cpp
@@ -1,4 +1,4 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-#include "../../quick/shared/shared.h"
+#include "../../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(shapes/main)
diff --git a/examples/quickshapes/shapes/main.qml b/examples/quick/quickshapes/shapes/main.qml
index ddd6e4edf0..ddd6e4edf0 100644
--- a/examples/quickshapes/shapes/main.qml
+++ b/examples/quick/quickshapes/shapes/main.qml
diff --git a/examples/quickshapes/shapes/quadraticCurve.qml b/examples/quick/quickshapes/shapes/quadraticCurve.qml
index d626d2693a..d626d2693a 100644
--- a/examples/quickshapes/shapes/quadraticCurve.qml
+++ b/examples/quick/quickshapes/shapes/quadraticCurve.qml
diff --git a/examples/quickshapes/shapes/radialGradient.qml b/examples/quick/quickshapes/shapes/radialGradient.qml
index 87db319c9a..87db319c9a 100644
--- a/examples/quickshapes/shapes/radialGradient.qml
+++ b/examples/quick/quickshapes/shapes/radialGradient.qml
diff --git a/examples/quickshapes/shapes/sampling.qml b/examples/quick/quickshapes/shapes/sampling.qml
index 27515b6722..27515b6722 100644
--- a/examples/quickshapes/shapes/sampling.qml
+++ b/examples/quick/quickshapes/shapes/sampling.qml
diff --git a/examples/quickshapes/shapes/shapegallery.qml b/examples/quick/quickshapes/shapes/shapegallery.qml
index 74059b8208..74059b8208 100644
--- a/examples/quickshapes/shapes/shapegallery.qml
+++ b/examples/quick/quickshapes/shapes/shapegallery.qml
diff --git a/examples/quickshapes/shapes/shapes.pro b/examples/quick/quickshapes/shapes/shapes.pro
index 397b29bf11..f14a02a23c 100644
--- a/examples/quickshapes/shapes/shapes.pro
+++ b/examples/quick/quickshapes/shapes/shapes.pro
@@ -4,7 +4,7 @@ QT += quick qml
 SOURCES += main.cpp
 RESOURCES += \
     shapes.qrc \
-    ../../quick/shared/shared.qrc
+    ../../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickshapes/shapes
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/quickshapes/shapes
 INSTALLS += target
diff --git a/examples/quickshapes/shapes/shapes.qrc b/examples/quick/quickshapes/shapes/shapes.qrc
index 413816dba2..413816dba2 100644
--- a/examples/quickshapes/shapes/shapes.qrc
+++ b/examples/quick/quickshapes/shapes/shapes.qrc
diff --git a/examples/quickshapes/shapes/strokeOrFill.qml b/examples/quick/quickshapes/shapes/strokeOrFill.qml
index c939ed067d..c939ed067d 100644
--- a/examples/quickshapes/shapes/strokeOrFill.qml
+++ b/examples/quick/quickshapes/shapes/strokeOrFill.qml
diff --git a/examples/quickshapes/shapes/tapableTriangle.qml b/examples/quick/quickshapes/shapes/tapableTriangle.qml
index c76821e898..c76821e898 100644
--- a/examples/quickshapes/shapes/tapableTriangle.qml
+++ b/examples/quick/quickshapes/shapes/tapableTriangle.qml
diff --git a/examples/quickshapes/shapes/text.qml b/examples/quick/quickshapes/shapes/text.qml
index 8a105fb254..8a105fb254 100644
--- a/examples/quickshapes/shapes/text.qml
+++ b/examples/quick/quickshapes/shapes/text.qml
diff --git a/examples/quickshapes/shapes/tiger.qml b/examples/quick/quickshapes/shapes/tiger.qml
index 40fcaf7fc2..40fcaf7fc2 100644
--- a/examples/quickshapes/shapes/tiger.qml
+++ b/examples/quick/quickshapes/shapes/tiger.qml
diff --git a/examples/quickshapes/shapes/tigerLoader.qml b/examples/quick/quickshapes/shapes/tigerLoader.qml
index e49d33a828..e49d33a828 100644
--- a/examples/quickshapes/shapes/tigerLoader.qml
+++ b/examples/quick/quickshapes/shapes/tigerLoader.qml
diff --git a/examples/quickshapes/shapes/zoomtiger.qml b/examples/quick/quickshapes/shapes/zoomtiger.qml
index f23df0ca62..f23df0ca62 100644
--- a/examples/quickshapes/shapes/zoomtiger.qml
+++ b/examples/quick/quickshapes/shapes/zoomtiger.qml
diff --git a/examples/quickshapes/weatherforecast/BouncyShape.qml b/examples/quick/quickshapes/weatherforecast/BouncyShape.qml
index 6b2de82d1b..6b2de82d1b 100644
--- a/examples/quickshapes/weatherforecast/BouncyShape.qml
+++ b/examples/quick/quickshapes/weatherforecast/BouncyShape.qml
diff --git a/examples/quickshapes/weatherforecast/CMakeLists.txt b/examples/quick/quickshapes/weatherforecast/CMakeLists.txt
index 83ad522227..b1a6edf44e 100644
--- a/examples/quickshapes/weatherforecast/CMakeLists.txt
+++ b/examples/quick/quickshapes/weatherforecast/CMakeLists.txt
@@ -8,13 +8,13 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickshapes/weatherforecast")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quickshapes/weatherforecast")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
 qt_standard_project_setup(REQUIRES 6.5)
 
-add_subdirectory("../../quick/shared" "shared")
+add_subdirectory("../../shared" "shared")
 
 qt_add_executable(weatherforecastexample
     WIN32
diff --git a/examples/quickshapes/weatherforecast/Cloud.qml b/examples/quick/quickshapes/weatherforecast/Cloud.qml
index 64a06d4c72..64a06d4c72 100644
--- a/examples/quickshapes/weatherforecast/Cloud.qml
+++ b/examples/quick/quickshapes/weatherforecast/Cloud.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithLightning.qml b/examples/quick/quickshapes/weatherforecast/CloudWithLightning.qml
index da91eb2838..da91eb2838 100644
--- a/examples/quickshapes/weatherforecast/CloudWithLightning.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithLightning.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithLightningAndRain_generated.qml b/examples/quick/quickshapes/weatherforecast/CloudWithLightningAndRain_generated.qml
index 82ffb6fb77..82ffb6fb77 100644
--- a/examples/quickshapes/weatherforecast/CloudWithLightningAndRain_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithLightningAndRain_generated.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithLightning_generated.qml b/examples/quick/quickshapes/weatherforecast/CloudWithLightning_generated.qml
index 0f7fdcd951..0f7fdcd951 100644
--- a/examples/quickshapes/weatherforecast/CloudWithLightning_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithLightning_generated.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithRain.qml b/examples/quick/quickshapes/weatherforecast/CloudWithRain.qml
index e332d90a67..e332d90a67 100644
--- a/examples/quickshapes/weatherforecast/CloudWithRain.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithRain.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithRain_generated.qml b/examples/quick/quickshapes/weatherforecast/CloudWithRain_generated.qml
index 2c1dad1f18..2c1dad1f18 100644
--- a/examples/quickshapes/weatherforecast/CloudWithRain_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithRain_generated.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithSnow.qml b/examples/quick/quickshapes/weatherforecast/CloudWithSnow.qml
index d74648898f..d74648898f 100644
--- a/examples/quickshapes/weatherforecast/CloudWithSnow.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithSnow.qml
diff --git a/examples/quickshapes/weatherforecast/CloudWithSnow_generated.qml b/examples/quick/quickshapes/weatherforecast/CloudWithSnow_generated.qml
index 6e293662a7..6e293662a7 100644
--- a/examples/quickshapes/weatherforecast/CloudWithSnow_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/CloudWithSnow_generated.qml
diff --git a/examples/quickshapes/weatherforecast/Cloud_generated.qml b/examples/quick/quickshapes/weatherforecast/Cloud_generated.qml
index e09e91d4ea..e09e91d4ea 100644
--- a/examples/quickshapes/weatherforecast/Cloud_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/Cloud_generated.qml
diff --git a/examples/quickshapes/weatherforecast/DemoShape.qml b/examples/quick/quickshapes/weatherforecast/DemoShape.qml
index e0719d39f9..e0719d39f9 100644
--- a/examples/quickshapes/weatherforecast/DemoShape.qml
+++ b/examples/quick/quickshapes/weatherforecast/DemoShape.qml
diff --git a/examples/quickshapes/weatherforecast/Europe.qml b/examples/quick/quickshapes/weatherforecast/Europe.qml
index 20a804c28b..20a804c28b 100644
--- a/examples/quickshapes/weatherforecast/Europe.qml
+++ b/examples/quick/quickshapes/weatherforecast/Europe.qml
diff --git a/examples/quickshapes/weatherforecast/Europe_generated.qml b/examples/quick/quickshapes/weatherforecast/Europe_generated.qml
index 7b2cd48692..7b2cd48692 100644
--- a/examples/quickshapes/weatherforecast/Europe_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/Europe_generated.qml
diff --git a/examples/quickshapes/weatherforecast/Gear.qml b/examples/quick/quickshapes/weatherforecast/Gear.qml
index ef6db2b090..ef6db2b090 100644
--- a/examples/quickshapes/weatherforecast/Gear.qml
+++ b/examples/quick/quickshapes/weatherforecast/Gear.qml
diff --git a/examples/quickshapes/weatherforecast/Gear_generated.qml b/examples/quick/quickshapes/weatherforecast/Gear_generated.qml
index aafdcaeeac..aafdcaeeac 100644
--- a/examples/quickshapes/weatherforecast/Gear_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/Gear_generated.qml
diff --git a/examples/quickshapes/weatherforecast/MapLabel.qml b/examples/quick/quickshapes/weatherforecast/MapLabel.qml
index 66ba91ecde..66ba91ecde 100644
--- a/examples/quickshapes/weatherforecast/MapLabel.qml
+++ b/examples/quick/quickshapes/weatherforecast/MapLabel.qml
diff --git a/examples/quickshapes/weatherforecast/SettingsDrawer.qml b/examples/quick/quickshapes/weatherforecast/SettingsDrawer.qml
index deb6b02b95..deb6b02b95 100644
--- a/examples/quickshapes/weatherforecast/SettingsDrawer.qml
+++ b/examples/quick/quickshapes/weatherforecast/SettingsDrawer.qml
diff --git a/examples/quickshapes/weatherforecast/Sun.qml b/examples/quick/quickshapes/weatherforecast/Sun.qml
index b65a11371d..b65a11371d 100644
--- a/examples/quickshapes/weatherforecast/Sun.qml
+++ b/examples/quick/quickshapes/weatherforecast/Sun.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindCloud.qml b/examples/quick/quickshapes/weatherforecast/SunBehindCloud.qml
index 7ca3eee981..7ca3eee981 100644
--- a/examples/quickshapes/weatherforecast/SunBehindCloud.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindCloud.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindCloud_generated.qml b/examples/quick/quickshapes/weatherforecast/SunBehindCloud_generated.qml
index d70505365f..d70505365f 100644
--- a/examples/quickshapes/weatherforecast/SunBehindCloud_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindCloud_generated.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindLargeCloud_generated.qml b/examples/quick/quickshapes/weatherforecast/SunBehindLargeCloud_generated.qml
index 0103892000..0103892000 100644
--- a/examples/quickshapes/weatherforecast/SunBehindLargeCloud_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindLargeCloud_generated.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindRainCloud.qml b/examples/quick/quickshapes/weatherforecast/SunBehindRainCloud.qml
index 9a3c593174..9a3c593174 100644
--- a/examples/quickshapes/weatherforecast/SunBehindRainCloud.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindRainCloud.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindRainCloud_generated.qml b/examples/quick/quickshapes/weatherforecast/SunBehindRainCloud_generated.qml
index 2b85ffb24b..2b85ffb24b 100644
--- a/examples/quickshapes/weatherforecast/SunBehindRainCloud_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindRainCloud_generated.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindSmallCloud.qml b/examples/quick/quickshapes/weatherforecast/SunBehindSmallCloud.qml
index b9d39522bf..b9d39522bf 100644
--- a/examples/quickshapes/weatherforecast/SunBehindSmallCloud.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindSmallCloud.qml
diff --git a/examples/quickshapes/weatherforecast/SunBehindSmallCloud_generated.qml b/examples/quick/quickshapes/weatherforecast/SunBehindSmallCloud_generated.qml
index 19f5ff30cd..19f5ff30cd 100644
--- a/examples/quickshapes/weatherforecast/SunBehindSmallCloud_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/SunBehindSmallCloud_generated.qml
diff --git a/examples/quickshapes/weatherforecast/Sun_generated.qml b/examples/quick/quickshapes/weatherforecast/Sun_generated.qml
index 1d11f5acf9..1d11f5acf9 100644
--- a/examples/quickshapes/weatherforecast/Sun_generated.qml
+++ b/examples/quick/quickshapes/weatherforecast/Sun_generated.qml
diff --git a/examples/quickshapes/weatherforecast/assets/Europe.svg b/examples/quick/quickshapes/weatherforecast/assets/Europe.svg
index 2717687f51..2717687f51 100644
--- a/examples/quickshapes/weatherforecast/assets/Europe.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/Europe.svg
diff --git a/examples/quickshapes/weatherforecast/assets/OFL.txt b/examples/quick/quickshapes/weatherforecast/assets/OFL.txt
index d3a046cf57..d3a046cf57 100644
--- a/examples/quickshapes/weatherforecast/assets/OFL.txt
+++ b/examples/quick/quickshapes/weatherforecast/assets/OFL.txt
diff --git a/examples/quickshapes/weatherforecast/assets/WorkSans-Regular.ttf b/examples/quick/quickshapes/weatherforecast/assets/WorkSans-Regular.ttf
index 20c7240371..20c7240371 100644
--- a/examples/quickshapes/weatherforecast/assets/WorkSans-Regular.ttf
+++ b/examples/quick/quickshapes/weatherforecast/assets/WorkSans-Regular.ttf
diff --git a/examples/quickshapes/weatherforecast/assets/apache.txt b/examples/quick/quickshapes/weatherforecast/assets/apache.txt
index 989e2c59e9..989e2c59e9 100644
--- a/examples/quickshapes/weatherforecast/assets/apache.txt
+++ b/examples/quick/quickshapes/weatherforecast/assets/apache.txt
diff --git a/examples/quickshapes/weatherforecast/assets/arrow.svg b/examples/quick/quickshapes/weatherforecast/assets/arrow.svg
index 831b8d6239..831b8d6239 100644
--- a/examples/quickshapes/weatherforecast/assets/arrow.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/arrow.svg
diff --git a/examples/quickshapes/weatherforecast/assets/attribution.txt b/examples/quick/quickshapes/weatherforecast/assets/attribution.txt
index eee8ebab4e..eee8ebab4e 100644
--- a/examples/quickshapes/weatherforecast/assets/attribution.txt
+++ b/examples/quick/quickshapes/weatherforecast/assets/attribution.txt
diff --git a/examples/quickshapes/weatherforecast/assets/checkbox-multiple-blank-outline.svg b/examples/quick/quickshapes/weatherforecast/assets/checkbox-multiple-blank-outline.svg
index 3f3f7cb691..3f3f7cb691 100644
--- a/examples/quickshapes/weatherforecast/assets/checkbox-multiple-blank-outline.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/checkbox-multiple-blank-outline.svg
diff --git a/examples/quickshapes/weatherforecast/assets/checkbox-multiple-marked-outline.svg b/examples/quick/quickshapes/weatherforecast/assets/checkbox-multiple-marked-outline.svg
index aa6ae296e2..aa6ae296e2 100644
--- a/examples/quickshapes/weatherforecast/assets/checkbox-multiple-marked-outline.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/checkbox-multiple-marked-outline.svg
diff --git a/examples/quickshapes/weatherforecast/assets/cloud-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/cloud-svgrepo-com.svg
index 2dac977b7c..2dac977b7c 100644
--- a/examples/quickshapes/weatherforecast/assets/cloud-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/cloud-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/cloud-with-lightning-and-rain-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-lightning-and-rain-svgrepo-com.svg
index 78a958817c..78a958817c 100644
--- a/examples/quickshapes/weatherforecast/assets/cloud-with-lightning-and-rain-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-lightning-and-rain-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/cloud-with-lightning-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-lightning-svgrepo-com.svg
index 88ff853912..88ff853912 100644
--- a/examples/quickshapes/weatherforecast/assets/cloud-with-lightning-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-lightning-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/cloud-with-rain-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-rain-svgrepo-com.svg
index 93f690c7bb..93f690c7bb 100644
--- a/examples/quickshapes/weatherforecast/assets/cloud-with-rain-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-rain-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/cloud-with-snow-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-snow-svgrepo-com.svg
index 978570a9cd..978570a9cd 100644
--- a/examples/quickshapes/weatherforecast/assets/cloud-with-snow-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/cloud-with-snow-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/cloud_icon.svg b/examples/quick/quickshapes/weatherforecast/assets/cloud_icon.svg
index 72e8c81367..72e8c81367 100644
--- a/examples/quickshapes/weatherforecast/assets/cloud_icon.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/cloud_icon.svg
diff --git a/examples/quickshapes/weatherforecast/assets/gear-alt-stroke.svg b/examples/quick/quickshapes/weatherforecast/assets/gear-alt-stroke.svg
index 674e35b272..674e35b272 100644
--- a/examples/quickshapes/weatherforecast/assets/gear-alt-stroke.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/gear-alt-stroke.svg
diff --git a/examples/quickshapes/weatherforecast/assets/layers.svg b/examples/quick/quickshapes/weatherforecast/assets/layers.svg
index f28db00aaa..f28db00aaa 100644
--- a/examples/quickshapes/weatherforecast/assets/layers.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/layers.svg
diff --git a/examples/quickshapes/weatherforecast/assets/sun-behind-cloud-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-cloud-svgrepo-com.svg
index 790e64f824..790e64f824 100644
--- a/examples/quickshapes/weatherforecast/assets/sun-behind-cloud-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-cloud-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/sun-behind-large-cloud-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-large-cloud-svgrepo-com.svg
index dd83ecaa80..dd83ecaa80 100644
--- a/examples/quickshapes/weatherforecast/assets/sun-behind-large-cloud-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-large-cloud-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/sun-behind-rain-cloud-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-rain-cloud-svgrepo-com.svg
index 5f67942417..5f67942417 100644
--- a/examples/quickshapes/weatherforecast/assets/sun-behind-rain-cloud-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-rain-cloud-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/sun-behind-small-cloud-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-small-cloud-svgrepo-com.svg
index d9f0a6bcc4..d9f0a6bcc4 100644
--- a/examples/quickshapes/weatherforecast/assets/sun-behind-small-cloud-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/sun-behind-small-cloud-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/assets/sun-svgrepo-com.svg b/examples/quick/quickshapes/weatherforecast/assets/sun-svgrepo-com.svg
index b5a51c8b21..b5a51c8b21 100644
--- a/examples/quickshapes/weatherforecast/assets/sun-svgrepo-com.svg
+++ b/examples/quick/quickshapes/weatherforecast/assets/sun-svgrepo-com.svg
diff --git a/examples/quickshapes/weatherforecast/doc/images/qml-weatherforecast-example.png b/examples/quick/quickshapes/weatherforecast/doc/images/qml-weatherforecast-example.png
index 2ebd68f768..2ebd68f768 100644
--- a/examples/quickshapes/weatherforecast/doc/images/qml-weatherforecast-example.png
+++ b/examples/quick/quickshapes/weatherforecast/doc/images/qml-weatherforecast-example.png
diff --git a/examples/quickshapes/weatherforecast/doc/images/settings.png b/examples/quick/quickshapes/weatherforecast/doc/images/settings.png
index 80788dda6d..80788dda6d 100644
--- a/examples/quickshapes/weatherforecast/doc/images/settings.png
+++ b/examples/quick/quickshapes/weatherforecast/doc/images/settings.png
diff --git a/examples/quickshapes/weatherforecast/doc/images/zoomed.png b/examples/quick/quickshapes/weatherforecast/doc/images/zoomed.png
index 22bb3b9e24..22bb3b9e24 100644
--- a/examples/quickshapes/weatherforecast/doc/images/zoomed.png
+++ b/examples/quick/quickshapes/weatherforecast/doc/images/zoomed.png
diff --git a/examples/quickshapes/weatherforecast/doc/src/weatherforecast.qdoc b/examples/quick/quickshapes/weatherforecast/doc/src/weatherforecast.qdoc
index 528bf69cd0..9a8ee63e37 100644
--- a/examples/quickshapes/weatherforecast/doc/src/weatherforecast.qdoc
+++ b/examples/quick/quickshapes/weatherforecast/doc/src/weatherforecast.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 /*!
     \title Weather Forecast Example
-    \example weatherforecast
+    \example quickshapes/weatherforecast
     \image qml-weatherforecast-example.png
     \brief A Qt Quick Shapes example demonstrating different ways to uses shapes in an application.
     \ingroup qtquickexamples
@@ -82,7 +82,7 @@
     visualization effects supported by \l{Qt Quick Shapes} which is not supported by the regular
     \l{Text} element. Fill gradients is one such effect.
 
-    \snippet weatherforecast/main.qml textShape
+    \snippet quickshapes/weatherforecast/main.qml textShape
 
     To illustrate this, the Weather Forecast example applies a subtle radial gradient to the opacity
     of the country labels, making them seem to blend into the map on the edges.
@@ -115,7 +115,7 @@
     this mode, it consumes additional graphics memory as well as an additional rendering pass for
     each shape.
 
-    \snippet weatherforecast/main.qml msaa
+    \snippet quickshapes/weatherforecast/main.qml msaa
 
     The settings panel also provides the option to use the \c GeometryRenderer together with 4x
     multi-sampling, so that the quality of this can be compared to the built-in antialiasing of
diff --git a/examples/quickshapes/weatherforecast/main.cpp b/examples/quick/quickshapes/weatherforecast/main.cpp
index 52264b8a6e..52264b8a6e 100644
--- a/examples/quickshapes/weatherforecast/main.cpp
+++ b/examples/quick/quickshapes/weatherforecast/main.cpp
diff --git a/examples/quickshapes/weatherforecast/main.qml b/examples/quick/quickshapes/weatherforecast/main.qml
index 5ba8ad5c2a..5ba8ad5c2a 100644
--- a/examples/quickshapes/weatherforecast/main.qml
+++ b/examples/quick/quickshapes/weatherforecast/main.qml
diff --git a/examples/quickshapes/weatherforecast/qtquickcontrols2.conf b/examples/quick/quickshapes/weatherforecast/qtquickcontrols2.conf
index b6c7c87ea1..b6c7c87ea1 100644
--- a/examples/quickshapes/weatherforecast/qtquickcontrols2.conf
+++ b/examples/quick/quickshapes/weatherforecast/qtquickcontrols2.conf
diff --git a/examples/quickshapes/weatherforecast/weatherforecast.pro b/examples/quick/quickshapes/weatherforecast/weatherforecast.pro
index 26778b8935..6279bc7794 100644
--- a/examples/quickshapes/weatherforecast/weatherforecast.pro
+++ b/examples/quick/quickshapes/weatherforecast/weatherforecast.pro
@@ -4,7 +4,7 @@ QT += quick qml
 SOURCES += main.cpp
 RESOURCES += \
     weatherforecast.qrc \
-    ../../quick/shared/shared.qrc
+    ../../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickshapes/weatherforecast
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/quickshapes/weatherforecast
 INSTALLS += target
diff --git a/examples/quickshapes/weatherforecast/weatherforecast.qrc b/examples/quick/quickshapes/weatherforecast/weatherforecast.qrc
index ccbdb417a1..ccbdb417a1 100644
--- a/examples/quickshapes/weatherforecast/weatherforecast.qrc
+++ b/examples/quick/quickshapes/weatherforecast/weatherforecast.qrc
diff --git a/examples/quickshapes/quickshapes.pro b/examples/quickshapes/quickshapes.pro
deleted file mode 100644
index c2071244a8..0000000000
--- a/examples/quickshapes/quickshapes.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = shapes
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 08ab373cd4..27efe4d087 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -72,7 +72,6 @@ excludedirs += \
 
 exampledirs += \
     ../../../examples/quick \
-    ../../../examples/quickshapes \
     ../../qmlmodels/doc/snippets \
     ../../quickcontrols/doc/snippets \
     snippets \