315 files changed, 44 insertions, 42 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index d47fd5bb8..6d61af094 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,43 +1,2 @@
 TEMPLATE = subdirs
-
-SUBDIRS += \
-    exampleresources \
-    playground-qml \
-    simple-qml \
-    simple-cpp \
-    gltf \
-    assimp \
-    cpp_example \
-    multiviewport \
-    torus-qml \
-    torus-cpp \
-    cylinder-qml \
-    cylinder-cpp \
-    bigmodel-qml \
-    wireframe \
-    tessellation-modes \
-    deferred-renderer-qml \
-    deferred-renderer-cpp \
-    shadow-map-qml \
-    bigscene-cpp \
-    materials \
-    keyboardinput-qml \
-    loader-qml \
-    wave \
-    materials-cpp \
-    dynamicscene-cpp \
-    scene3d \
-    enabled-qml \
-    skybox
-
-# TODO Port the old examples to new APIs
-#SUBDIRS += qt3d
-#qtHaveModule(qml): SUBDIRS += quick3d
-
-# Make all other subdirs depend on exampleresources
-for(subdir, SUBDIRS) {
-    !equals(subdir, exampleresources) {
-        $${subdir}.depends += exampleresources
-    }
-}
-
+SUBDIRS += qt3d
diff --git a/examples/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro
index 1db64789d..1db64789d 100644
--- a/examples/assimp/assimp.pro
+++ b/examples/qt3d/assimp/assimp.pro
diff --git a/examples/assimp/assimp.qrc b/examples/qt3d/assimp/assimp.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/assimp/assimp.qrc
+++ b/examples/qt3d/assimp/assimp.qrc
diff --git a/examples/assimp/main.cpp b/examples/qt3d/assimp/main.cpp
index 7c0858193..7c0858193 100644
--- a/examples/assimp/main.cpp
+++ b/examples/qt3d/assimp/main.cpp
diff --git a/examples/assimp/main.qml b/examples/qt3d/assimp/main.qml
index f9807491c..f9807491c 100644
--- a/examples/assimp/main.qml
+++ b/examples/qt3d/assimp/main.qml
diff --git a/examples/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml
index fd30c1071..fd30c1071 100644
--- a/examples/bigmodel-qml/MyEntity.qml
+++ b/examples/qt3d/bigmodel-qml/MyEntity.qml
diff --git a/examples/bigmodel-qml/bigmodel-qml.pro b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro
index 7787217f8..7787217f8 100644
--- a/examples/bigmodel-qml/bigmodel-qml.pro
+++ b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro
diff --git a/examples/bigmodel-qml/bigmodel-qml.qrc b/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc
index 6cc293f70..6cc293f70 100644
--- a/examples/bigmodel-qml/bigmodel-qml.qrc
+++ b/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc
diff --git a/examples/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp
index 6e76f1f5a..6e76f1f5a 100644
--- a/examples/bigmodel-qml/main.cpp
+++ b/examples/qt3d/bigmodel-qml/main.cpp
diff --git a/examples/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml
index 9d6a16264..9d6a16264 100644
--- a/examples/bigmodel-qml/main.qml
+++ b/examples/qt3d/bigmodel-qml/main.qml
diff --git a/examples/bigscene-cpp/bigscene-cpp.pro b/examples/qt3d/bigscene-cpp/bigscene-cpp.pro
index d95efa7a1..d95efa7a1 100644
--- a/examples/bigscene-cpp/bigscene-cpp.pro
+++ b/examples/qt3d/bigscene-cpp/bigscene-cpp.pro
diff --git a/examples/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 5ab25bf5e..5ab25bf5e 100644
--- a/examples/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
diff --git a/examples/cpp_example/cpp_example.pro b/examples/qt3d/cpp_example/cpp_example.pro
index 943f81533..943f81533 100644
--- a/examples/cpp_example/cpp_example.pro
+++ b/examples/qt3d/cpp_example/cpp_example.pro
diff --git a/examples/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index df20ba030..df20ba030 100644
--- a/examples/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
diff --git a/examples/cylinder-cpp/cylinder-cpp.pro b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro
index 5ad940ff1..5ad940ff1 100644
--- a/examples/cylinder-cpp/cylinder-cpp.pro
+++ b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro
diff --git a/examples/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index 13a40ddfb..13a40ddfb 100644
--- a/examples/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
diff --git a/examples/cylinder-qml/cylinder-qml.pro b/examples/qt3d/cylinder-qml/cylinder-qml.pro
index 218ab62b5..218ab62b5 100644
--- a/examples/cylinder-qml/cylinder-qml.pro
+++ b/examples/qt3d/cylinder-qml/cylinder-qml.pro
diff --git a/examples/cylinder-qml/cylinder-qml.qrc b/examples/qt3d/cylinder-qml/cylinder-qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/cylinder-qml/cylinder-qml.qrc
+++ b/examples/qt3d/cylinder-qml/cylinder-qml.qrc
diff --git a/examples/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp
index 171c11f92..171c11f92 100644
--- a/examples/cylinder-qml/main.cpp
+++ b/examples/qt3d/cylinder-qml/main.cpp
diff --git a/examples/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml
index 282826116..282826116 100644
--- a/examples/cylinder-qml/main.qml
+++ b/examples/qt3d/cylinder-qml/main.qml
diff --git a/examples/deferred-renderer-cpp/deferred-renderer-cpp.pro b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro
index eaebea4ed..eaebea4ed 100644
--- a/examples/deferred-renderer-cpp/deferred-renderer-cpp.pro
+++ b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro
diff --git a/examples/deferred-renderer-cpp/deferred-renderer-cpp.qrc b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.qrc
index 0e38e39ca..0e38e39ca 100644
--- a/examples/deferred-renderer-cpp/deferred-renderer-cpp.qrc
+++ b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.qrc
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index dc04e0398..dc04e0398 100644
--- a/examples/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 34c09175c..34c09175c 100644
--- a/examples/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
diff --git a/examples/deferred-renderer-cpp/final_gl2.frag b/examples/qt3d/deferred-renderer-cpp/final_gl2.frag
index f384a2df4..f384a2df4 100644
--- a/examples/deferred-renderer-cpp/final_gl2.frag
+++ b/examples/qt3d/deferred-renderer-cpp/final_gl2.frag
diff --git a/examples/deferred-renderer-cpp/final_gl2.vert b/examples/qt3d/deferred-renderer-cpp/final_gl2.vert
index a907e10ca..a907e10ca 100644
--- a/examples/deferred-renderer-cpp/final_gl2.vert
+++ b/examples/qt3d/deferred-renderer-cpp/final_gl2.vert
diff --git a/examples/deferred-renderer-cpp/final_gl3.frag b/examples/qt3d/deferred-renderer-cpp/final_gl3.frag
index 88abd5cb1..88abd5cb1 100644
--- a/examples/deferred-renderer-cpp/final_gl3.frag
+++ b/examples/qt3d/deferred-renderer-cpp/final_gl3.frag
diff --git a/examples/deferred-renderer-cpp/final_gl3.vert b/examples/qt3d/deferred-renderer-cpp/final_gl3.vert
index 60410d34d..60410d34d 100644
--- a/examples/deferred-renderer-cpp/final_gl3.vert
+++ b/examples/qt3d/deferred-renderer-cpp/final_gl3.vert
diff --git a/examples/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index 96134c297..96134c297 100644
--- a/examples/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
diff --git a/examples/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
index 11fb4c6f3..11fb4c6f3 100644
--- a/examples/deferred-renderer-cpp/finaleffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
diff --git a/examples/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index a05adfc72..a05adfc72 100644
--- a/examples/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
diff --git a/examples/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 1302fbb66..1302fbb66 100644
--- a/examples/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
diff --git a/examples/deferred-renderer-cpp/geometry_gl2.frag b/examples/qt3d/deferred-renderer-cpp/geometry_gl2.frag
index 0e7776f15..0e7776f15 100644
--- a/examples/deferred-renderer-cpp/geometry_gl2.frag
+++ b/examples/qt3d/deferred-renderer-cpp/geometry_gl2.frag
diff --git a/examples/deferred-renderer-cpp/geometry_gl2.vert b/examples/qt3d/deferred-renderer-cpp/geometry_gl2.vert
index 72d5345f1..72d5345f1 100644
--- a/examples/deferred-renderer-cpp/geometry_gl2.vert
+++ b/examples/qt3d/deferred-renderer-cpp/geometry_gl2.vert
diff --git a/examples/deferred-renderer-cpp/geometry_gl3.frag b/examples/qt3d/deferred-renderer-cpp/geometry_gl3.frag
index 7d9c7d64e..7d9c7d64e 100644
--- a/examples/deferred-renderer-cpp/geometry_gl3.frag
+++ b/examples/qt3d/deferred-renderer-cpp/geometry_gl3.frag
diff --git a/examples/deferred-renderer-cpp/geometry_gl3.vert b/examples/qt3d/deferred-renderer-cpp/geometry_gl3.vert
index d3e302d16..d3e302d16 100644
--- a/examples/deferred-renderer-cpp/geometry_gl3.vert
+++ b/examples/qt3d/deferred-renderer-cpp/geometry_gl3.vert
diff --git a/examples/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 24814585f..24814585f 100644
--- a/examples/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
diff --git a/examples/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
index 07d77fd7a..07d77fd7a 100644
--- a/examples/deferred-renderer-cpp/pointlightblock.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
diff --git a/examples/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index 8fb470504..8fb470504 100644
--- a/examples/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
diff --git a/examples/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 98eb677ed..98eb677ed 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
diff --git a/examples/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index 18a869bfe..18a869bfe 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
diff --git a/examples/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
index d95402cb9..d95402cb9 100644
--- a/examples/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
diff --git a/examples/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
index f46e65c12..f46e65c12 100644
--- a/examples/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
diff --git a/examples/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
index 309cec160..309cec160 100644
--- a/examples/deferred-renderer-qml/GBuffer.qml
+++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
diff --git a/examples/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
index e4cfdf8c5..e4cfdf8c5 100644
--- a/examples/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
diff --git a/examples/deferred-renderer-qml/deferred-renderer-qml.pro b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro
index 2b1329c2e..2b1329c2e 100644
--- a/examples/deferred-renderer-qml/deferred-renderer-qml.pro
+++ b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro
diff --git a/examples/deferred-renderer-qml/deferred-renderer-qml.qrc b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.qrc
index 573b2337e..573b2337e 100644
--- a/examples/deferred-renderer-qml/deferred-renderer-qml.qrc
+++ b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.qrc
diff --git a/examples/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp
index 0ad35ff6c..0ad35ff6c 100644
--- a/examples/deferred-renderer-qml/main.cpp
+++ b/examples/qt3d/deferred-renderer-qml/main.cpp
diff --git a/examples/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml
index c30c57fd4..c30c57fd4 100644
--- a/examples/deferred-renderer-qml/main.qml
+++ b/examples/qt3d/deferred-renderer-qml/main.qml
diff --git a/examples/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp
index a3f539564..a3f539564 100644
--- a/examples/dynamicscene-cpp/boxentity.cpp
+++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp
diff --git a/examples/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h
index 6dcf81aff..6dcf81aff 100644
--- a/examples/dynamicscene-cpp/boxentity.h
+++ b/examples/qt3d/dynamicscene-cpp/boxentity.h
diff --git a/examples/dynamicscene-cpp/dynamicscene-cpp.pro b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
index 715460121..715460121 100644
--- a/examples/dynamicscene-cpp/dynamicscene-cpp.pro
+++ b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
diff --git a/examples/dynamicscene-cpp/examplescene.cpp b/examples/qt3d/dynamicscene-cpp/examplescene.cpp
index ca15b1a9f..ca15b1a9f 100644
--- a/examples/dynamicscene-cpp/examplescene.cpp
+++ b/examples/qt3d/dynamicscene-cpp/examplescene.cpp
diff --git a/examples/dynamicscene-cpp/examplescene.h b/examples/qt3d/dynamicscene-cpp/examplescene.h
index 79351fe3e..79351fe3e 100644
--- a/examples/dynamicscene-cpp/examplescene.h
+++ b/examples/qt3d/dynamicscene-cpp/examplescene.h
diff --git a/examples/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
index 3c4fd0758..3c4fd0758 100644
--- a/examples/dynamicscene-cpp/forwardrenderer.cpp
+++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
diff --git a/examples/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
index faf6389f9..faf6389f9 100644
--- a/examples/dynamicscene-cpp/forwardrenderer.h
+++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
diff --git a/examples/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp
index 8d265ec33..8d265ec33 100644
--- a/examples/dynamicscene-cpp/main.cpp
+++ b/examples/qt3d/dynamicscene-cpp/main.cpp
diff --git a/examples/enabled-qml/enabled-qml.pro b/examples/qt3d/enabled-qml/enabled-qml.pro
index 3608f4199..3608f4199 100644
--- a/examples/enabled-qml/enabled-qml.pro
+++ b/examples/qt3d/enabled-qml/enabled-qml.pro
diff --git a/examples/enabled-qml/enabled-qml.qrc b/examples/qt3d/enabled-qml/enabled-qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/enabled-qml/enabled-qml.qrc
+++ b/examples/qt3d/enabled-qml/enabled-qml.qrc
diff --git a/examples/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp
index 0b3f1023c..0b3f1023c 100644
--- a/examples/enabled-qml/main.cpp
+++ b/examples/qt3d/enabled-qml/main.cpp
diff --git a/examples/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml
index 9342ba6c9..9342ba6c9 100644
--- a/examples/enabled-qml/main.qml
+++ b/examples/qt3d/enabled-qml/main.qml
diff --git a/examples/exampleresources/assets/chest/Chest.obj b/examples/qt3d/exampleresources/assets/chest/Chest.obj
index 87770a18a..87770a18a 100644
--- a/examples/exampleresources/assets/chest/Chest.obj
+++ b/examples/qt3d/exampleresources/assets/chest/Chest.obj
diff --git a/examples/exampleresources/assets/chest/diffuse.webp b/examples/qt3d/exampleresources/assets/chest/diffuse.webp
index 00904a881..00904a881 100644
--- a/examples/exampleresources/assets/chest/diffuse.webp
+++ b/examples/qt3d/exampleresources/assets/chest/diffuse.webp
diff --git a/examples/exampleresources/assets/cubemaps/miramar/README.TXT b/examples/qt3d/exampleresources/assets/cubemaps/miramar/README.TXT
index 680005eac..680005eac 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/README.TXT
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/README.TXT
diff --git a/examples/exampleresources/assets/cubemaps/miramar/miramar_negx.webp b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp
index 1ea719fb3..1ea719fb3 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/miramar_negx.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp
diff --git a/examples/exampleresources/assets/cubemaps/miramar/miramar_negy.webp b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp
index 5329f6ac9..5329f6ac9 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/miramar_negy.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp
diff --git a/examples/exampleresources/assets/cubemaps/miramar/miramar_negz.webp b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp
index 2bae54690..2bae54690 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/miramar_negz.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp
diff --git a/examples/exampleresources/assets/cubemaps/miramar/miramar_posx.webp b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp
index ec33d1eb7..ec33d1eb7 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/miramar_posx.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp
diff --git a/examples/exampleresources/assets/cubemaps/miramar/miramar_posy.webp b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp
index 6d36fcba5..6d36fcba5 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/miramar_posy.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp
diff --git a/examples/exampleresources/assets/cubemaps/miramar/miramar_posz.webp b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp
index 327041c71..327041c71 100644
--- a/examples/exampleresources/assets/cubemaps/miramar/miramar_posz.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp
diff --git a/examples/exampleresources/assets/cubemaps/night/night_negx.webp b/examples/qt3d/exampleresources/assets/cubemaps/night/night_negx.webp
index 1c595caf3..1c595caf3 100644
--- a/examples/exampleresources/assets/cubemaps/night/night_negx.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/night/night_negx.webp
diff --git a/examples/exampleresources/assets/cubemaps/night/night_negy.webp b/examples/qt3d/exampleresources/assets/cubemaps/night/night_negy.webp
index 9a597d998..9a597d998 100644
--- a/examples/exampleresources/assets/cubemaps/night/night_negy.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/night/night_negy.webp
diff --git a/examples/exampleresources/assets/cubemaps/night/night_negz.webp b/examples/qt3d/exampleresources/assets/cubemaps/night/night_negz.webp
index a05772c23..a05772c23 100644
--- a/examples/exampleresources/assets/cubemaps/night/night_negz.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/night/night_negz.webp
diff --git a/examples/exampleresources/assets/cubemaps/night/night_posx.webp b/examples/qt3d/exampleresources/assets/cubemaps/night/night_posx.webp
index 0b15aa6eb..0b15aa6eb 100644
--- a/examples/exampleresources/assets/cubemaps/night/night_posx.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/night/night_posx.webp
diff --git a/examples/exampleresources/assets/cubemaps/night/night_posy.webp b/examples/qt3d/exampleresources/assets/cubemaps/night/night_posy.webp
index 23cd803a9..23cd803a9 100644
--- a/examples/exampleresources/assets/cubemaps/night/night_posy.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/night/night_posy.webp
diff --git a/examples/exampleresources/assets/cubemaps/night/night_posz.webp b/examples/qt3d/exampleresources/assets/cubemaps/night/night_posz.webp
index 4899aa98e..4899aa98e 100644
--- a/examples/exampleresources/assets/cubemaps/night/night_posz.webp
+++ b/examples/qt3d/exampleresources/assets/cubemaps/night/night_posz.webp
diff --git a/examples/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg b/examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg
index 5b7c3b53f..5b7c3b53f 100755
--- a/examples/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg
diff --git a/examples/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg b/examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg
index edfb0a06d..edfb0a06d 100755
--- a/examples/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg
diff --git a/examples/exampleresources/assets/gltf/wine/artezin_bottle.jpg b/examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg
index 11aa7d664..11aa7d664 100755
--- a/examples/exampleresources/assets/gltf/wine/artezin_bottle.jpg
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg
diff --git a/examples/exampleresources/assets/gltf/wine/wine.bin b/examples/qt3d/exampleresources/assets/gltf/wine/wine.bin
index 7c8093c5a..7c8093c5a 100755
--- a/examples/exampleresources/assets/gltf/wine/wine.bin
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine.bin
diff --git a/examples/exampleresources/assets/gltf/wine/wine.dae b/examples/qt3d/exampleresources/assets/gltf/wine/wine.dae
index a7fe559a7..a7fe559a7 100755
--- a/examples/exampleresources/assets/gltf/wine/wine.dae
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine.dae
diff --git a/examples/exampleresources/assets/gltf/wine/wine.json b/examples/qt3d/exampleresources/assets/gltf/wine/wine.json
index bdff245d5..bdff245d5 100755
--- a/examples/exampleresources/assets/gltf/wine/wine.json
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine.json
diff --git a/examples/exampleresources/assets/gltf/wine/wine0FS.glsl b/examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl
index b01fbb1a1..b01fbb1a1 100644
--- a/examples/exampleresources/assets/gltf/wine/wine0FS.glsl
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl
diff --git a/examples/exampleresources/assets/gltf/wine/wine0VS.glsl b/examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl
index f03b74739..f03b74739 100644
--- a/examples/exampleresources/assets/gltf/wine/wine0VS.glsl
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl
diff --git a/examples/exampleresources/assets/gltf/wine/wine2FS.glsl b/examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl
index 72192fee4..72192fee4 100644
--- a/examples/exampleresources/assets/gltf/wine/wine2FS.glsl
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl
diff --git a/examples/exampleresources/assets/gltf/wine/wine2VS.glsl b/examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl
index 1b5eabce9..1b5eabce9 100644
--- a/examples/exampleresources/assets/gltf/wine/wine2VS.glsl
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl
diff --git a/examples/exampleresources/assets/gltf/wine/wine4FS.glsl b/examples/qt3d/exampleresources/assets/gltf/wine/wine4FS.glsl
index 99acdb37c..99acdb37c 100644
--- a/examples/exampleresources/assets/gltf/wine/wine4FS.glsl
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine4FS.glsl
diff --git a/examples/exampleresources/assets/gltf/wine/wine4VS.glsl b/examples/qt3d/exampleresources/assets/gltf/wine/wine4VS.glsl
index 0e66d42c1..0e66d42c1 100644
--- a/examples/exampleresources/assets/gltf/wine/wine4VS.glsl
+++ b/examples/qt3d/exampleresources/assets/gltf/wine/wine4VS.glsl
diff --git a/examples/exampleresources/assets/houseplants/bamboo.webp b/examples/qt3d/exampleresources/assets/houseplants/bamboo.webp
index 75eb53993..75eb53993 100644
--- a/examples/exampleresources/assets/houseplants/bamboo.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/bamboo.webp
diff --git a/examples/exampleresources/assets/houseplants/bamboo_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/bamboo_normal.webp
index 2ca653c57..2ca653c57 100644
--- a/examples/exampleresources/assets/houseplants/bamboo_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/bamboo_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/cover.webp b/examples/qt3d/exampleresources/assets/houseplants/cover.webp
index ac70f46b7..ac70f46b7 100644
--- a/examples/exampleresources/assets/houseplants/cover.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/cover.webp
diff --git a/examples/exampleresources/assets/houseplants/cover_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/cover_normal.webp
index 793f82bd1..793f82bd1 100644
--- a/examples/exampleresources/assets/houseplants/cover_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/cover_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/cross-bamboo.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-bamboo.obj
index 74cfbea0b..74cfbea0b 100644
--- a/examples/exampleresources/assets/houseplants/cross-bamboo.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-bamboo.obj
diff --git a/examples/exampleresources/assets/houseplants/cross-palm.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-palm.obj
index 47890f8c0..47890f8c0 100644
--- a/examples/exampleresources/assets/houseplants/cross-palm.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-palm.obj
diff --git a/examples/exampleresources/assets/houseplants/cross-pine.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-pine.obj
index e662be6af..e662be6af 100644
--- a/examples/exampleresources/assets/houseplants/cross-pine.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-pine.obj
diff --git a/examples/exampleresources/assets/houseplants/cross-pot-cover.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-pot-cover.obj
index 0faa00709..0faa00709 100644
--- a/examples/exampleresources/assets/houseplants/cross-pot-cover.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-pot-cover.obj
diff --git a/examples/exampleresources/assets/houseplants/cross-pot.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-pot.obj
index 5df732203..5df732203 100644
--- a/examples/exampleresources/assets/houseplants/cross-pot.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-pot.obj
diff --git a/examples/exampleresources/assets/houseplants/cross-shrub.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-shrub.obj
index e004a218a..e004a218a 100644
--- a/examples/exampleresources/assets/houseplants/cross-shrub.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-shrub.obj
diff --git a/examples/exampleresources/assets/houseplants/cross-spikes.obj b/examples/qt3d/exampleresources/assets/houseplants/cross-spikes.obj
index cc0722639..cc0722639 100644
--- a/examples/exampleresources/assets/houseplants/cross-spikes.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cross-spikes.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-bamboo.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-bamboo.obj
index 2b2556d6b..2b2556d6b 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-bamboo.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-bamboo.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-palm.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-palm.obj
index d8897920c..d8897920c 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-palm.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-palm.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-pine.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-pine.obj
index 356602997..356602997 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-pine.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-pine.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-pot-cover.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-pot-cover.obj
index a6787090a..a6787090a 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-pot-cover.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-pot-cover.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-pot.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-pot.obj
index 205c89b3d..205c89b3d 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-pot.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-pot.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-shrub.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-shrub.obj
index a97d8b83e..a97d8b83e 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-shrub.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-shrub.obj
diff --git a/examples/exampleresources/assets/houseplants/cylinder-spikes.obj b/examples/qt3d/exampleresources/assets/houseplants/cylinder-spikes.obj
index cf37286c3..cf37286c3 100644
--- a/examples/exampleresources/assets/houseplants/cylinder-spikes.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/cylinder-spikes.obj
diff --git a/examples/exampleresources/assets/houseplants/palm.webp b/examples/qt3d/exampleresources/assets/houseplants/palm.webp
index cf984fa09..cf984fa09 100644
--- a/examples/exampleresources/assets/houseplants/palm.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/palm.webp
diff --git a/examples/exampleresources/assets/houseplants/palm_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/palm_normal.webp
index 87fbf7a88..87fbf7a88 100644
--- a/examples/exampleresources/assets/houseplants/palm_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/palm_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/pine.webp b/examples/qt3d/exampleresources/assets/houseplants/pine.webp
index 994afa1a8..994afa1a8 100644
--- a/examples/exampleresources/assets/houseplants/pine.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/pine.webp
diff --git a/examples/exampleresources/assets/houseplants/pine_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/pine_normal.webp
index 15e684946..15e684946 100644
--- a/examples/exampleresources/assets/houseplants/pine_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/pine_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/pot.webp b/examples/qt3d/exampleresources/assets/houseplants/pot.webp
index 45253c7c2..45253c7c2 100644
--- a/examples/exampleresources/assets/houseplants/pot.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/pot.webp
diff --git a/examples/exampleresources/assets/houseplants/pot_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/pot_normal.webp
index bf09c94f8..bf09c94f8 100644
--- a/examples/exampleresources/assets/houseplants/pot_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/pot_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/shrub.webp b/examples/qt3d/exampleresources/assets/houseplants/shrub.webp
index fea7b58d5..fea7b58d5 100644
--- a/examples/exampleresources/assets/houseplants/shrub.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/shrub.webp
diff --git a/examples/exampleresources/assets/houseplants/shrub_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/shrub_normal.webp
index 8a676690b..8a676690b 100644
--- a/examples/exampleresources/assets/houseplants/shrub_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/shrub_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/sphere-bamboo.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-bamboo.obj
index 273656690..273656690 100644
--- a/examples/exampleresources/assets/houseplants/sphere-bamboo.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-bamboo.obj
diff --git a/examples/exampleresources/assets/houseplants/sphere-palm.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-palm.obj
index 7f1d87700..7f1d87700 100644
--- a/examples/exampleresources/assets/houseplants/sphere-palm.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-palm.obj
diff --git a/examples/exampleresources/assets/houseplants/sphere-pine.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-pine.obj
index 895124bce..895124bce 100644
--- a/examples/exampleresources/assets/houseplants/sphere-pine.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-pine.obj
diff --git a/examples/exampleresources/assets/houseplants/sphere-pot-cover.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-pot-cover.obj
index 296a57b13..296a57b13 100644
--- a/examples/exampleresources/assets/houseplants/sphere-pot-cover.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-pot-cover.obj
diff --git a/examples/exampleresources/assets/houseplants/sphere-pot.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-pot.obj
index 9509123a1..9509123a1 100644
--- a/examples/exampleresources/assets/houseplants/sphere-pot.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-pot.obj
diff --git a/examples/exampleresources/assets/houseplants/sphere-shrub.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-shrub.obj
index 38d2eb5dd..38d2eb5dd 100644
--- a/examples/exampleresources/assets/houseplants/sphere-shrub.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-shrub.obj
diff --git a/examples/exampleresources/assets/houseplants/sphere-spikes.obj b/examples/qt3d/exampleresources/assets/houseplants/sphere-spikes.obj
index 7ebe118f1..7ebe118f1 100644
--- a/examples/exampleresources/assets/houseplants/sphere-spikes.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/sphere-spikes.obj
diff --git a/examples/exampleresources/assets/houseplants/spikes.webp b/examples/qt3d/exampleresources/assets/houseplants/spikes.webp
index cff2f0868..cff2f0868 100644
--- a/examples/exampleresources/assets/houseplants/spikes.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/spikes.webp
diff --git a/examples/exampleresources/assets/houseplants/spikes_normal.webp b/examples/qt3d/exampleresources/assets/houseplants/spikes_normal.webp
index e0557b9fd..e0557b9fd 100644
--- a/examples/exampleresources/assets/houseplants/spikes_normal.webp
+++ b/examples/qt3d/exampleresources/assets/houseplants/spikes_normal.webp
diff --git a/examples/exampleresources/assets/houseplants/square-bamboo.obj b/examples/qt3d/exampleresources/assets/houseplants/square-bamboo.obj
index ce4955bae..ce4955bae 100644
--- a/examples/exampleresources/assets/houseplants/square-bamboo.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-bamboo.obj
diff --git a/examples/exampleresources/assets/houseplants/square-palm.obj b/examples/qt3d/exampleresources/assets/houseplants/square-palm.obj
index 25f122868..25f122868 100644
--- a/examples/exampleresources/assets/houseplants/square-palm.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-palm.obj
diff --git a/examples/exampleresources/assets/houseplants/square-pine.obj b/examples/qt3d/exampleresources/assets/houseplants/square-pine.obj
index 538095c3e..538095c3e 100644
--- a/examples/exampleresources/assets/houseplants/square-pine.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-pine.obj
diff --git a/examples/exampleresources/assets/houseplants/square-pot-cover.obj b/examples/qt3d/exampleresources/assets/houseplants/square-pot-cover.obj
index 5d58a14d1..5d58a14d1 100644
--- a/examples/exampleresources/assets/houseplants/square-pot-cover.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-pot-cover.obj
diff --git a/examples/exampleresources/assets/houseplants/square-pot.obj b/examples/qt3d/exampleresources/assets/houseplants/square-pot.obj
index 450567092..450567092 100644
--- a/examples/exampleresources/assets/houseplants/square-pot.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-pot.obj
diff --git a/examples/exampleresources/assets/houseplants/square-shrub.obj b/examples/qt3d/exampleresources/assets/houseplants/square-shrub.obj
index a8754437f..a8754437f 100644
--- a/examples/exampleresources/assets/houseplants/square-shrub.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-shrub.obj
diff --git a/examples/exampleresources/assets/houseplants/square-spikes.obj b/examples/qt3d/exampleresources/assets/houseplants/square-spikes.obj
index 61b374003..61b374003 100644
--- a/examples/exampleresources/assets/houseplants/square-spikes.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/square-spikes.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-bamboo.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-bamboo.obj
index 725d07679..725d07679 100644
--- a/examples/exampleresources/assets/houseplants/triangle-bamboo.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-bamboo.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-palm.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-palm.obj
index 35baafa6d..35baafa6d 100644
--- a/examples/exampleresources/assets/houseplants/triangle-palm.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-palm.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-pine.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-pine.obj
index 71223c702..71223c702 100644
--- a/examples/exampleresources/assets/houseplants/triangle-pine.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-pine.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-pot-cover.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-pot-cover.obj
index e6edc7c65..e6edc7c65 100644
--- a/examples/exampleresources/assets/houseplants/triangle-pot-cover.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-pot-cover.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-pot.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-pot.obj
index 1b01c3d8c..1b01c3d8c 100644
--- a/examples/exampleresources/assets/houseplants/triangle-pot.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-pot.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-shrub.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-shrub.obj
index 716ee3345..716ee3345 100644
--- a/examples/exampleresources/assets/houseplants/triangle-shrub.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-shrub.obj
diff --git a/examples/exampleresources/assets/houseplants/triangle-spikes.obj b/examples/qt3d/exampleresources/assets/houseplants/triangle-spikes.obj
index 33296595e..33296595e 100644
--- a/examples/exampleresources/assets/houseplants/triangle-spikes.obj
+++ b/examples/qt3d/exampleresources/assets/houseplants/triangle-spikes.obj
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_black.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp
index 92643c57a..92643c57a 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_black.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_blue.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp
index 33a3ec65b..33a3ec65b 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_blue.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_green.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp
index 03648226a..03648226a 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_green.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_red.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp
index 95679aaa4..95679aaa4 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_red.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_rust.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp
index 593b4a63a..593b4a63a 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_rust.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp
index cd7fc78bc..cd7fc78bc 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp
diff --git a/examples/exampleresources/assets/metalbarrel/diffus_yellow.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp
index a4661d153..a4661d153 100644
--- a/examples/exampleresources/assets/metalbarrel/diffus_yellow.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp
diff --git a/examples/exampleresources/assets/metalbarrel/metal_barrel.obj b/examples/qt3d/exampleresources/assets/metalbarrel/metal_barrel.obj
index dce9e846d..dce9e846d 100755
--- a/examples/exampleresources/assets/metalbarrel/metal_barrel.obj
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/metal_barrel.obj
diff --git a/examples/exampleresources/assets/metalbarrel/normal_hard_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp
index 3f1d22214..3f1d22214 100644
--- a/examples/exampleresources/assets/metalbarrel/normal_hard_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp
diff --git a/examples/exampleresources/assets/metalbarrel/normal_middle_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp
index 35d81c62e..35d81c62e 100644
--- a/examples/exampleresources/assets/metalbarrel/normal_middle_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp
diff --git a/examples/exampleresources/assets/metalbarrel/normal_no_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp
index da270474f..da270474f 100644
--- a/examples/exampleresources/assets/metalbarrel/normal_no_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp
diff --git a/examples/exampleresources/assets/metalbarrel/normal_soft_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp
index b271b9868..b271b9868 100644
--- a/examples/exampleresources/assets/metalbarrel/normal_soft_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp
diff --git a/examples/exampleresources/assets/metalbarrel/specular.webp b/examples/qt3d/exampleresources/assets/metalbarrel/specular.webp
index 87d8cdec3..87d8cdec3 100644
--- a/examples/exampleresources/assets/metalbarrel/specular.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/specular.webp
diff --git a/examples/exampleresources/assets/metalbarrel/specular_rust.webp b/examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp
index 529ae65bd..529ae65bd 100644
--- a/examples/exampleresources/assets/metalbarrel/specular_rust.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp
diff --git a/examples/exampleresources/assets/metalbarrel/specular_stainless_steel.webp b/examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp
index 530ce593b..530ce593b 100644
--- a/examples/exampleresources/assets/metalbarrel/specular_stainless_steel.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp
diff --git a/examples/exampleresources/assets/obj/ball.obj b/examples/qt3d/exampleresources/assets/obj/ball.obj
index f54f28552..f54f28552 100644
--- a/examples/exampleresources/assets/obj/ball.obj
+++ b/examples/qt3d/exampleresources/assets/obj/ball.obj
diff --git a/examples/exampleresources/assets/obj/toyplane.obj b/examples/qt3d/exampleresources/assets/obj/toyplane.obj
index bb55967ca..bb55967ca 100644
--- a/examples/exampleresources/assets/obj/toyplane.obj
+++ b/examples/qt3d/exampleresources/assets/obj/toyplane.obj
diff --git a/examples/exampleresources/assets/obj/trefoil.obj b/examples/qt3d/exampleresources/assets/obj/trefoil.obj
index ccd2d43d3..ccd2d43d3 100644
--- a/examples/exampleresources/assets/obj/trefoil.obj
+++ b/examples/qt3d/exampleresources/assets/obj/trefoil.obj
diff --git a/examples/exampleresources/assets/test_scene.dae b/examples/qt3d/exampleresources/assets/test_scene.dae
index 23dabfe28..23dabfe28 100644
--- a/examples/exampleresources/assets/test_scene.dae
+++ b/examples/qt3d/exampleresources/assets/test_scene.dae
diff --git a/examples/exampleresources/assets/textures/pattern_09/diffuse.webp b/examples/qt3d/exampleresources/assets/textures/pattern_09/diffuse.webp
index b41ddb59f..b41ddb59f 100644
--- a/examples/exampleresources/assets/textures/pattern_09/diffuse.webp
+++ b/examples/qt3d/exampleresources/assets/textures/pattern_09/diffuse.webp
diff --git a/examples/exampleresources/assets/textures/pattern_09/normal.webp b/examples/qt3d/exampleresources/assets/textures/pattern_09/normal.webp
index a2b4a7eaf..a2b4a7eaf 100644
--- a/examples/exampleresources/assets/textures/pattern_09/normal.webp
+++ b/examples/qt3d/exampleresources/assets/textures/pattern_09/normal.webp
diff --git a/examples/exampleresources/assets/textures/pattern_09/readme.txt b/examples/qt3d/exampleresources/assets/textures/pattern_09/readme.txt
index 763ed3499..763ed3499 100644
--- a/examples/exampleresources/assets/textures/pattern_09/readme.txt
+++ b/examples/qt3d/exampleresources/assets/textures/pattern_09/readme.txt
diff --git a/examples/exampleresources/assets/textures/pattern_09/specular.webp b/examples/qt3d/exampleresources/assets/textures/pattern_09/specular.webp
index cbb764e3f..cbb764e3f 100644
--- a/examples/exampleresources/assets/textures/pattern_09/specular.webp
+++ b/examples/qt3d/exampleresources/assets/textures/pattern_09/specular.webp
diff --git a/examples/exampleresources/example-assets.qrc b/examples/qt3d/exampleresources/example-assets.qrc
index ccfac6563..ccfac6563 100644
--- a/examples/exampleresources/example-assets.qrc
+++ b/examples/qt3d/exampleresources/example-assets.qrc
diff --git a/examples/exampleresources/exampleresources.cpp b/examples/qt3d/exampleresources/exampleresources.cpp
index 6249f5bdd..6249f5bdd 100644
--- a/examples/exampleresources/exampleresources.cpp
+++ b/examples/qt3d/exampleresources/exampleresources.cpp
diff --git a/examples/exampleresources/exampleresources.h b/examples/qt3d/exampleresources/exampleresources.h
index c2d75873d..c2d75873d 100644
--- a/examples/exampleresources/exampleresources.h
+++ b/examples/qt3d/exampleresources/exampleresources.h
diff --git a/examples/exampleresources/exampleresources.pri b/examples/qt3d/exampleresources/exampleresources.pri
index 0bd8a17f5..0bd8a17f5 100644
--- a/examples/exampleresources/exampleresources.pri
+++ b/examples/qt3d/exampleresources/exampleresources.pri
diff --git a/examples/exampleresources/exampleresources.pro b/examples/qt3d/exampleresources/exampleresources.pro
index 90c733046..90c733046 100644
--- a/examples/exampleresources/exampleresources.pro
+++ b/examples/qt3d/exampleresources/exampleresources.pro
diff --git a/examples/gltf/basic.frag b/examples/qt3d/gltf/basic.frag
index 6f83f6b90..6f83f6b90 100644
--- a/examples/gltf/basic.frag
+++ b/examples/qt3d/gltf/basic.frag
diff --git a/examples/gltf/basic.vert b/examples/qt3d/gltf/basic.vert
index 0e35affd5..0e35affd5 100644
--- a/examples/gltf/basic.vert
+++ b/examples/qt3d/gltf/basic.vert
diff --git a/examples/gltf/gltf.pro b/examples/qt3d/gltf/gltf.pro
index d2ac810a9..d2ac810a9 100644
--- a/examples/gltf/gltf.pro
+++ b/examples/qt3d/gltf/gltf.pro
diff --git a/examples/gltf/gltf.qrc b/examples/qt3d/gltf/gltf.qrc
index c24519313..c24519313 100644
--- a/examples/gltf/gltf.qrc
+++ b/examples/qt3d/gltf/gltf.qrc
diff --git a/examples/gltf/main.cpp b/examples/qt3d/gltf/main.cpp
index a65d56218..a65d56218 100644
--- a/examples/gltf/main.cpp
+++ b/examples/qt3d/gltf/main.cpp
diff --git a/examples/gltf/main.qml b/examples/qt3d/gltf/main.qml
index 3fd8ca398..3fd8ca398 100644
--- a/examples/gltf/main.qml
+++ b/examples/qt3d/gltf/main.qml
diff --git a/examples/keyboardinput-qml/keyboardinput-qml.pro b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro
index 29e821655..29e821655 100644
--- a/examples/keyboardinput-qml/keyboardinput-qml.pro
+++ b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro
diff --git a/examples/keyboardinput-qml/keyboardinput-qml.qrc b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/keyboardinput-qml/keyboardinput-qml.qrc
+++ b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.qrc
diff --git a/examples/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp
index 0238633d3..0238633d3 100644
--- a/examples/keyboardinput-qml/main.cpp
+++ b/examples/qt3d/keyboardinput-qml/main.cpp
diff --git a/examples/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml
index ef5afd077..ef5afd077 100644
--- a/examples/keyboardinput-qml/main.qml
+++ b/examples/qt3d/keyboardinput-qml/main.qml
diff --git a/examples/loader-qml/CuboidEntity.qml b/examples/qt3d/loader-qml/CuboidEntity.qml
index d05e47a57..d05e47a57 100644
--- a/examples/loader-qml/CuboidEntity.qml
+++ b/examples/qt3d/loader-qml/CuboidEntity.qml
diff --git a/examples/loader-qml/SphereEntity.qml b/examples/qt3d/loader-qml/SphereEntity.qml
index fe36c1467..fe36c1467 100644
--- a/examples/loader-qml/SphereEntity.qml
+++ b/examples/qt3d/loader-qml/SphereEntity.qml
diff --git a/examples/loader-qml/loader-qml.pro b/examples/qt3d/loader-qml/loader-qml.pro
index c4f4b38cf..c4f4b38cf 100644
--- a/examples/loader-qml/loader-qml.pro
+++ b/examples/qt3d/loader-qml/loader-qml.pro
diff --git a/examples/loader-qml/loader-qml.qrc b/examples/qt3d/loader-qml/loader-qml.qrc
index 8cf177b62..8cf177b62 100644
--- a/examples/loader-qml/loader-qml.qrc
+++ b/examples/qt3d/loader-qml/loader-qml.qrc
diff --git a/examples/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp
index e74dc8b43..e74dc8b43 100644
--- a/examples/loader-qml/main.cpp
+++ b/examples/qt3d/loader-qml/main.cpp
diff --git a/examples/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml
index 9857a5eaa..9857a5eaa 100644
--- a/examples/loader-qml/main.qml
+++ b/examples/qt3d/loader-qml/main.qml
diff --git a/examples/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp
index 069732254..069732254 100644
--- a/examples/materials-cpp/barrel.cpp
+++ b/examples/qt3d/materials-cpp/barrel.cpp
diff --git a/examples/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h
index 8ff1c32df..8ff1c32df 100644
--- a/examples/materials-cpp/barrel.h
+++ b/examples/qt3d/materials-cpp/barrel.h
diff --git a/examples/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp
index c1bea7ecd..c1bea7ecd 100644
--- a/examples/materials-cpp/houseplant.cpp
+++ b/examples/qt3d/materials-cpp/houseplant.cpp
diff --git a/examples/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h
index 150984f59..150984f59 100644
--- a/examples/materials-cpp/houseplant.h
+++ b/examples/qt3d/materials-cpp/houseplant.h
diff --git a/examples/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index 3704ffcdf..3704ffcdf 100644
--- a/examples/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
diff --git a/examples/materials-cpp/materials-cpp.pro b/examples/qt3d/materials-cpp/materials-cpp.pro
index 351ed82f8..351ed82f8 100644
--- a/examples/materials-cpp/materials-cpp.pro
+++ b/examples/qt3d/materials-cpp/materials-cpp.pro
diff --git a/examples/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp
index 9854e8ace..9854e8ace 100644
--- a/examples/materials-cpp/planeentity.cpp
+++ b/examples/qt3d/materials-cpp/planeentity.cpp
diff --git a/examples/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h
index 418f3c698..418f3c698 100644
--- a/examples/materials-cpp/planeentity.h
+++ b/examples/qt3d/materials-cpp/planeentity.h
diff --git a/examples/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp
index 0acbdcc00..0acbdcc00 100644
--- a/examples/materials-cpp/renderableentity.cpp
+++ b/examples/qt3d/materials-cpp/renderableentity.cpp
diff --git a/examples/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index c467ffb5c..c467ffb5c 100644
--- a/examples/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
diff --git a/examples/materials-cpp/rotatingtrefoilknot.cpp b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
index 833d82d37..833d82d37 100644
--- a/examples/materials-cpp/rotatingtrefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
diff --git a/examples/materials-cpp/rotatingtrefoilknot.h b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
index 231ce5270..231ce5270 100644
--- a/examples/materials-cpp/rotatingtrefoilknot.h
+++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
diff --git a/examples/materials-cpp/trefoilknot.cpp b/examples/qt3d/materials-cpp/trefoilknot.cpp
index b99c090ea..b99c090ea 100644
--- a/examples/materials-cpp/trefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/trefoilknot.cpp
diff --git a/examples/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h
index a625c874e..a625c874e 100644
--- a/examples/materials-cpp/trefoilknot.h
+++ b/examples/qt3d/materials-cpp/trefoilknot.h
diff --git a/examples/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml
index 1dcec0ca1..1dcec0ca1 100644
--- a/examples/materials/Barrel.qml
+++ b/examples/qt3d/materials/Barrel.qml
diff --git a/examples/materials/BasicCamera.qml b/examples/qt3d/materials/BasicCamera.qml
index f96132416..f96132416 100644
--- a/examples/materials/BasicCamera.qml
+++ b/examples/qt3d/materials/BasicCamera.qml
diff --git a/examples/materials/Chest.qml b/examples/qt3d/materials/Chest.qml
index 1acd126ff..1acd126ff 100644
--- a/examples/materials/Chest.qml
+++ b/examples/qt3d/materials/Chest.qml
diff --git a/examples/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml
index 353a252d2..353a252d2 100644
--- a/examples/materials/HousePlant.qml
+++ b/examples/qt3d/materials/HousePlant.qml
diff --git a/examples/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml
index 222b5a33b..222b5a33b 100644
--- a/examples/materials/PlaneEntity.qml
+++ b/examples/qt3d/materials/PlaneEntity.qml
diff --git a/examples/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml
index 03119b713..03119b713 100644
--- a/examples/materials/RenderableEntity.qml
+++ b/examples/qt3d/materials/RenderableEntity.qml
diff --git a/examples/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml
index 0687785fb..0687785fb 100644
--- a/examples/materials/SortedForwardRenderer.qml
+++ b/examples/qt3d/materials/SortedForwardRenderer.qml
diff --git a/examples/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml
index 48b334ce0..48b334ce0 100644
--- a/examples/materials/TrefoilKnot.qml
+++ b/examples/qt3d/materials/TrefoilKnot.qml
diff --git a/examples/materials/main.cpp b/examples/qt3d/materials/main.cpp
index 20b518734..20b518734 100644
--- a/examples/materials/main.cpp
+++ b/examples/qt3d/materials/main.cpp
diff --git a/examples/materials/main.qml b/examples/qt3d/materials/main.qml
index cceac110b..cceac110b 100644
--- a/examples/materials/main.qml
+++ b/examples/qt3d/materials/main.qml
diff --git a/examples/materials/materials.pro b/examples/qt3d/materials/materials.pro
index 23d4d38a8..23d4d38a8 100644
--- a/examples/materials/materials.pro
+++ b/examples/qt3d/materials/materials.pro
diff --git a/examples/materials/materials.qrc b/examples/qt3d/materials/materials.qrc
index 417653df9..417653df9 100644
--- a/examples/materials/materials.qrc
+++ b/examples/qt3d/materials/materials.qrc
diff --git a/examples/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp
index ca9ea8abe..ca9ea8abe 100644
--- a/examples/multiviewport/main.cpp
+++ b/examples/qt3d/multiviewport/main.cpp
diff --git a/examples/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml
index c5ad221dd..c5ad221dd 100644
--- a/examples/multiviewport/main.qml
+++ b/examples/qt3d/multiviewport/main.qml
diff --git a/examples/multiviewport/multiviewport.pro b/examples/qt3d/multiviewport/multiviewport.pro
index d7ed38b6d..d7ed38b6d 100644
--- a/examples/multiviewport/multiviewport.pro
+++ b/examples/qt3d/multiviewport/multiviewport.pro
diff --git a/examples/multiviewport/multiviewport.qrc b/examples/qt3d/multiviewport/multiviewport.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/multiviewport/multiviewport.qrc
+++ b/examples/qt3d/multiviewport/multiviewport.qrc
diff --git a/examples/playground-qml/AdsEffect.qml b/examples/qt3d/playground-qml/AdsEffect.qml
index 4bc81ca44..4bc81ca44 100644
--- a/examples/playground-qml/AdsEffect.qml
+++ b/examples/qt3d/playground-qml/AdsEffect.qml
diff --git a/examples/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index 50605baee..50605baee 100644
--- a/examples/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
diff --git a/examples/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 9bc3cad58..9bc3cad58 100644
--- a/examples/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
diff --git a/examples/playground-qml/DetailView.qml b/examples/qt3d/playground-qml/DetailView.qml
index 92a2f3a1f..92a2f3a1f 100644
--- a/examples/playground-qml/DetailView.qml
+++ b/examples/qt3d/playground-qml/DetailView.qml
diff --git a/examples/playground-qml/MainView.qml b/examples/qt3d/playground-qml/MainView.qml
index 0f115d397..0f115d397 100644
--- a/examples/playground-qml/MainView.qml
+++ b/examples/qt3d/playground-qml/MainView.qml
diff --git a/examples/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml
index b4b412e77..b4b412e77 100644
--- a/examples/playground-qml/MyForwardRenderer.qml
+++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml
diff --git a/examples/playground-qml/RenderableEntity.qml b/examples/qt3d/playground-qml/RenderableEntity.qml
index 13be8f1f9..13be8f1f9 100644
--- a/examples/playground-qml/RenderableEntity.qml
+++ b/examples/qt3d/playground-qml/RenderableEntity.qml
diff --git a/examples/playground-qml/assets/ball.obj b/examples/qt3d/playground-qml/assets/ball.obj
index f54f28552..f54f28552 100644
--- a/examples/playground-qml/assets/ball.obj
+++ b/examples/qt3d/playground-qml/assets/ball.obj
diff --git a/examples/playground-qml/assets/cube.obj b/examples/qt3d/playground-qml/assets/cube.obj
index 81547f180..81547f180 100644
--- a/examples/playground-qml/assets/cube.obj
+++ b/examples/qt3d/playground-qml/assets/cube.obj
diff --git a/examples/playground-qml/assets/test_scene.dae b/examples/qt3d/playground-qml/assets/test_scene.dae
index 23dabfe28..23dabfe28 100644
--- a/examples/playground-qml/assets/test_scene.dae
+++ b/examples/qt3d/playground-qml/assets/test_scene.dae
diff --git a/examples/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp
index 890776d22..890776d22 100644
--- a/examples/playground-qml/main.cpp
+++ b/examples/qt3d/playground-qml/main.cpp
diff --git a/examples/playground-qml/main.qml b/examples/qt3d/playground-qml/main.qml
index a5605f762..a5605f762 100644
--- a/examples/playground-qml/main.qml
+++ b/examples/qt3d/playground-qml/main.qml
diff --git a/examples/playground-qml/playground-qml.pro b/examples/qt3d/playground-qml/playground-qml.pro
index ed48e137f..ed48e137f 100644
--- a/examples/playground-qml/playground-qml.pro
+++ b/examples/qt3d/playground-qml/playground-qml.pro
diff --git a/examples/playground-qml/playground-qml.qrc b/examples/qt3d/playground-qml/playground-qml.qrc
index 33ef7fabf..33ef7fabf 100644
--- a/examples/playground-qml/playground-qml.qrc
+++ b/examples/qt3d/playground-qml/playground-qml.qrc
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
new file mode 100644
index 000000000..d47fd5bb8
--- /dev/null
+++ b/examples/qt3d/qt3d.pro
@@ -0,0 +1,43 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    exampleresources \
+    playground-qml \
+    simple-qml \
+    simple-cpp \
+    gltf \
+    assimp \
+    cpp_example \
+    multiviewport \
+    torus-qml \
+    torus-cpp \
+    cylinder-qml \
+    cylinder-cpp \
+    bigmodel-qml \
+    wireframe \
+    tessellation-modes \
+    deferred-renderer-qml \
+    deferred-renderer-cpp \
+    shadow-map-qml \
+    bigscene-cpp \
+    materials \
+    keyboardinput-qml \
+    loader-qml \
+    wave \
+    materials-cpp \
+    dynamicscene-cpp \
+    scene3d \
+    enabled-qml \
+    skybox
+
+# TODO Port the old examples to new APIs
+#SUBDIRS += qt3d
+#qtHaveModule(qml): SUBDIRS += quick3d
+
+# Make all other subdirs depend on exampleresources
+for(subdir, SUBDIRS) {
+    !equals(subdir, exampleresources) {
+        $${subdir}.depends += exampleresources
+    }
+}
+
diff --git a/examples/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml
index 8c44fde0d..8c44fde0d 100644
--- a/examples/scene3d/AnimatedEntity.qml
+++ b/examples/qt3d/scene3d/AnimatedEntity.qml
diff --git a/examples/scene3d/main.cpp b/examples/qt3d/scene3d/main.cpp
index 0ed21fd88..0ed21fd88 100644
--- a/examples/scene3d/main.cpp
+++ b/examples/qt3d/scene3d/main.cpp
diff --git a/examples/scene3d/main.qml b/examples/qt3d/scene3d/main.qml
index bed04161e..bed04161e 100644
--- a/examples/scene3d/main.qml
+++ b/examples/qt3d/scene3d/main.qml
diff --git a/examples/scene3d/scene3d.pro b/examples/qt3d/scene3d/scene3d.pro
index 9df4a2bcf..9df4a2bcf 100644
--- a/examples/scene3d/scene3d.pro
+++ b/examples/qt3d/scene3d/scene3d.pro
diff --git a/examples/scene3d/scene3d.qrc b/examples/qt3d/scene3d/scene3d.qrc
index dff72ed5a..dff72ed5a 100644
--- a/examples/scene3d/scene3d.qrc
+++ b/examples/qt3d/scene3d/scene3d.qrc
diff --git a/examples/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml
index 1ddc58f3b..1ddc58f3b 100644
--- a/examples/shadow-map-qml/AdsEffect.qml
+++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml
diff --git a/examples/shadow-map-qml/AdsMaterial.qml b/examples/qt3d/shadow-map-qml/AdsMaterial.qml
index 322c7b9ac..322c7b9ac 100644
--- a/examples/shadow-map-qml/AdsMaterial.qml
+++ b/examples/qt3d/shadow-map-qml/AdsMaterial.qml
diff --git a/examples/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml
index b863da3b5..b863da3b5 100644
--- a/examples/shadow-map-qml/GroundPlane.qml
+++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml
diff --git a/examples/shadow-map-qml/Light.qml b/examples/qt3d/shadow-map-qml/Light.qml
index ca03f070f..ca03f070f 100644
--- a/examples/shadow-map-qml/Light.qml
+++ b/examples/qt3d/shadow-map-qml/Light.qml
diff --git a/examples/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index b6932a76d..b6932a76d 100644
--- a/examples/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
diff --git a/examples/shadow-map-qml/Toyplane.qml b/examples/qt3d/shadow-map-qml/Toyplane.qml
index 61c803469..61c803469 100644
--- a/examples/shadow-map-qml/Toyplane.qml
+++ b/examples/qt3d/shadow-map-qml/Toyplane.qml
diff --git a/examples/shadow-map-qml/Trefoil.qml b/examples/qt3d/shadow-map-qml/Trefoil.qml
index 341ee6c23..341ee6c23 100644
--- a/examples/shadow-map-qml/Trefoil.qml
+++ b/examples/qt3d/shadow-map-qml/Trefoil.qml
diff --git a/examples/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp
index 31836bf9d..31836bf9d 100644
--- a/examples/shadow-map-qml/main.cpp
+++ b/examples/qt3d/shadow-map-qml/main.cpp
diff --git a/examples/shadow-map-qml/main.qml b/examples/qt3d/shadow-map-qml/main.qml
index 59040c39b..59040c39b 100644
--- a/examples/shadow-map-qml/main.qml
+++ b/examples/qt3d/shadow-map-qml/main.qml
diff --git a/examples/shadow-map-qml/shaders/ads.frag b/examples/qt3d/shadow-map-qml/shaders/ads.frag
index b2b056a3a..b2b056a3a 100644
--- a/examples/shadow-map-qml/shaders/ads.frag
+++ b/examples/qt3d/shadow-map-qml/shaders/ads.frag
diff --git a/examples/shadow-map-qml/shaders/ads.vert b/examples/qt3d/shadow-map-qml/shaders/ads.vert
index e77a8f287..e77a8f287 100644
--- a/examples/shadow-map-qml/shaders/ads.vert
+++ b/examples/qt3d/shadow-map-qml/shaders/ads.vert
diff --git a/examples/shadow-map-qml/shaders/es3/ads.frag b/examples/qt3d/shadow-map-qml/shaders/es3/ads.frag
index 30977cf1e..30977cf1e 100644
--- a/examples/shadow-map-qml/shaders/es3/ads.frag
+++ b/examples/qt3d/shadow-map-qml/shaders/es3/ads.frag
diff --git a/examples/shadow-map-qml/shaders/es3/ads.vert b/examples/qt3d/shadow-map-qml/shaders/es3/ads.vert
index c304fbaad..c304fbaad 100644
--- a/examples/shadow-map-qml/shaders/es3/ads.vert
+++ b/examples/qt3d/shadow-map-qml/shaders/es3/ads.vert
diff --git a/examples/shadow-map-qml/shaders/es3/shadowmap.frag b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.frag
index 22fe0431b..22fe0431b 100644
--- a/examples/shadow-map-qml/shaders/es3/shadowmap.frag
+++ b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.frag
diff --git a/examples/shadow-map-qml/shaders/es3/shadowmap.vert b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.vert
index 1fe6b3724..1fe6b3724 100644
--- a/examples/shadow-map-qml/shaders/es3/shadowmap.vert
+++ b/examples/qt3d/shadow-map-qml/shaders/es3/shadowmap.vert
diff --git a/examples/shadow-map-qml/shaders/shadowmap.frag b/examples/qt3d/shadow-map-qml/shaders/shadowmap.frag
index becac915e..becac915e 100644
--- a/examples/shadow-map-qml/shaders/shadowmap.frag
+++ b/examples/qt3d/shadow-map-qml/shaders/shadowmap.frag
diff --git a/examples/shadow-map-qml/shaders/shadowmap.vert b/examples/qt3d/shadow-map-qml/shaders/shadowmap.vert
index a0b81a846..a0b81a846 100644
--- a/examples/shadow-map-qml/shaders/shadowmap.vert
+++ b/examples/qt3d/shadow-map-qml/shaders/shadowmap.vert
diff --git a/examples/shadow-map-qml/shadow-map-qml.pro b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro
index 7d7670022..7d7670022 100644
--- a/examples/shadow-map-qml/shadow-map-qml.pro
+++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro
diff --git a/examples/shadow-map-qml/shadow-map-qml.qrc b/examples/qt3d/shadow-map-qml/shadow-map-qml.qrc
index 9aa6e2c73..9aa6e2c73 100644
--- a/examples/shadow-map-qml/shadow-map-qml.qrc
+++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.qrc
diff --git a/examples/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index d44271543..d44271543 100644
--- a/examples/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
diff --git a/examples/simple-cpp/simple-cpp.pro b/examples/qt3d/simple-cpp/simple-cpp.pro
index c7f008ae9..c7f008ae9 100644
--- a/examples/simple-cpp/simple-cpp.pro
+++ b/examples/qt3d/simple-cpp/simple-cpp.pro
diff --git a/examples/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp
index e74dc8b43..e74dc8b43 100644
--- a/examples/simple-qml/main.cpp
+++ b/examples/qt3d/simple-qml/main.cpp
diff --git a/examples/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml
index 7896766c5..7896766c5 100644
--- a/examples/simple-qml/main.qml
+++ b/examples/qt3d/simple-qml/main.qml
diff --git a/examples/simple-qml/simple-qml.pro b/examples/qt3d/simple-qml/simple-qml.pro
index 0df3ee3e6..0df3ee3e6 100644
--- a/examples/simple-qml/simple-qml.pro
+++ b/examples/qt3d/simple-qml/simple-qml.pro
diff --git a/examples/simple-qml/simple-qml.qrc b/examples/qt3d/simple-qml/simple-qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/simple-qml/simple-qml.qrc
+++ b/examples/qt3d/simple-qml/simple-qml.qrc
diff --git a/examples/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml
index e8dfc29d1..e8dfc29d1 100644
--- a/examples/skybox/Skybox.qml
+++ b/examples/qt3d/skybox/Skybox.qml
diff --git a/examples/skybox/main.cpp b/examples/qt3d/skybox/main.cpp
index 698403872..698403872 100644
--- a/examples/skybox/main.cpp
+++ b/examples/qt3d/skybox/main.cpp
diff --git a/examples/skybox/main.qml b/examples/qt3d/skybox/main.qml
index 83bb663cf..83bb663cf 100644
--- a/examples/skybox/main.qml
+++ b/examples/qt3d/skybox/main.qml
diff --git a/examples/skybox/skybox.pro b/examples/qt3d/skybox/skybox.pro
index c58d7f90e..c58d7f90e 100644
--- a/examples/skybox/skybox.pro
+++ b/examples/qt3d/skybox/skybox.pro
diff --git a/examples/skybox/skybox.qrc b/examples/qt3d/skybox/skybox.qrc
index 927dfb169..927dfb169 100644
--- a/examples/skybox/skybox.qrc
+++ b/examples/qt3d/skybox/skybox.qrc
diff --git a/examples/tessellation-modes/BasicCamera.qml b/examples/qt3d/tessellation-modes/BasicCamera.qml
index 062c84eff..062c84eff 100644
--- a/examples/tessellation-modes/BasicCamera.qml
+++ b/examples/qt3d/tessellation-modes/BasicCamera.qml
diff --git a/examples/tessellation-modes/TessellatedQuad.qml b/examples/qt3d/tessellation-modes/TessellatedQuad.qml
index b6c3122a9..b6c3122a9 100644
--- a/examples/tessellation-modes/TessellatedQuad.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedQuad.qml
diff --git a/examples/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
index 0b51fde2a..0b51fde2a 100644
--- a/examples/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
diff --git a/examples/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml
index d66ad740c..d66ad740c 100644
--- a/examples/tessellation-modes/TessellatedWireframeMaterial.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml
diff --git a/examples/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp
index ed9ae1e44..ed9ae1e44 100644
--- a/examples/tessellation-modes/main.cpp
+++ b/examples/qt3d/tessellation-modes/main.cpp
diff --git a/examples/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml
index 425ca40de..425ca40de 100644
--- a/examples/tessellation-modes/main.qml
+++ b/examples/qt3d/tessellation-modes/main.qml
diff --git a/examples/tessellation-modes/shaders/flat.frag b/examples/qt3d/tessellation-modes/shaders/flat.frag
index 6e596d4d6..6e596d4d6 100644
--- a/examples/tessellation-modes/shaders/flat.frag
+++ b/examples/qt3d/tessellation-modes/shaders/flat.frag
diff --git a/examples/tessellation-modes/shaders/isolines.tcs b/examples/qt3d/tessellation-modes/shaders/isolines.tcs
index 624af51cc..624af51cc 100644
--- a/examples/tessellation-modes/shaders/isolines.tcs
+++ b/examples/qt3d/tessellation-modes/shaders/isolines.tcs
diff --git a/examples/tessellation-modes/shaders/isolines.tes b/examples/qt3d/tessellation-modes/shaders/isolines.tes
index f6b984bc8..f6b984bc8 100644
--- a/examples/tessellation-modes/shaders/isolines.tes
+++ b/examples/qt3d/tessellation-modes/shaders/isolines.tes
diff --git a/examples/tessellation-modes/shaders/passthru.vert b/examples/qt3d/tessellation-modes/shaders/passthru.vert
index 71875a55f..71875a55f 100644
--- a/examples/tessellation-modes/shaders/passthru.vert
+++ b/examples/qt3d/tessellation-modes/shaders/passthru.vert
diff --git a/examples/tessellation-modes/shaders/phongwireframe.frag b/examples/qt3d/tessellation-modes/shaders/phongwireframe.frag
index 4fd62007d..4fd62007d 100644
--- a/examples/tessellation-modes/shaders/phongwireframe.frag
+++ b/examples/qt3d/tessellation-modes/shaders/phongwireframe.frag
diff --git a/examples/tessellation-modes/shaders/quads.tcs b/examples/qt3d/tessellation-modes/shaders/quads.tcs
index 367195522..367195522 100644
--- a/examples/tessellation-modes/shaders/quads.tcs
+++ b/examples/qt3d/tessellation-modes/shaders/quads.tcs
diff --git a/examples/tessellation-modes/shaders/quads.tes b/examples/qt3d/tessellation-modes/shaders/quads.tes
index a3fd48441..a3fd48441 100644
--- a/examples/tessellation-modes/shaders/quads.tes
+++ b/examples/qt3d/tessellation-modes/shaders/quads.tes
diff --git a/examples/tessellation-modes/shaders/robustwireframe.geom b/examples/qt3d/tessellation-modes/shaders/robustwireframe.geom
index 02eaaf398..02eaaf398 100644
--- a/examples/tessellation-modes/shaders/robustwireframe.geom
+++ b/examples/qt3d/tessellation-modes/shaders/robustwireframe.geom
diff --git a/examples/tessellation-modes/shaders/triangles.tcs b/examples/qt3d/tessellation-modes/shaders/triangles.tcs
index c311796fd..c311796fd 100644
--- a/examples/tessellation-modes/shaders/triangles.tcs
+++ b/examples/qt3d/tessellation-modes/shaders/triangles.tcs
diff --git a/examples/tessellation-modes/shaders/triangles.tes b/examples/qt3d/tessellation-modes/shaders/triangles.tes
index c833e9587..c833e9587 100644
--- a/examples/tessellation-modes/shaders/triangles.tes
+++ b/examples/qt3d/tessellation-modes/shaders/triangles.tes
diff --git a/examples/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
index 6b04e5da3..6b04e5da3 100644
--- a/examples/tessellation-modes/tessellatedquadmesh.cpp
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
diff --git a/examples/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
index 76b00ae01..76b00ae01 100644
--- a/examples/tessellation-modes/tessellatedquadmesh.h
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
diff --git a/examples/tessellation-modes/tessellation-modes.pro b/examples/qt3d/tessellation-modes/tessellation-modes.pro
index 683dd7f9f..683dd7f9f 100644
--- a/examples/tessellation-modes/tessellation-modes.pro
+++ b/examples/qt3d/tessellation-modes/tessellation-modes.pro
diff --git a/examples/tessellation-modes/tessellation-modes.qrc b/examples/qt3d/tessellation-modes/tessellation-modes.qrc
index 466c9307a..466c9307a 100644
--- a/examples/tessellation-modes/tessellation-modes.qrc
+++ b/examples/qt3d/tessellation-modes/tessellation-modes.qrc
diff --git a/examples/torus-cpp/main.cpp b/examples/qt3d/torus-cpp/main.cpp
index b2cf5b24b..b2cf5b24b 100644
--- a/examples/torus-cpp/main.cpp
+++ b/examples/qt3d/torus-cpp/main.cpp
diff --git a/examples/torus-cpp/torus-cpp.pro b/examples/qt3d/torus-cpp/torus-cpp.pro
index 5ad940ff1..5ad940ff1 100644
--- a/examples/torus-cpp/torus-cpp.pro
+++ b/examples/qt3d/torus-cpp/torus-cpp.pro
diff --git a/examples/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp
index d9c0ede88..d9c0ede88 100644
--- a/examples/torus-qml/main.cpp
+++ b/examples/qt3d/torus-qml/main.cpp
diff --git a/examples/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml
index 05398d10b..05398d10b 100644
--- a/examples/torus-qml/main.qml
+++ b/examples/qt3d/torus-qml/main.qml
diff --git a/examples/torus-qml/torus-qml.pro b/examples/qt3d/torus-qml/torus-qml.pro
index 060164fa9..060164fa9 100644
--- a/examples/torus-qml/torus-qml.pro
+++ b/examples/qt3d/torus-qml/torus-qml.pro
diff --git a/examples/torus-qml/torus-qml.qrc b/examples/qt3d/torus-qml/torus-qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/examples/torus-qml/torus-qml.qrc
+++ b/examples/qt3d/torus-qml/torus-qml.qrc
diff --git a/examples/wave/Background.qml b/examples/qt3d/wave/Background.qml
index d25edfabf..d25edfabf 100644
--- a/examples/wave/Background.qml
+++ b/examples/qt3d/wave/Background.qml
diff --git a/examples/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index be02664f7..be02664f7 100644
--- a/examples/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
diff --git a/examples/wave/BasicCamera.qml b/examples/qt3d/wave/BasicCamera.qml
index 740dd54ce..740dd54ce 100644
--- a/examples/wave/BasicCamera.qml
+++ b/examples/qt3d/wave/BasicCamera.qml
diff --git a/examples/wave/Wave.qml b/examples/qt3d/wave/Wave.qml
index 023631b9e..023631b9e 100644
--- a/examples/wave/Wave.qml
+++ b/examples/qt3d/wave/Wave.qml
diff --git a/examples/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index bca3737b8..bca3737b8 100644
--- a/examples/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
diff --git a/examples/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml
index 9f8031668..9f8031668 100644
--- a/examples/wave/WaveForwardRenderer.qml
+++ b/examples/qt3d/wave/WaveForwardRenderer.qml
diff --git a/examples/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml
index 1417b54cb..1417b54cb 100644
--- a/examples/wave/WaveMaterial.qml
+++ b/examples/qt3d/wave/WaveMaterial.qml
diff --git a/examples/wave/main.cpp b/examples/qt3d/wave/main.cpp
index 6130cc708..6130cc708 100644
--- a/examples/wave/main.cpp
+++ b/examples/qt3d/wave/main.cpp
diff --git a/examples/wave/main.qml b/examples/qt3d/wave/main.qml
index b2e0c1bff..b2e0c1bff 100644
--- a/examples/wave/main.qml
+++ b/examples/qt3d/wave/main.qml
diff --git a/examples/wave/shaders/background.frag b/examples/qt3d/wave/shaders/background.frag
index 01c062189..01c062189 100644
--- a/examples/wave/shaders/background.frag
+++ b/examples/qt3d/wave/shaders/background.frag
diff --git a/examples/wave/shaders/background.vert b/examples/qt3d/wave/shaders/background.vert
index 58fadebe5..58fadebe5 100644
--- a/examples/wave/shaders/background.vert
+++ b/examples/qt3d/wave/shaders/background.vert
diff --git a/examples/wave/shaders/ribbon.frag b/examples/qt3d/wave/shaders/ribbon.frag
index 09ad78871..09ad78871 100644
--- a/examples/wave/shaders/ribbon.frag
+++ b/examples/qt3d/wave/shaders/ribbon.frag
diff --git a/examples/wave/shaders/ribbon.vert b/examples/qt3d/wave/shaders/ribbon.vert
index e099d53c8..e099d53c8 100644
--- a/examples/wave/shaders/ribbon.vert
+++ b/examples/qt3d/wave/shaders/ribbon.vert
diff --git a/examples/wave/shaders/ribbonwireframe.frag b/examples/qt3d/wave/shaders/ribbonwireframe.frag
index 659f00a8a..659f00a8a 100644
--- a/examples/wave/shaders/ribbonwireframe.frag
+++ b/examples/qt3d/wave/shaders/ribbonwireframe.frag
diff --git a/examples/wave/shaders/robustwireframe.geom b/examples/qt3d/wave/shaders/robustwireframe.geom
index 6eb0ecc76..6eb0ecc76 100644
--- a/examples/wave/shaders/robustwireframe.geom
+++ b/examples/qt3d/wave/shaders/robustwireframe.geom
diff --git a/examples/wave/wave.pro b/examples/qt3d/wave/wave.pro
index 05c937cb6..05c937cb6 100644
--- a/examples/wave/wave.pro
+++ b/examples/qt3d/wave/wave.pro
diff --git a/examples/wave/wave.qrc b/examples/qt3d/wave/wave.qrc
index 2ce77a45f..2ce77a45f 100644
--- a/examples/wave/wave.qrc
+++ b/examples/qt3d/wave/wave.qrc
diff --git a/examples/wireframe/BasicCamera.qml b/examples/qt3d/wireframe/BasicCamera.qml
index 740dd54ce..740dd54ce 100644
--- a/examples/wireframe/BasicCamera.qml
+++ b/examples/qt3d/wireframe/BasicCamera.qml
diff --git a/examples/wireframe/TrefoilKnot.qml b/examples/qt3d/wireframe/TrefoilKnot.qml
index 7b6faf852..7b6faf852 100644
--- a/examples/wireframe/TrefoilKnot.qml
+++ b/examples/qt3d/wireframe/TrefoilKnot.qml
diff --git a/examples/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index c8fe3bef8..c8fe3bef8 100644
--- a/examples/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
diff --git a/examples/wireframe/WireframeMaterial.qml b/examples/qt3d/wireframe/WireframeMaterial.qml
index 834ce657d..834ce657d 100644
--- a/examples/wireframe/WireframeMaterial.qml
+++ b/examples/qt3d/wireframe/WireframeMaterial.qml
diff --git a/examples/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp
index ecad579c9..ecad579c9 100644
--- a/examples/wireframe/main.cpp
+++ b/examples/qt3d/wireframe/main.cpp
diff --git a/examples/wireframe/main.qml b/examples/qt3d/wireframe/main.qml
index 8a9506c1c..8a9506c1c 100644
--- a/examples/wireframe/main.qml
+++ b/examples/qt3d/wireframe/main.qml
diff --git a/examples/wireframe/shaders/robustwireframe.frag b/examples/qt3d/wireframe/shaders/robustwireframe.frag
index 217e0e761..217e0e761 100644
--- a/examples/wireframe/shaders/robustwireframe.frag
+++ b/examples/qt3d/wireframe/shaders/robustwireframe.frag
diff --git a/examples/wireframe/shaders/robustwireframe.geom b/examples/qt3d/wireframe/shaders/robustwireframe.geom
index 6eb0ecc76..6eb0ecc76 100644
--- a/examples/wireframe/shaders/robustwireframe.geom
+++ b/examples/qt3d/wireframe/shaders/robustwireframe.geom
diff --git a/examples/wireframe/shaders/robustwireframe.vert b/examples/qt3d/wireframe/shaders/robustwireframe.vert
index e53a2b594..e53a2b594 100644
--- a/examples/wireframe/shaders/robustwireframe.vert
+++ b/examples/qt3d/wireframe/shaders/robustwireframe.vert
diff --git a/examples/wireframe/wireframe.pro b/examples/qt3d/wireframe/wireframe.pro
index 2b2fd991a..2b2fd991a 100644
--- a/examples/wireframe/wireframe.pro
+++ b/examples/qt3d/wireframe/wireframe.pro
diff --git a/examples/wireframe/wireframe.qrc b/examples/qt3d/wireframe/wireframe.qrc
index c73c8418c..c73c8418c 100644
--- a/examples/wireframe/wireframe.qrc
+++ b/examples/qt3d/wireframe/wireframe.qrc