diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 507cc75..98641d0 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -168,7 +168,10 @@ instructions:
       bitbake-layers add-layer ${SOURCE_DIR}
 
       # build toolchain which should include all supported recipes
-      bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules
+      bitbake meta-toolchain-qt6 \
+          nativesdk-packagegroup-qt6-toolchain-host \
+          packagegroup-qt6-modules \
+          packagegroup-qt6-examples
     filename: "{{.BuildDir}}/start-build"
     fileMode: 420
   - type: ExecuteCommand
diff --git a/coin/test-configs.inc b/coin/test-configs.inc
index 698d853..183c2eb 100644
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@@ -49,51 +49,4 @@ PACKAGECONFIG:append:pn-qtbase = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 "
 
-# enable examples for all Qt modules
-PACKAGECONFIG:append:pn-qmlcompilerplus = " examples"
-PACKAGECONFIG:append:pn-qt3d = " examples"
-PACKAGECONFIG:append:pn-qt5compat = " examples"
-PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
-PACKAGECONFIG:append:pn-qtbase = " examples"
-PACKAGECONFIG:append:pn-qtcharts = " examples"
-PACKAGECONFIG:append:pn-qtcoap = " examples"
-PACKAGECONFIG:append:pn-qtconnectivity = " examples"
-PACKAGECONFIG:append:pn-qtdatavis3d = " examples"
-PACKAGECONFIG:append:pn-qtdeclarative = " examples"
-PACKAGECONFIG:append:pn-qtdeviceutilities = " examples"
-PACKAGECONFIG:append:pn-qtgraphs = " examples"
-PACKAGECONFIG:append:pn-qtgrpc = " examples"
-PACKAGECONFIG:append:pn-qthttpserver = " examples"
-PACKAGECONFIG:append:pn-qtimageformats = " examples"
-PACKAGECONFIG:append:pn-qtinsighttracker = " examples"
-PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
-PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
-PACKAGECONFIG:append:pn-qtlocation = " examples"
-PACKAGECONFIG:append:pn-qtlottie = " examples"
-PACKAGECONFIG:append:pn-qtmqtt = " examples"
-PACKAGECONFIG:append:pn-qtmultimedia = " examples"
-PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
-PACKAGECONFIG:append:pn-qtopcua = " examples"
-PACKAGECONFIG:append:pn-qtpdf = " examples"
-PACKAGECONFIG:append:pn-qtpositioning = " examples"
-PACKAGECONFIG:append:pn-qtquick3d = " examples"
-PACKAGECONFIG:append:pn-qtquick3dphysics = " examples"
-PACKAGECONFIG:append:pn-qtquickdesigner-components = " examples"
-PACKAGECONFIG:append:pn-qtquicktimeline = " examples"
-PACKAGECONFIG:append:pn-qtremoteobjects = " examples"
-PACKAGECONFIG:append:pn-qtscxml = " examples"
-PACKAGECONFIG:append:pn-qtsensors = " examples"
-PACKAGECONFIG:append:pn-qtserialbus = " examples"
-PACKAGECONFIG:append:pn-qtserialport = " examples"
-PACKAGECONFIG:append:pn-qtshadertools = " examples"
-PACKAGECONFIG:append:pn-qtspeech = " examples"
-PACKAGECONFIG:append:pn-qtsvg = " examples"
-PACKAGECONFIG:append:pn-qttools = " examples"
-PACKAGECONFIG:append:pn-qttranslations = " examples"
-PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples"
-PACKAGECONFIG:append:pn-qtvncserver = " examples"
-PACKAGECONFIG:append:pn-qtwayland = " examples"
-PACKAGECONFIG:append:pn-qtwebchannel = " examples"
-PACKAGECONFIG:append:pn-qtwebengine = " examples"
-PACKAGECONFIG:append:pn-qtwebsockets = " examples"
-PACKAGECONFIG:append:pn-qtwebview = " examples"
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-modules = " packagegroup-qt6-examples"
diff --git a/coin/test-static.inc b/coin/test-static.inc
index 6c1d3cd..d3c028e 100644
--- a/coin/test-static.inc
+++ b/coin/test-static.inc
@@ -1,3 +1,4 @@
 PACKAGECONFIG:append:pn-qtbase = " static"
 QT_PTEST_ENABLED = "0"
 PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process bubblewrap"
+RDEPENDS:${PN}:remove:pn-packagegroup-qt6-modules = "packagegroup-qt6-examples"
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
index 8deaf8c..87ed447 100644
--- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
@@ -16,7 +16,6 @@ RDEPENDS:${PN} += " \
     qtconnectivity \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
-    qtdoc \
     qtgraphs \
     qtgrpc \
     qthttpserver \
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-examples.bb b/recipes-qt/packagegroups/packagegroup-qt6-examples.bb
new file mode 100644
index 0000000..3e3aab9
--- /dev/null
+++ b/recipes-qt/packagegroups/packagegroup-qt6-examples.bb
@@ -0,0 +1,80 @@
+DESCRIPTION = "Qt6 examples"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+RDEPENDS:${PN} += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-examples', '', d)} \
+    qt5compat-examples \
+    qtapplicationmanager-examples \
+    qtbase-examples \
+    qtcharts-examples \
+    qtcoap-examples \
+    qtconnectivity-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d-examples', '', d)} \
+    qtdeclarative-examples \
+    qtdeviceutilities-examples \
+    qtdoc-examples \
+    qtgraphs-examples \
+    qtgrpc-examples \
+    qthttpserver-examples \
+    qtinterfaceframework-examples \
+    qtlocation-examples \
+    qtmqtt-examples \
+    qtmultimedia-examples \
+    qtnetworkauth-examples \
+    qtopcua-examples \
+    qtpositioning-examples \
+    qtquick3d-examples \
+    qtremoteobjects-examples \
+    qtscxml-examples \
+    qtsensors-examples \
+    qtserialbus-examples \
+    qtserialport-examples \
+    qtspeech-examples \
+    qttools-examples \
+    qtvirtualkeyboard-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
+    qtwebchannel-examples \
+    qtwebsockets-examples \
+"
+
+RDEPENDS:${PN}:append:aarch64 = "\
+    qtquick3dphysics-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:arm = "\
+    qtquick3dphysics-examples \
+"
+RDEPENDS:${PN}:append:armv6 = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7a = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7ve = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:x86 = "\
+    qtquick3dphysics-examples \
+"
+RDEPENDS:${PN}:append:x86-64 = "\
+    qtquick3dphysics-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+
+COMMERCIAL_EXAMPLES = " \
+    qtinsighttracker-examples \
+    qtvncserver-examples \
+"
+RDEPENDS:${PN} += "\
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', '${COMMERCIAL_EXAMPLES}', '', d)} \
+"
+
diff --git a/recipes-qt/qt6/qt3d-examples_git.bb b/recipes-qt/qt6/qt3d-examples_git.bb
new file mode 100644
index 0000000..a6ebbb5
--- /dev/null
+++ b/recipes-qt/qt6/qt3d-examples_git.bb
@@ -0,0 +1,20 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & CC-BY-4.0 & LicenseRef-MIRAMAR"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC-BY-4.0.txt;md5=ed88d31cea57b15030a1f58ceb04e0d5 \
+    file://LICENSES/LicenseRef-MIRAMAR.txt;md5=6dd50bdc58b03a7976544fb939d5647b \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+NO_GENERIC_LICENSE[LicenseRef-MIRAMAR] = "LICENSES/LicenseRef-MIRAMAR.txt"
+
+inherit qt6-cmake
+
+QT_MODULE = "qt3d"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS = "\
+    qt3d \
+    qtdeclarative-native \
+"
diff --git a/recipes-qt/qt6/qt5compat-examples_git.bb b/recipes-qt/qt6/qt5compat-examples_git.bb
new file mode 100644
index 0000000..bb68ab6
--- /dev/null
+++ b/recipes-qt/qt6/qt5compat-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qt5compat"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qt5compat"
diff --git a/recipes-qt/qt6/qt6-commercial.inc b/recipes-qt/qt6/qt6-commercial.inc
index 1fdb8cd..7237821 100644
--- a/recipes-qt/qt6/qt6-commercial.inc
+++ b/recipes-qt/qt6/qt6-commercial.inc
@@ -5,4 +5,4 @@ python() {
 
 QT_GIT = "${QT_COMMERCIAL_GIT}"
 QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
-QT_MODULE = "tqtc-${BPN}"
+QT_MODULE_REPO = "tqtc-${QT_MODULE}"
diff --git a/recipes-qt/qt6/qt6-examples.inc b/recipes-qt/qt6/qt6-examples.inc
new file mode 100644
index 0000000..08ba316
--- /dev/null
+++ b/recipes-qt/qt6/qt6-examples.inc
@@ -0,0 +1,18 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${QT_MODULE}:"
+
+EXTRA_OECMAKE += "\
+    -DQT_BUILD_TESTS=OFF \
+    -DQT_BUILD_STANDALONE_EXAMPLES=ON \
+    -DQT_NO_FAKE_STANDALONE_EXAMPLE_INSTALL_PREFIX=ON \
+"
+
+# use debug sources from the module
+PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
+TARGET_DBGSRC_DIR = "/usr/src/debug/${QT_MODULE}/${PV}"
+
+FILES:${PN} = " \
+    ${QT6_INSTALL_EXAMPLESDIR} \
+"
+
+INSANE_SKIP:${PN} += "libdir dev-so"
+INSANE_SKIP:${PN}-dbg += "libdir"
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index 5045a95..758f183 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -6,7 +6,7 @@ inherit srcrev-update
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "dev"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
-QT_MODULE_REPO ?= "${QT_MODULE}.git"
+QT_MODULE_REPO ?= "${QT_MODULE}"
 
 # for compatibility with Yocto releases before whinlatter
 BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
@@ -17,7 +17,7 @@ CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
 PV = "${QT_VERSION}"
 
-SRCREV = "${SRCREV_${QT_MODULE}}"
+SRCREV = "${SRCREV_${QT_MODULE_REPO}}"
 
 SRCREV_tqtc-qmlcompilerplus = "a866049a9696f872700df3f9208f0a1773c6f3a0"
 SRCREV_tqtc-qtinsighttracker = "7e09d09e9ef2545f1436039484bb8dabe0daf4b1"
diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc
index 0395d52..5d3b77a 100644
--- a/recipes-qt/qt6/qt6.inc
+++ b/recipes-qt/qt6/qt6.inc
@@ -1,10 +1,8 @@
 include recipes-qt/qt6/qt6-ptest.inc
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,"
 PACKAGECONFIG[tests] = "-DQT_BUILD_TESTS=ON,-DQT_BUILD_TESTS=OFF,"
 
 # For qmake projects
-EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', 'QT_BUILD_PARTS-=examples', d)}"
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', 'QT_BUILD_PARTS-=tests', d)}"
 
 # If Qt6 (qtbase) is machine specific, then everything will be,
@@ -30,14 +28,9 @@ python __anonymous() {
         d.appendVar("DEPENDS", " qmlcompilerplus-native")
 }
 
-# Many examples come with libraries installed outside of standard libdir,
-# suppress QA check complaining
-INSANE_SKIP:${PN}-dbg += "libdir"
-INSANE_SKIP:${PN}-examples += "libdir dev-so"
-
 SYSROOT_DIRS += "${QT6_INSTALL_BINDIR} ${QT6_INSTALL_LIBEXECDIR}"
 
-PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"
+PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins"
 
 ALLOW_EMPTY:${PN} = "1"
 ALLOW_EMPTY:${PN}-plugins = "1"
@@ -120,8 +113,3 @@ FILES:${PN}-staticdev += " \
     ${QT6_INSTALL_QMLDIR}/*/*/*/objects*/ \
     ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \
 "
-
-FILES:${PN}-examples = " \
-    ${QT6_INSTALL_EXAMPLESDIR} \
-"
-RDEPENDS:${PN}-examples = "${PN}"
diff --git a/recipes-qt/qt6/qtapplicationmanager-examples_git.bb b/recipes-qt/qt6/qtapplicationmanager-examples_git.bb
new file mode 100644
index 0000000..e725851
--- /dev/null
+++ b/recipes-qt/qt6/qtapplicationmanager-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtapplicationmanager"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtapplicationmanager \
+    qtapplicationmanager-native \
+    qtdeclarative-native \
+"
diff --git a/recipes-qt/qt6/qtbase-examples_git.bb b/recipes-qt/qt6/qtbase-examples_git.bb
new file mode 100644
index 0000000..6e0cb59
--- /dev/null
+++ b/recipes-qt/qt6/qtbase-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtbase"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qtbase"
diff --git a/recipes-qt/qt6/qtcharts-examples_git.bb b/recipes-qt/qt6/qtcharts-examples_git.bb
new file mode 100644
index 0000000..c1c27bf
--- /dev/null
+++ b/recipes-qt/qt6/qtcharts-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtcharts"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtcharts \
+    qtdeclarative-native \
+    qtmultimedia \
+"
diff --git a/recipes-qt/qt6/qtcoap-examples_git.bb b/recipes-qt/qt6/qtcoap-examples_git.bb
new file mode 100644
index 0000000..2115f15
--- /dev/null
+++ b/recipes-qt/qt6/qtcoap-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtcoap"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtcoap \
+    qtdeclarative \
+    qtdeclarative-native \
+"
diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb
index 4eba33f..baf4949 100644
--- a/recipes-qt/qt6/qtcoap_git.bb
+++ b/recipes-qt/qt6/qtcoap_git.bb
@@ -13,6 +13,3 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
-
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
-
diff --git a/recipes-qt/qt6/qtconnectivity-examples_git.bb b/recipes-qt/qt6/qtconnectivity-examples_git.bb
new file mode 100644
index 0000000..f571b62
--- /dev/null
+++ b/recipes-qt/qt6/qtconnectivity-examples_git.bb
@@ -0,0 +1,19 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtconnectivity"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtconnectivity \
+    qtdeclarative \
+    qtdeclarative-native \
+"
diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb
index a7455fe..a9de0ec 100644
--- a/recipes-qt/qt6/qtconnectivity_git.bb
+++ b/recipes-qt/qt6/qtconnectivity_git.bb
@@ -18,6 +18,5 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
 
 FILES:${PN}-tools = ""
diff --git a/recipes-qt/qt6/qtdatavis3d-examples_git.bb b/recipes-qt/qt6/qtdatavis3d-examples_git.bb
new file mode 100644
index 0000000..4932e35
--- /dev/null
+++ b/recipes-qt/qt6/qtdatavis3d-examples_git.bb
@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtdatavis3d"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdatavis3d \
+    qtdeclarative-native \
+"
diff --git a/recipes-qt/qt6/qtdeclarative-examples_git.bb b/recipes-qt/qt6/qtdeclarative-examples_git.bb
new file mode 100644
index 0000000..c9c5c9d
--- /dev/null
+++ b/recipes-qt/qt6/qtdeclarative-examples_git.bb
@@ -0,0 +1,21 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & CC-BY-3.0 & MIT & OFL-1.1"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC-BY-3.0.txt;md5=6dffb34dbf23fffe10cc646d9c030e14 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
+    file://LICENSES/OFL-1.1.txt;md5=e0e18125674e1542f95ea36a4a958f57 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtdeclarative"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative \
+    qtdeclarative-native \
+"
diff --git a/recipes-qt/qt6/qtdeviceutilities-examples_git.bb b/recipes-qt/qt6/qtdeviceutilities-examples_git.bb
new file mode 100644
index 0000000..40a3607
--- /dev/null
+++ b/recipes-qt/qt6/qtdeviceutilities-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtdeviceutilities"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtdeviceutilities \
+"
+RDEPENDS:${PN} = "qtvirtualkeyboard"
diff --git a/recipes-qt/qt6/qtdeviceutilities_git.bb b/recipes-qt/qt6/qtdeviceutilities_git.bb
index 9246f48..ad3306b 100644
--- a/recipes-qt/qt6/qtdeviceutilities_git.bb
+++ b/recipes-qt/qt6/qtdeviceutilities_git.bb
@@ -13,6 +13,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
 RDEPENDS:${PN} = "connman"
 
diff --git a/recipes-qt/qt6/qtdoc_git.bb b/recipes-qt/qt6/qtdoc-examples_git.bb
similarity index 73%
rename from recipes-qt/qt6/qtdoc_git.bb
rename to recipes-qt/qt6/qtdoc-examples_git.bb
index a50110b..b38fef8 100644
--- a/recipes-qt/qt6/qtdoc_git.bb
+++ b/recipes-qt/qt6/qtdoc-examples_git.bb
@@ -1,29 +1,31 @@
-LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Apache-2.0 & CC-BY-4.0 & CC-BY-SA-4.0 & ISC"
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & CC-BY-4.0 & CC-BY-SA-4.0 & ISC"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
     file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
     file://LICENSES/CC-BY-4.0.txt;md5=ed88d31cea57b15030a1f58ceb04e0d5 \
     file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \
-    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSES/ISC.txt;md5=2494cdbaca137fd93842fe9702e9bc4d \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \
 "
 
 inherit qt6-cmake
 
+QT_MODULE = "qtdoc"
+
 include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/qt6-examples.inc
 
 DEPENDS += "\
     qtbase \
     qtcharts \
-    qtdeclarative qtdeclarative-native \
+    qtdeclarative \
+    qtdeclarative-native \
     qtgraphs \
     qtlocation \
     qtmultimedia \
     qtpositioning \
-    qtquick3d qtquick3d-native \
+    qtquick3d \
+    qtquick3d-native \
     qtsensors \
     qtshadertools-native \
     qtsvg \
@@ -38,7 +40,3 @@ DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtp
 DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
 DEPENDS:append:x86 = " qtquick3dphysics"
 DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
-
-PACKAGECONFIG ?= "examples"
-
-INSANE_SKIP:${PN}-ptest += "buildpaths"
diff --git a/recipes-qt/qt6/qtgraphs-examples_git.bb b/recipes-qt/qt6/qtgraphs-examples_git.bb
new file mode 100644
index 0000000..350543a
--- /dev/null
+++ b/recipes-qt/qt6/qtgraphs-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtgraphs"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtgraphs \
+    qtquick3d-native \
+"
diff --git a/recipes-qt/qt6/qtgrpc-examples_git.bb b/recipes-qt/qt6/qtgrpc-examples_git.bb
new file mode 100644
index 0000000..4a43773
--- /dev/null
+++ b/recipes-qt/qt6/qtgrpc-examples_git.bb
@@ -0,0 +1,22 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtgrpc"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    grpc \
+    grpc-native \
+    qtdeclarative-native \
+    qtgrpc \
+    qtgrpc-native \
+"
+
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/recipes-qt/qt6/qthttpserver-examples_git.bb b/recipes-qt/qt6/qthttpserver-examples_git.bb
new file mode 100644
index 0000000..e81c9bf
--- /dev/null
+++ b/recipes-qt/qt6/qthttpserver-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qthttpserver"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qthttpserver"
diff --git a/recipes-qt/qt6/qtinsighttracker-examples_git.bb b/recipes-qt/qt6/qtinsighttracker-examples_git.bb
new file mode 100644
index 0000000..d1a0ccd
--- /dev/null
+++ b/recipes-qt/qt6/qtinsighttracker-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtinsighttracker"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+include recipes-qt/qt6/qt6-commercial.inc
+
+DEPENDS = "\
+    qtdeclarative-native \
+    qtinsighttracker \
+"
diff --git a/recipes-qt/qt6/qtinterfaceframework-examples_git.bb b/recipes-qt/qt6/qtinterfaceframework-examples_git.bb
new file mode 100644
index 0000000..030ff93
--- /dev/null
+++ b/recipes-qt/qt6/qtinterfaceframework-examples_git.bb
@@ -0,0 +1,21 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtinterfaceframework"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtinterfaceframework \
+    qtinterfaceframework-native \
+    qtremoteobjects-native \
+"
+
+PRIVATE_LIBS:${PN} = "libInstrumentCluster.so"
diff --git a/recipes-qt/qt6/qtinterfaceframework_git.bb b/recipes-qt/qt6/qtinterfaceframework_git.bb
index b324570..dcb4038 100644
--- a/recipes-qt/qt6/qtinterfaceframework_git.bb
+++ b/recipes-qt/qt6/qtinterfaceframework_git.bb
@@ -28,5 +28,3 @@ PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,pytho
 PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native"
 
 BBCLASSEXTEND = "native nativesdk"
-
-PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"
diff --git a/recipes-qt/qt6/qtlocation-examples_git.bb b/recipes-qt/qt6/qtlocation-examples_git.bb
new file mode 100644
index 0000000..0092732
--- /dev/null
+++ b/recipes-qt/qt6/qtlocation-examples_git.bb
@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtlocation"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtlocation \
+"
diff --git a/recipes-qt/qt6/qtmqtt-examples_git.bb b/recipes-qt/qt6/qtmqtt-examples_git.bb
new file mode 100644
index 0000000..0c30efe
--- /dev/null
+++ b/recipes-qt/qt6/qtmqtt-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtmqtt"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtmqtt \
+    qtwebsockets \
+"
diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb
index 461807c..a5ceeb7 100644
--- a/recipes-qt/qt6/qtmqtt_git.bb
+++ b/recipes-qt/qt6/qtmqtt_git.bb
@@ -12,6 +12,3 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
-
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native qtwebsockets"
-
diff --git a/recipes-qt/qt6/qtmultimedia-examples_git.bb b/recipes-qt/qt6/qtmultimedia-examples_git.bb
new file mode 100644
index 0000000..53c1b62
--- /dev/null
+++ b/recipes-qt/qt6/qtmultimedia-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtmultimedia"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtmultimedia \
+    qtsvg \
+"
diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb
index a2be688..46cf649 100644
--- a/recipes-qt/qt6/qtmultimedia_git.bb
+++ b/recipes-qt/qt6/qtmultimedia_git.bb
@@ -25,7 +25,6 @@ PACKAGECONFIG ?= "\
     gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
 
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
 PACKAGECONFIG[ffmpeg] = "-DFEATURE_ffmpeg=ON,-DFEATURE_ffmpeg=OFF,ffmpeg"
 PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"
diff --git a/recipes-qt/qt6/qtnetworkauth-examples_git.bb b/recipes-qt/qt6/qtnetworkauth-examples_git.bb
new file mode 100644
index 0000000..4d7bb47
--- /dev/null
+++ b/recipes-qt/qt6/qtnetworkauth-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtnetworkauth"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qtnetworkauth"
diff --git a/recipes-qt/qt6/qtopcua-examples_git.bb b/recipes-qt/qt6/qtopcua-examples_git.bb
new file mode 100644
index 0000000..454fdd2
--- /dev/null
+++ b/recipes-qt/qt6/qtopcua-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtopcua"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtopcua \
+    qtopcua-native \
+"
diff --git a/recipes-qt/qt6/qtpdf-examples_git.bb b/recipes-qt/qt6/qtpdf-examples_git.bb
new file mode 100644
index 0000000..3c2bf7f
--- /dev/null
+++ b/recipes-qt/qt6/qtpdf-examples_git.bb
@@ -0,0 +1,22 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtwebengine"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+SRC_URI += "\
+    file://0002-Enable-examples.patch \
+"
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtpdf \
+"
+
diff --git a/recipes-qt/qt6/qtpositioning-examples_git.bb b/recipes-qt/qt6/qtpositioning-examples_git.bb
new file mode 100644
index 0000000..f0eeff6
--- /dev/null
+++ b/recipes-qt/qt6/qtpositioning-examples_git.bb
@@ -0,0 +1,19 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & OFL-1.1"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/OFL-1.1.txt;md5=ff1fb0cdd81129f9f0c335a58802172f \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtpositioning"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtpositioning \
+"
diff --git a/recipes-qt/qt6/qtquick3d-examples_git.bb b/recipes-qt/qt6/qtquick3d-examples_git.bb
new file mode 100644
index 0000000..8b6d1c2
--- /dev/null
+++ b/recipes-qt/qt6/qtquick3d-examples_git.bb
@@ -0,0 +1,21 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & CC0-1.0 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtquick3d"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtquick3d \
+    qtquick3d-native \
+"
+
diff --git a/recipes-qt/qt6/qtquick3dphysics-examples_git.bb b/recipes-qt/qt6/qtquick3dphysics-examples_git.bb
new file mode 100644
index 0000000..6224f0b
--- /dev/null
+++ b/recipes-qt/qt6/qtquick3dphysics-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtquick3dphysics"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtquick3d-native \
+    qtquick3dphysics \
+"
diff --git a/recipes-qt/qt6/qtremoteobjects-examples_git.bb b/recipes-qt/qt6/qtremoteobjects-examples_git.bb
new file mode 100644
index 0000000..a6148a4
--- /dev/null
+++ b/recipes-qt/qt6/qtremoteobjects-examples_git.bb
@@ -0,0 +1,19 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtremoteobjects"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtconnectivity \
+    qtremoteobjects \
+    qtremoteobjects-native \
+    qtwebsockets \
+"
diff --git a/recipes-qt/qt6/qtscxml-examples_git.bb b/recipes-qt/qt6/qtscxml-examples_git.bb
new file mode 100644
index 0000000..c2ec959
--- /dev/null
+++ b/recipes-qt/qt6/qtscxml-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtscxml"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtscxml \
+    qtscxml-native \
+"
diff --git a/recipes-qt/qt6/qtsensors-examples_git.bb b/recipes-qt/qt6/qtsensors-examples_git.bb
new file mode 100644
index 0000000..91d98de
--- /dev/null
+++ b/recipes-qt/qt6/qtsensors-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtsensors"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtsensors \
+    qtsvg \
+"
diff --git a/recipes-qt/qt6/qtserialbus-examples_git.bb b/recipes-qt/qt6/qtserialbus-examples_git.bb
new file mode 100644
index 0000000..6e2425c
--- /dev/null
+++ b/recipes-qt/qt6/qtserialbus-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtserialbus"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qtserialbus"
diff --git a/recipes-qt/qt6/qtserialport-examples_git.bb b/recipes-qt/qt6/qtserialport-examples_git.bb
new file mode 100644
index 0000000..d746ef4
--- /dev/null
+++ b/recipes-qt/qt6/qtserialport-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtserialport"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qtserialport"
diff --git a/recipes-qt/qt6/qtspeech-examples_git.bb b/recipes-qt/qt6/qtspeech-examples_git.bb
new file mode 100644
index 0000000..d7ca5b7
--- /dev/null
+++ b/recipes-qt/qt6/qtspeech-examples_git.bb
@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtspeech"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtspeech \
+"
diff --git a/recipes-qt/qt6/qttools-examples_git.bb b/recipes-qt/qt6/qttools-examples_git.bb
new file mode 100644
index 0000000..2d99768
--- /dev/null
+++ b/recipes-qt/qt6/qttools-examples_git.bb
@@ -0,0 +1,19 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qttools"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+SRC_URI += "file://0001-examples-don-t-track-source-path.patch"
+
+DEPENDS += "\
+    qttools \
+    qttools-native \
+"
diff --git a/recipes-qt/qt6/qttools/0002-examples-don-t-track-source-path.patch b/recipes-qt/qt6/qttools/0001-examples-don-t-track-source-path.patch
similarity index 100%
rename from recipes-qt/qt6/qttools/0002-examples-don-t-track-source-path.patch
rename to recipes-qt/qt6/qttools/0001-examples-don-t-track-source-path.patch
diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb
index a8c9b8c..162894e 100644
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@@ -20,7 +20,6 @@ include recipes-qt/qt6/qt6.inc
 SRC_URI += " \
     ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml \
     git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
-    file://0002-examples-don-t-track-source-path.patch \
 "
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
diff --git a/recipes-qt/qt6/qtvirtualkeyboard-examples_git.bb b/recipes-qt/qt6/qtvirtualkeyboard-examples_git.bb
new file mode 100644
index 0000000..649a222
--- /dev/null
+++ b/recipes-qt/qt6/qtvirtualkeyboard-examples_git.bb
@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtvirtualkeyboard"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtmultimedia \
+    qtvirtualkeyboard \
+"
diff --git a/recipes-qt/qt6/qtvncserver-examples_git.bb b/recipes-qt/qt6/qtvncserver-examples_git.bb
new file mode 100644
index 0000000..e5a2001
--- /dev/null
+++ b/recipes-qt/qt6/qtvncserver-examples_git.bb
@@ -0,0 +1,19 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtvncserver"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+include recipes-qt/qt6/qt6-commercial.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtvncserver \
+    qtwayland \
+"
diff --git a/recipes-qt/qt6/qtvncserver_git.bb b/recipes-qt/qt6/qtvncserver_git.bb
index 5172f2f..f4b3ae1 100644
--- a/recipes-qt/qt6/qtvncserver_git.bb
+++ b/recipes-qt/qt6/qtvncserver_git.bb
@@ -14,5 +14,4 @@ include recipes-qt/qt6/qt6-commercial.inc
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
 PACKAGECONFIG ?= "libtomcrypt"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwayland"
 PACKAGECONFIG[libtomcrypt] = ",,libtomcrypt"
diff --git a/recipes-qt/qt6/qtwayland-examples_git.bb b/recipes-qt/qt6/qtwayland-examples_git.bb
new file mode 100644
index 0000000..9584b6f
--- /dev/null
+++ b/recipes-qt/qt6/qtwayland-examples_git.bb
@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtwayland"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtwayland \
+"
diff --git a/recipes-qt/qt6/qtwebchannel-examples_git.bb b/recipes-qt/qt6/qtwebchannel-examples_git.bb
new file mode 100644
index 0000000..a095e60
--- /dev/null
+++ b/recipes-qt/qt6/qtwebchannel-examples_git.bb
@@ -0,0 +1,21 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only)"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtwebchannel"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtwebchannel \
+    qtwebsockets \
+"
diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb
index 8850d9a..f6cfd90 100644
--- a/recipes-qt/qt6/qtwebchannel_git.bb
+++ b/recipes-qt/qt6/qtwebchannel_git.bb
@@ -16,7 +16,6 @@ include recipes-qt/qt6/qt6.inc
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwebsockets"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 FILES:${PN} += "\
diff --git a/recipes-qt/qt6/qtwebengine-examples_git.bb b/recipes-qt/qt6/qtwebengine-examples_git.bb
new file mode 100644
index 0000000..c0ae051
--- /dev/null
+++ b/recipes-qt/qt6/qtwebengine-examples_git.bb
@@ -0,0 +1,25 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & LicenseRef-Tango-Icons-Public-Domain & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Tango-Icons-Public-Domain.txt;md5=b66026716fdf499434f80b11851a6cdd \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
+"
+NO_GENERIC_LICENSE[LicenseRef-Tango-Icons-Public-Domain] = "LICENSES/LicenseRef-Tango-Icons-Public-Domain.txt"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtwebengine"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+SRC_URI += "\
+    file://0002-Enable-examples.patch \
+"
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtwebengine \
+"
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc
index c709b7b..8d76dbc 100644
--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@@ -36,7 +36,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 SRC_URI += " \
     ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty \
     file://0001-CMake-use-generated-yocto-toolchains.patch \
-    file://0002-Enable-examples.patch \
 "
 
 SRC_URI += " \
diff --git a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch b/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch
index fa39dc3..d8369ae 100644
--- a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch
+++ b/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch
@@ -1,4 +1,4 @@
-From 221aefe4d8777f45955cb100dfc4c7204c885a19 Mon Sep 17 00:00:00 2001
+From d9c6e7d8dff9081be48bd796f78dd5827cb8a0d3 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 31 Aug 2021 18:27:48 +0300
 Subject: [PATCH] Enable examples
@@ -8,16 +8,19 @@ The bug mentioned does not affect bitbake builds.
 Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa
 Upstream-Status: Inappropriate [OE Specific]
 ---
- examples/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ examples/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index ccad90e11..32cd6d69d 100644
+index e863dafaf..c9ed56c4e 100644
 --- a/examples/CMakeLists.txt
 +++ b/examples/CMakeLists.txt
-@@ -1,7 +1,7 @@
+@@ -3,8 +3,10 @@
+ 
  cmake_minimum_required(VERSION 3.16)
  
++find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Pdf PdfWidgets)
++
  qt_examples_build_begin(EXTERNAL_BUILD)
 -if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
 +if(TRUE) #QTBUG-86533
diff --git a/recipes-qt/qt6/qtwebsockets-examples_git.bb b/recipes-qt/qt6/qtwebsockets-examples_git.bb
new file mode 100644
index 0000000..acfa443
--- /dev/null
+++ b/recipes-qt/qt6/qtwebsockets-examples_git.bb
@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtwebsockets"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qtwebsockets"
diff --git a/recipes-qt/qt6/qtwebview-examples_git.bb b/recipes-qt/qt6/qtwebview-examples_git.bb
new file mode 100644
index 0000000..78a1bf2
--- /dev/null
+++ b/recipes-qt/qt6/qtwebview-examples_git.bb
@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtwebview"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtwebview \
+"