Update submodule refs on '6.8.1' in yocto/meta-qt6

Change-Id: Iacc30412d502f1a03a1b1ecf2ed9d87fd2e9dfde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-01 13:58:07 +00:00 · 2024-11-22 09:21:53 +00:00 · 2024-11-21 14:38:31 +00:00 · 2024-11-19 22:35:03 +00:00 · 2024-11-14 12:51:26 +02:00 · 2024-11-14 10:51:18 +00:00
131 changed files with 761 additions and 1530 deletions
--- a/README.md
+++ b/README.md
@ -20,23 +20,21 @@ Following table shows the Yocto releases which are used to test each
 Qt version (x) and any additional Yocto releases that are stated in
 the LAYERSERIES_COMPAT (c).

-| Yocto \ Qt | dev | 6.11 | 6.10 | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
-|:---------- |:---:|:----:|:----:|:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| wrynose    |  x  |  x   |      |      |  x  |     |     |     |     |     |     |
-| whinlatter |  x  |  x   |  x   |  c   |  x  |     |     |     |     |     |     |
-| walnascar  |  x  |  x   |  x   |  c   |  x  |     |     |     |     |     |     |
-| styhead    |  c  |  c   |  c   |  c   |  c  |  c  |     |     |     |     |     |
-| scarthgap  |  x  |  x   |  x   |  c   |  x  |  c  |  c  |  x  |     |     |     |
-| nanbield   |     |      |  c   |  c   |  c  |  c  |  c  |  c  |     |     |     |
-| mickledore |     |      |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
-| langdale   |     |      |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
-| kirkstone  |     |      |  x   |  c   |  x  |  c  |  c  |  x  |  c  |  c  |  c  |
-| honister   |     |      |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
-| hardknott  |     |      |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
-| gatesgarth |     |      |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
-| dunfell    |     |      |      |      |     |     |  c  |  x  |  c  |  c  |  c  |
-|            |     |      |      |      |     |     |     |     |     |     |     |
-|            | dev |stable|stable|closed| LTS | EOL | EOL | LTS | EOL | EOL | EOL |
+| Yocto \ Qt | dev | 6.8  | 6.7  | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:---:|:----:|:----:|:---:|:---:|:---:|:---:|:---:|
+| walnascar  |  x  |  x   |      |     |     |     |     |     |
+| styhead    |  x  |  x   |  x   |     |     |     |     |     |
+| scarthgap  |  x  |  x   |  x   |  c  |  x  |     |     |     |
+| nanbield   |  c  |  c   |  x   |  c  |  c  |     |     |     |
+| mickledore |  c  |  c   |  c   |  c  |  c  |  c  |     |     |
+| langdale   |  c  |  c   |  c   |  c  |  c  |  c  |     |     |
+| kirkstone  |  x  |  x   |  x   |  c  |  x  |  c  |  c  |  c  |
+| honister   |     |      |      |  c  |  c  |  c  |  c  |  c  |
+| hardknott  |     |      |      |  c  |  c  |  c  |  c  |  c  |
+| gatesgarth |     |      |      |  c  |  c  |  c  |  c  |  c  |
+| dunfell    |     |      |      |  c  |  x  |  c  |  c  |  c  |
+|            |     |      |      |     |     |     |     |     |
+|            | dev |stable|stable| EOL | LTS | EOL | EOL | EOL |

 Detailed status of supported Qt versions can be found from
 https://doc.qt.io/qt-6/supported-platforms.html#supported-qt-versions
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,26 +0,0 @@
-Qt Project Security Policy
-==========================
-
-The Qt Project specifies its security policy in [QUIP 15](https://contribute.qt-project.org/quips/15). A summary of the security policy:
-
-* Qt has a Core Security Team that enforces the security policy and addresses issues.
-* Proactive measures to prevent security issues - code reviews, code analysis, fuzz testing, and so on.
-* Reporting Security Issues: the Core Security Team monitors security issues for Qt modules and affected third-party components.
-* Handling Security Issues: the maintainers, Core Security Team, Chief Maintainer, and the Qt Company share and handle security issues.
-* Disclosure of confirmed security issues at Common Vulnerabilities and Exposures database and a public announcement to the Qt announce@qt-project.org mailing list.
-
-Reporting Security Issues
-------------------------
-
-To report security issues in Qt Products, send an email to Security Mail List at security@qt-project.org.
-The Core Security Team monitors and moderates incoming emails on business days (excluding weekends).
-After sending an email to the Security Mail List, there will be an acknowledgment of receipt within
-two business days. If there is no response, then the reporter should contact the Chief Maintainer directly.
-
-What Versions of Qt are Covered by this Policy?
-----------------------------------------------
-
-While we are interested in reports against any Qt version that is still maintained, fixes are only guaranteed to be provided for:
-
-* The latest released version.
-* The preceding minor version.
--- a/classes/populate_sdk_qt6_base.bbclass
+++ b/classes/populate_sdk_qt6_base.bbclass
@ -27,7 +27,7 @@ create_qt6_sdk_files () {
    echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf
    echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf
    echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf
-    echo 'QmlImports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
+    echo 'Qml2Imports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
    echo 'Translations = ${QT6_INSTALL_TRANSLATIONSDIR}' >> $qtconf
    echo 'Documentation = ${QT6_INSTALL_DOCDIR}' >> $qtconf
    echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf
--- a/classes/qt6-cmake.bbclass
+++ b/classes/qt6-cmake.bbclass
@ -9,11 +9,9 @@ EXTRA_OECMAKE += "\
    -DCMAKE_MESSAGE_LOG_LEVEL=${QT_MESSAGE_LOG_LEVEL} \
 "
 QT_FORCE_BUILD_TOOLS ?= "OFF"
-QT_INSTALL_EXAMPLES_SOURCES ?= "OFF"
 EXTRA_OECMAKE:append:class-target = "\
    -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
    -DQT_FORCE_BUILD_TOOLS=${QT_FORCE_BUILD_TOOLS} \
-    -DQT_INSTALL_EXAMPLES_SOURCES=${QT_INSTALL_EXAMPLES_SOURCES} \
    -D__harfbuzz_broken_config_file=TRUE \
 "
 EXTRA_OECMAKE:append:class-nativesdk = "\
--- a/classes/qt6-paths.bbclass
+++ b/classes/qt6-paths.bbclass
@ -27,7 +27,7 @@ QT6_INSTALL_SYSCONFDIR ?= "${sysconfdir}/xdg"
 QT6_INSTALL_EXAMPLESDIR ?= "${datadir}/examples"
 # Tests [PREFIX/tests]
 QT6_INSTALL_TESTSDIR ?= "${prefix}/tests"
-# Module description files directory [ARCHDATADIR/modules]
-QT6_INSTALL_DESCRIPTIONSDIR ?= "${libdir}/modules"
+# Module description files directory [DATADIR/modules]
+QT6_INSTALL_DESCRIPTIONSDIR ?= "${datadir}/modules"
 # Mkspecs files [PREFIX/mkspecs]
 QT6_INSTALL_MKSPECSDIR ?= "${libdir}/mkspecs"
--- a/classes/qt6-qmake.bbclass
+++ b/classes/qt6-qmake.bbclass
@ -12,12 +12,13 @@ OE_QMAKE_PATH_DOCS = "${QT6_INSTALL_DOCDIR}"
 OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
 OE_QMAKE_PATH_EXAMPLES = "${QT6_INSTALL_EXAMPLESDIR}"
 OE_QMAKE_PATH_TESTS = "${QT6_INSTALL_TESTSDIR}"
-
-OE_QMAKE_PATH_HOST_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
-OE_QMAKE_PATH_HOST_BINS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_BINDIR_NATIVE'),os.path.relpath(d.getVar('QT6_INSTALL_BINDIR'),d.getVar('bindir'))))}"
-OE_QMAKE_PATH_HOST_DATA = "${@os.path.normpath(os.path.join(d.getVar('STAGING_LIBDIR'),os.path.relpath(d.getVar('QT6_INSTALL_ARCHDATADIR'),d.getVar('libdir'))))}"
-OE_QMAKE_PATH_HOST_LIBS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_LIBDIR_NATIVE'),os.path.relpath(d.getVar('QT6_INSTALL_LIBDIR'),d.getVar('libdir'))))}"
-OE_QMAKE_PATH_HOST_LIBEXECS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_LIBEXECDIR_NATIVE'),os.path.relpath(d.getVar('QT6_INSTALL_LIBEXECDIR'),d.getVar('libexecdir'))))}"
+OE_QMAKE_PATH_HOST_PREFIX = ""
+OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}"
+OE_QMAKE_PATH_HOST_BINS = "${QT6_INSTALL_BINDIR}"
+OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
+OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"
+OE_QMAKE_PATH_HOST_LIBEXECS = "${QT6_INSTALL_LIBEXECDIR}"
+OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_BINS}"

 # This is useful for target recipes to reference native mkspecs
 QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
@ -62,7 +63,7 @@ EXTRA_OEMAKE = " \
    OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
 "

-OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_HOST_BINS}/qmake"
+OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake"
 export OE_QMAKE_CC = "${CC}"
 export OE_QMAKE_CFLAGS = "${CFLAGS}"
 export OE_QMAKE_CXX = "${CXX}"
@ -79,7 +80,40 @@ export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf"

 inherit qt6-paths remove-libtool

+generate_target_qt_config_file() {
+    qtconf="$1"
+    cat > "$qtconf" <<EOF
+[Paths]
+Prefix = ${OE_QMAKE_PATH_PREFIX}
+Headers = ${OE_QMAKE_PATH_HEADERS}
+Libraries = ${OE_QMAKE_PATH_LIBS}
+ArchData = ${OE_QMAKE_PATH_ARCHDATA}
+Data = ${OE_QMAKE_PATH_DATA}
+Binaries = ${OE_QMAKE_PATH_BINS}
+LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
+Plugins = ${OE_QMAKE_PATH_PLUGINS}
+Qml2Imports = ${OE_QMAKE_PATH_QML}
+Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
+Documentation = ${OE_QMAKE_PATH_DOCS}
+Settings = ${OE_QMAKE_PATH_SETTINGS}
+Examples = ${OE_QMAKE_PATH_EXAMPLES}
+Tests = ${OE_QMAKE_PATH_TESTS}
+HostBinaries = ${OE_QMAKE_PATH_BINS}
+HostData = ${OE_QMAKE_PATH_ARCHDATA}
+HostLibraries = ${OE_QMAKE_PATH_LIBS}
+HostSpec = ${OE_QMAKE_PLATFORM}
+TargetSpec = ${OE_QMAKE_PLATFORM}
+ExternalHostBinaries = ${OE_QMAKE_PATH_BINS}
+Sysroot =
+EOF
+}
+
 do_generate_qt_config_file() {
+    generate_qt_config_file_paths
+    generate_qt_config_file_effective_paths
+}
+
+generate_qt_config_file_paths() {
    cat > ${OE_QMAKE_QTCONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
@ -90,24 +124,34 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-QmlImports = ${OE_QMAKE_PATH_QML}
+Qml2Imports = ${OE_QMAKE_PATH_QML}
 Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
 Documentation = ${OE_QMAKE_PATH_DOCS}
 Settings = ${OE_QMAKE_PATH_SETTINGS}
 Examples = ${OE_QMAKE_PATH_EXAMPLES}
 Tests = ${OE_QMAKE_PATH_TESTS}
-HostPrefix = ${OE_QMAKE_PATH_HOST_PREFIX}
 HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
 HostData = ${OE_QMAKE_PATH_HOST_DATA}
 HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
 HostLibraryExecutables = ${OE_QMAKE_PATH_HOST_LIBEXECS}
 HostSpec = ${OE_QMAKE_PLATFORM_NATIVE}
 TargetSpec = ${OE_QMAKE_PLATFORM}
+ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
 Sysroot = ${STAGING_DIR_TARGET}
 SysrootifyPrefix=true
 EOF
 }

+generate_qt_config_file_effective_paths() {
+    cat >> ${OE_QMAKE_QTCONF_PATH} <<EOF
+[EffectivePaths]
+HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
+HostLibraries = ${STAGING_LIBDIR_NATIVE}
+HostData = ${OE_QMAKE_PATH_HOST_DATA}
+HostPrefix = ${STAGING_DIR_NATIVE}
+HostLibraryExecutables = ${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_LIBEXECS}
+EOF
+}
 #
 # Allows to override following values (as in version 5.0.1)
 # Prefix The default prefix for all paths.
@ -118,7 +162,7 @@ EOF
 # Binaries The location of installed Qt binaries (tools and applications).
 # Plugins The location of installed Qt plugins.
 # Imports The location of installed QML extensions to import (QML 1.x).
-# QmlImports The location of installed QML extensions to import (QML 2.x).
+# Qml2Imports The location of installed QML extensions to import (QML 2.x).
 # ArchData The location of general architecture-dependent Qt data.
 # Data The location of general architecture-independent Qt data.
 # Translations The location of translation information for Qt strings.
@ -131,6 +175,7 @@ EOF
 # HostPrefix The prefix for host tools when cross compiling (building tools for both systems)
 # HostBinaries The location where to install host tools
 # HostData The location where to install host data
+# ExternalHostBinaries The location where we already have host tools (when cross compiling, but reusing existing tools)
 # TargetSpec The location where to install target mkspec
 # HostSpec The location where to install host mkspec

--- a/classes/srcrev-update.bbclass
+++ b/classes/srcrev-update.bbclass
@ -20,21 +20,18 @@ python do_srcrev_update() {
    d.setVar("__BBSRCREV_SEEN", "1")
    for scm in scms:
        ud = urldata[scm]
-        if hasattr(ud, 'names'):
-            name = ud.names[0]
-        else:
-            name = ud.name
-        rev = ud.method.latest_revision(ud, d, name)
-        srcrev = d.getVar("SRCREV_%s" % name)
-        if srcrev is None: srcrev = d.getVar("SRCREV")
+        for name in ud.names:
+            rev = ud.method.latest_revision(ud, d, name)
+            srcrev = d.getVar("SRCREV_%s" % name)
+            if srcrev is None: srcrev = d.getVar("SRCREV")

-        if srcrev == rev:
-            bb.plain("%s: %s is already latest" % (name, srcrev))
-            continue
+            if srcrev == rev:
+                bb.plain("%s: %s is already latest" % (name, srcrev))
+                continue

-        bb.plain("%s: %s -> %s" % (name, srcrev, rev))
-        cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" %  (recipe, srcrev_file, name, srcrev, rev)
-        bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
+            bb.plain("%s: %s -> %s" % (name, srcrev, rev))
+            cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" %  (recipe, srcrev_file, name, srcrev, rev)
+            bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
 }
 do_srcrev_update[nostamp] = "1"
 addtask srcrev_update after do_fetch
--- a/classes/verify-qt-version.bbclass
+++ b/classes/verify-qt-version.bbclass
@ -1,22 +0,0 @@
-python do_verify_qt_version() {
-    import os, re
-
-    qt_version = d.getVar('QT_VERSION')
-
-    cmake_conf = os.path.join(d.getVar('S'), '.cmake.conf')
-    with open(cmake_conf, 'r', encoding='utf-8') as f:
-        data = f.read()
-
-    m = re.search(r'set\(QT_REPO_MODULE_VERSION "([0-9.]+)"\)', data)
-    if not m:
-        bb.fatal("Could not parse QT_REPO_MODULE_VERSION from %s" % cmake_conf)
-
-    repo_version = m.group(1)
-
-    if qt_version != repo_version:
-        bb.fatal("Qt version mismatch: QT_VERSION (%s) does not match the sources (%s)" \
-            % (qt_version, repo_version))
-}
-
-addtask verify_qt_version after do_patch before do_configure
-
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@ -7,7 +7,7 @@ accept_configuration:
      equals_value: Yocto
    - condition: property
      property: target.arch
-      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5, TARGET6, TARGET7]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5]

 machine_type:
  Build:
@ -15,15 +15,13 @@ machine_type:

 # Target build matrix:
 #
-#             [target1] [target2]  [target3] [target4]  [target5] [target6] [target7]
-# [machine]   qemuarm64 qemux86-64 qemuarm   qemux86    qemuarm64 qemuarm64 qemuarm64
-# [yocto]     master    walnascar  scarthgap whinlatter scarthgap master    master
-# [wayland]   yes       no         yes       yes        yes       no        yes
-# [x11]       no        yes        yes       no         no        yes       yes
-# [opengl]    yes       yes        yes       yes        yes       no        yes
-# [mingw]     no        no         yes       no         no        no        no
-# [static]    no        no         no        no         yes       no        no
-# [toolchain] gcc       gcc        gcc       gcc        gcc       gcc       clang
+#           [target1]       [target2]   [target3]       [target4]       [target5]
+# [machine] qemuarm64       qemux86-64  qemuarm         qemux86         qemuarm64
+# [yocto]   master          master      scarthgap       styhead         kirkstone
+# [wayland] yes             no          no              yes             yes
+# [mingw]   no              no          yes             no              no
+# [static]  no              no          no              no              yes
+#

 target1: &target1
  type: Group
@ -36,10 +34,7 @@ target1: &target1
      variableValue: master.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl
-    - type: EnvironmentVariable
-      variableName: CHECK_COMPATIBILITY
-      variableValue: 1
+      variableValue: ci configs wayland python
  enable_if:
      condition: property
      property: target.arch
@ -52,10 +47,10 @@ target2: &target2
      variableValue: qemux86-64
    - type: EnvironmentVariable
      variableName: MANIFEST
-      variableValue: walnascar.xml
+      variableValue: master.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs x11 opengl
+      variableValue: ci configs python
  enable_if:
      condition: property
      property: target.arch
@ -71,7 +66,7 @@ target3: &target3
      variableValue: scarthgap.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs mingw wayland x11 opengl
+      variableValue: ci configs mingw python
  enable_if:
      condition: property
      property: target.arch
@ -84,10 +79,10 @@ target4: &target4
      variableValue: qemux86
    - type: EnvironmentVariable
      variableName: MANIFEST
-      variableValue: whinlatter.xml
+      variableValue: styhead.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl
+      variableValue: ci configs wayland no-webengine python
  enable_if:
      condition: property
      property: target.arch
@ -100,46 +95,14 @@ target5: &target5
      variableValue: qemuarm64
    - type: EnvironmentVariable
      variableName: MANIFEST
-      variableValue: scarthgap.xml
+      variableValue: kirkstone.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl static
+      variableValue: ci configs wayland static no-webengine python
  enable_if:
      condition: property
      property: target.arch
      equals_value: TARGET5
-target6: &target6
-  type: Group
-  instructions:
-    - type: EnvironmentVariable
-      variableName: MACHINE
-      variableValue: qemuarm64
-    - type: EnvironmentVariable
-      variableName: MANIFEST
-      variableValue: master.xml
-    - type: EnvironmentVariable
-      variableName: TEST_CONFIGS
-      variableValue: ci configs x11
-  enable_if:
-      condition: property
-      property: target.arch
-      equals_value: TARGET6
-target7: &target7
-  type: Group
-  instructions:
-    - type: EnvironmentVariable
-      variableName: MACHINE
-      variableValue: qemuarm64
-    - type: EnvironmentVariable
-      variableName: MANIFEST
-      variableValue: master.xml
-    - type: EnvironmentVariable
-      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland x11 opengl clang
-  enable_if:
-      condition: property
-      property: target.arch
-      equals_value: TARGET7

 instructions:
  Build:
@ -148,8 +111,6 @@ instructions:
  - *target3
  - *target4
  - *target5
-  - *target6
-  - *target7
  - type: EnvironmentVariable
    variableName: DL_DIR
    variableValue: "/mnt/yocto-cache/downloads"
@ -176,31 +137,19 @@ instructions:
      chmod +x repo

      ./repo init \
-          --repo-url git@git.qt.io:boot2qt/git-repo.git \
+          --repo-url https://github.com/theqtcompany/git-repo \
          -u git://code.qt.io/yocto/boot2qt-manifest \
          -b ci \
          -m ${MANIFEST} \
          --reference /mnt/yocto-cache/mirror
      ./repo sync

-      source ./openembedded-core/oe-init-build-env
-
-      # check compatibility agaist current Yocto master
-      if [ -n "${CHECK_COMPATIBILITY}" ]; then
-        yocto-check-layer ${SOURCE_DIR} \
-          --dependency \
-            ../meta-openembedded/meta-oe \
-            ../meta-openembedded/meta-python \
-          --additional-layer \
-            ../meta-mingw \
-          --no-auto-dependency
-      fi
-
-      bitbake-layers add-layer ../meta-yocto/meta-poky
+      source ./poky/oe-init-build-env
      bitbake-layers add-layer ../meta-openembedded/meta-oe
      bitbake-layers add-layer ../meta-openembedded/meta-python
      bitbake-layers add-layer ../meta-openembedded/meta-multimedia
      bitbake-layers add-layer ../meta-mingw
+      bitbake-layers add-layer ../meta-clang
      bitbake-layers add-layer ${SOURCE_DIR}

      for conf in ${TEST_CONFIGS}; do
@ -208,10 +157,7 @@ instructions:
      done

      # build toolchain which should include all supported recipes
-      bitbake meta-toolchain-qt6 \
-          nativesdk-packagegroup-qt6-toolchain-host \
-          packagegroup-qt6-modules \
-          packagegroup-qt6-examples
+      bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules
    filename: "{{.BuildDir}}/start-build"
    fileMode: 420
  - type: ExecuteCommand
--- a/coin/test-clang.inc
+++ b/coin/test-clang.inc
@ -1,4 +0,0 @@
-PREFERRED_TOOLCHAIN_TARGET = "clang"
-DISTRO_FEATURES:append = " ld-is-lld"
-
-INSANE_SKIP:grpc-dbg = "buildpaths"
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@ -1,4 +1,3 @@
-DISTRO = "poky"
 # use systemd
 INIT_MANAGER:forcevariable = "systemd"

@ -41,16 +40,64 @@ PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

 # enable webengine with commercial/proprietary features
+DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"

 PACKAGECONFIG:append:pn-qtbase = "\
-    tslib libproxy gssapi mtdev cups ctf \
+    tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
    sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
+    use-gold-linker \
 "

-RDEPENDS:${PN}:append:pn-packagegroup-qt6-modules = " packagegroup-qt6-examples"
+# imageformats mng FIXME
+PACKAGECONFIG:append:pn-qtimageformats = " jasper"

-# remove all main features, added back in different builds
-POKY_DEFAULT_DISTRO_FEATURES:remove = "opengl wayland vulkan"
-DISTRO_FEATURES_DEFAULT:remove = "x11"
+# 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"
--- a/coin/test-no-webengine.inc
+++ b/coin/test-no-webengine.inc
@ -0,0 +1 @@
+DISTRO_FEATURES:remove = "webengine"
--- a/coin/test-opengl.inc
+++ b/coin/test-opengl.inc
@ -1,2 +0,0 @@
-DISTRO_FEATURES:append = " opengl vulkan"
-DISTRO_FEATURES:append = " webengine"
--- a/coin/test-python.inc
+++ b/coin/test-python.inc
@ -0,0 +1,2 @@
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"
+
--- a/coin/test-static.inc
+++ b/coin/test-static.inc
@ -1,5 +1,3 @@
 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"
-DISTRO_FEATURES:remove = "webengine"
+PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process"
--- a/coin/test-wayland.inc
+++ b/coin/test-wayland.inc
@ -1 +1,2 @@
+DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES:append = " wayland"
--- a/coin/test-x11.inc
+++ b/coin/test-x11.inc
@ -1 +0,0 @@
-DISTRO_FEATURES:append = " x11"
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -35,10 +35,12 @@ LAYERVERSION_qt6-layer = "1"

 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"

-LAYERSERIES_COMPAT_qt6-layer = "scarthgap styhead walnascar whinlatter"
+LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield scarthgap styhead walnascar"

 LICENSE_PATH += "${LAYERDIR}/licenses"

+IMAGE_FEATURES[validitems] += "qtcreator-debug"
+
 # Set a variable to get to the top of the metadata location
 QT6BASE := "${LAYERDIR}"

@ -46,9 +48,12 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.11.0"
+QT_VERSION = "6.8.1"

 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"

 QT_COMMERCIAL_MODULES ?= "0"
+
+# License mapping back to old license files
+SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"
--- a/recipes-core/minizip/minizip_1.2.11.bb
+++ b/recipes-core/minizip/minizip_1.2.11.bb
@ -6,10 +6,10 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"

-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz;subdir=${BP};striplevel=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz"
 UPSTREAM_CHECK_URI = "http://zlib.net/"

-S .= "/contrib/minizip"
+S = "${WORKDIR}/zlib-${PV}/contrib/minizip"

 SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
 SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
--- a/recipes-devtools/python/python3-appdirs_1.4.4.bbappend
+++ b/recipes-devtools/python/python3-appdirs_1.4.4.bbappend
@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-devtools/python/python3-qface_2.0.11.bb
+++ b/recipes-devtools/python/python3-qface_2.0.11.bb
@ -6,20 +6,17 @@ SRC_URI[sha256sum] = "b55c239f3ae7e23c5c8434f38901c5bcacb6afd17e88e37934b46e4455

 inherit pypi setuptools3

-# Colorama is optional dependency from coloredlogs, but
-# it seems to be required in general, at least on windows
 DEPS = "\
-    python3-antlr4-runtime \
-    python3-argh \
-    python3-click \
-    python3-coloredlogs \
    python3-jinja2 \
-    python3-markupsafe \
+    python3-click \
    python3-pyyaml \
-    python3-six \
-    python3-watchdog \
    python3-pytest \
-    python3-colorama \
+    python3-six \
+    python3-path \
+    python3-antlr4-runtime \
+    python3-watchdog \
+    python3-markupsafe \
+    python3-setuptools \
 "
 DEPENDS += "${DEPS}"
 RDEPENDS:${PN} += "${DEPS}"
--- a/recipes-multimedia/webp/libwebp_%.bbappend
+++ b/recipes-multimedia/webp/libwebp_%.bbappend
@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-python/pyside6/python3-pyside6.inc
+++ b/recipes-python/pyside6/python3-pyside6.inc
@ -0,0 +1,33 @@
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (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/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    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 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+"
+
+python() {
+    if 'clang-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
+        raise bb.parse.SkipRecipe('Requires meta-clang to be present.')
+}
+
+inherit setuptools3
+inherit qt6-cmake
+
+require recipes-qt/qt6/qt6-git.inc
+
+QT_GIT_PROJECT = "pyside"
+QT_MODULE = "pyside-setup"
+QT_MODULE_BRANCH = "dev"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DBUILD_TESTS=FALSE"
+EXTRA_OECMAKE:append:class-target = " -DQFP_SHIBOKEN_HOST_PATH=${STAGING_EXECPREFIXDIR} -DQFP_PYTHON_HOST_PATH=${PYTHON}"
+
+INSANE_SKIP:${PN} += "already-stripped"
--- a/recipes-python/pyside6/python3-pyside6_git.bb
+++ b/recipes-python/pyside6/python3-pyside6_git.bb
@ -0,0 +1,71 @@
+require python3-pyside6.inc
+
+DEPENDS += "\
+    python3-shiboken6 \
+    python3-shiboken6-native \
+    ${PYSIDE_QT_MODULES} \
+"
+PYSIDE_QT_MODULES ?= "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
+    qtbase \
+    qtcharts \
+    qtconnectivity \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtgraphs \
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'qthttpserver', '', d)} \
+    qtlocation \
+    qtmultimedia \
+    qtnetworkauth \
+    qtpositioning \
+    qtquick3d \
+    qtquick3d-native \
+    qtremoteobjects \
+    qtremoteobjects-native \
+    qtscxml \
+    qtscxml-native \
+    qtsensors \
+    qtserialbus \
+    qtserialport \
+    qtspeech \
+    qtsvg \
+    qttools \
+    qtwebchannel \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \
+    qtwebsockets \
+"
+
+OECMAKE_SOURCEPATH = "${S}/sources/pyside6"
+
+export LLVM_INSTALL_DIR = "${STAGING_DIR_NATIVE}${exec_prefix}"
+
+PYSIDE_COMPILER = "${HOST_SYS}-g++"
+PYSIDE_COMPILER:toolchain-clang = "${HOST_SYS}-clang++"
+# Workaround big.LITTLE architecture args not supported by clang
+PYSIDE_COMPILER_FLAGS = "${@d.getVar('HOST_CC_ARCH') \
+    .replace('cortex-a15.cortex','cortex') \
+    .replace('cortex-a17.cortex','cortex') \
+    .replace('cortex-a57.cortex','cortex') \
+    .replace('cortex-a72.cortex','cortex') \
+    .replace('cortex-a73.cortex','cortex') \
+    .replace('cortex-a75.cortex','cortex') \
+    .replace('cortex-a76.cortex','cortex')} \
+"
+
+EXTRA_OECMAKE += "\
+    -DSTANDALONE=ON \
+    -DPYSIDE_TREAT_QT_INCLUDE_DIRS_AS_NON_SYSTEM=ON \
+    -DSHIBOKEN_GENERATOR_EXTRA_FLAGS='\
+        --clang-options=--sysroot=${STAGING_DIR_TARGET},--target=${HOST_SYS},${@d.getVar('PYSIDE_COMPILER_FLAGS').replace(' ',',')} \
+        --compiler-path=${PYSIDE_COMPILER} \
+    ' \
+"
+
+FILES:${PN} += "\
+    ${QT6_INSTALL_PLUGINSDIR}/designer \
+"
+FILES:${PN}-dev += "\
+    ${datadir}/PySide6 \
+"
--- a/recipes-python/pyside6/python3-shiboken6_git.bb
+++ b/recipes-python/pyside6/python3-shiboken6_git.bb
@ -0,0 +1,16 @@
+require python3-pyside6.inc
+
+DEPENDS += "qtbase clang-native python3-shiboken6-native"
+
+OECMAKE_SOURCEPATH = "${S}/sources/shiboken6"
+
+EXTRA_OECMAKE += "-DSHIBOKEN_BUILD_LIBS=ON"
+
+do_install:append() {
+    # shiboken6.pc in package python3-shiboken6-dev contains reference to TMPDIR [buildpaths]
+    sed -i ${D}${QT6_INSTALL_LIBDIR}/pkgconfig/shiboken6.pc \
+        -e '/^python_/d' \
+        -e 's|${RECIPE_SYSROOT}||'
+}
+
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb
@ -11,22 +11,17 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS:${PN} += " \
    nativesdk-qtapplicationmanager-dev \
    nativesdk-qtapplicationmanager-tools \
-    nativesdk-qtcanvaspainter-dev \
-    nativesdk-qtcanvaspainter-tools \
    nativesdk-qtgrpc-dev \
    nativesdk-qtgrpc-tools \
-    nativesdk-qtlottie-dev \
-    nativesdk-qtlottie-tools \
    nativesdk-qtquick3d-dev \
    nativesdk-qtquick3d-tools \
-    nativesdk-qtopcua-dev \
-    nativesdk-qtopcua-tools \
    nativesdk-qtremoteobjects-dev \
    nativesdk-qtremoteobjects-tools \
    nativesdk-qtscxml-dev \
    nativesdk-qtscxml-tools \
    nativesdk-qtshadertools-dev \
    nativesdk-qtshadertools-tools \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \
    ${FORLINUXHOST} \
 "

--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
@ -9,9 +9,7 @@ inherit packagegroup nativesdk
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

 RDEPENDS:${PN} += " \
-    nativesdk-cmake \
    nativesdk-make \
-    nativesdk-ninja \
    nativesdk-packagegroup-qt6-toolchain-host-essentials \
    nativesdk-packagegroup-qt6-toolchain-host-addons \
    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'nativesdk-packagegroup-qt6-toolchain-host-commercial', '', d)} \
@ -20,6 +18,8 @@ RDEPENDS:${PN} += " \

 FORLINUXHOST:mingw32 = ""
 FORLINUXHOST = " \
+    nativesdk-cmake \
+    nativesdk-ninja \
    nativesdk-perl-modules \
    nativesdk-python3-html5lib \
 "
--- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
@ -11,7 +11,6 @@ RDEPENDS:${PN} += " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
    qt5compat \
    qtapplicationmanager \
-    qtcanvaspainter \
    qtcharts \
    qtcoap \
    qtconnectivity \
@ -42,7 +41,6 @@ RDEPENDS:${PN} += " \
    qtshadertools \
    qtspeech \
    qtsvg \
-    qttasktree \
    qttranslations \
    qtvirtualkeyboard \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
@ -52,27 +50,20 @@ RDEPENDS:${PN} += " \

 RDEPENDS:${PN}:append:aarch64 = "\
    qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
 RDEPENDS:${PN}:append:armv6 = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7a = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7ve = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
 RDEPENDS:${PN}:append:x86-64 = "\
    qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
-
-RDEPENDS:${PN}:remove:libc-musl = "qtpdf qtwebengine qtwebview"
--- a/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
@ -12,7 +12,6 @@ RDEPENDS:${PN} += " \
    qtdeclarative \
    qtdeclarative-tools \
    qttools \
-    qttools-tools \
    qttranslations-qtbase \
    qttranslations-qtdeclarative \
 "
--- a/recipes-qt/packagegroups/packagegroup-qt6-examples.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-examples.bb
@ -1,84 +0,0 @@
-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 \
-    qtcanvaspainter-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 \
-    qttasktree-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)} \
-"
-
-RDEPENDS:${PN}:remove:libc-musl = "qtpdf-examples qtwebengine-examples qtwebview-examples"
-
-COMMERCIAL_EXAMPLES = " \
-    qtinsighttracker-examples \
-    qtvncserver-examples \
-"
-RDEPENDS:${PN} += "\
-    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', '${COMMERCIAL_EXAMPLES}', '', d)} \
-"
-
--- a/recipes-qt/qt6/chromium-gn.inc
+++ b/recipes-qt/qt6/chromium-gn.inc
@ -4,7 +4,6 @@ inherit linuxloader
 inherit qemu

 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:libc-musl = "(-)"
 COMPATIBLE_MACHINE:aarch64 = "(.*)"
 COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"
--- a/recipes-qt/qt6/qt-gn-native_git.bb
+++ b/recipes-qt/qt6/qt-gn-native_git.bb
--- a/recipes-qt/qt6/gn-utils.inc
+++ b/recipes-qt/qt6/gn-utils.inc
@ -50,20 +50,6 @@ def gn_host_pkg_config(d):
    """Return absolute paths to pkg-config-native."""
    return d.getVar("STAGING_BINDIR_NATIVE") + "/" + "pkg-config-native"

-def gn_clang(d):
-    """Return true if using clang compiler else return false"""
-    if "clang++" in d.getVar("CXX"):
-        return "true"
-    else:
-        return "false"
-
-def gn_clang_native(d):
-    """Return true if using native clang compiler else return false"""
-    if "clang++" in d.getVar("BUILD_CXX"):
-        return "true"
-    else:
-        return "false"
-
 def write_toolchain_file(d, file_path):
    """Creates a complete GN toolchain file in |file_path|."""
    import string
@ -86,7 +72,7 @@ def write_toolchain_file(d, file_path):
        '  toolchain_args = {\n'
        '    current_cpu = "${current_cpu}"\n'
        '    current_os = "linux"\n'
-        '    is_clang = ${is_clang}\n'
+        '    is_clang = false\n'
        '    host_pkg_config = "${host_pkg_config}"\n'
        '  }\n'
        '}\n'
@ -94,7 +80,6 @@ def write_toolchain_file(d, file_path):

    native_toolchain = {
        'toolchain_name': 'yocto_native',
-        'is_clang': gn_clang_native(d),
        'current_cpu': gn_host_arch_name(d),
        'host_pkg_config': gn_host_pkg_config(d),
        'cc': d.expand('${BUILD_CC}'),
@ -109,7 +94,6 @@ def write_toolchain_file(d, file_path):
    }
    target_toolchain = {
        'toolchain_name': 'yocto_target',
-        'is_clang': gn_clang(d),
        'current_cpu': gn_target_arch_name(d),
        'host_pkg_config': gn_host_pkg_config(d),
        'cc': d.expand('${CC}'),
--- a/recipes-qt/qt6/qmlcompilerplus_git.bb
+++ b/recipes-qt/qt6/qmlcompilerplus_git.bb
@ -1,8 +1,12 @@
-LICENSE = "The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    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 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake
--- a/recipes-qt/qt6/qt3d-examples_git.bb
+++ b/recipes-qt/qt6/qt3d-examples_git.bb
@ -1,23 +0,0 @@
-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
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-QT_MODULE = "qt3d"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS = "\
-    qt3d \
-    qtdeclarative-native \
-"
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
    file://src/3rdparty/assimp/LICENSE;md5=2119edef0916b0bd511cb3c731076271 \
-    file://src/3rdparty/imgui/LICENSE.imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
-    file://src/3rdparty/imgui/LICENSE.proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
+    file://src/3rdparty/imgui/LICENSE_imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
+    file://src/3rdparty/imgui/LICENSE_proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
    file://src/3rdparty/imgui/LICENSE.txt;md5=875a54e93593c8b244ef6b78cacc336e \
 "

@ -24,7 +24,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"

 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
 "

 # Needed for supporting 64bit off_t
--- a/recipes-qt/qt6/qt5compat-examples_git.bb
+++ b/recipes-qt/qt6/qt5compat-examples_git.bb
@ -1,14 +0,0 @@
-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"
--- a/recipes-qt/qt6/qt5compat_git.bb
+++ b/recipes-qt/qt6/qt5compat_git.bb
@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
-    file://src/core5/codecs/LICENSE.QTSCIICODEC.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
+    file://src/core5/codecs/QTSCIICODEC_LICENSE.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
 "

 inherit qt6-cmake
--- 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_REPO = "tqtc-${QT_MODULE}"
+QT_MODULE = "tqtc-${BPN}"
--- a/recipes-qt/qt6/qt6-examples.inc
+++ b/recipes-qt/qt6/qt6-examples.inc
@ -1,18 +0,0 @@
-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"
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@ -4,72 +4,70 @@ HOMEPAGE ?= "https://www.qt.io"
 inherit srcrev-update

 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.8"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
-QT_MODULE_REPO ?= "${QT_MODULE}"
+QT_MODULE_REPO ?= "${QT_MODULE}.git"

-# for compatibility with Yocto releases before whinlatter
-BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
-
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"

 CVE_PRODUCT ?= "qt:${BPN} qt:qt"

+S = "${WORKDIR}/git"
+
 PV = "${QT_VERSION}"

-SRCREV = "${SRCREV_${QT_MODULE_REPO}}"
+SRCREV = "${SRCREV_${QT_MODULE}}"

-SRCREV_tqtc-qmlcompilerplus = "2f2395a50b0ddb1af6b699a90cfbe2164f67b6e7"
-SRCREV_tqtc-qtinsighttracker = "ac8972a670cf492ce2d2cf4ab757c43c5291804f"
-SRCREV_tqtc-qtvncserver = "8bfcb2ede4e5021a637933ec927ce2678fdc7f0c"
-SRCREV_qt3d = "1cac4a649679618f1301aba0074dae063eac6b98"
-SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
-SRCREV_qt5compat = "287be0a7793621dd4e6e780595bf20aa3ae2b2c4"
-SRCREV_qtbase = "bd04c5d7a4b907b8c4a2d2dda4ba3f24f687fb7f"
-SRCREV_qtapplicationmanager = "4bd1f1fba3f803a7284a5110e117e8d162d54065"
-SRCREV_qtcanvaspainter = "689445d357df249cdf0d5ec0437bd6b8b68368c8"
-SRCREV_qtcharts = "46a2c96f3e376bc2de0e0710ec0e143c1a784081"
-SRCREV_qtcoap = "fbd3db03f13a7d1fd79aaa2392e331a1737f7f68"
-SRCREV_qtconnectivity = "e2bee5bf54cb0ac721fd9da0884a8f5a251e63fa"
-SRCREV_qtdatavis3d = "ca8d79677e63c3111536f9b03c4184f732810498"
-SRCREV_qtdeclarative = "59da4b17158303fc671869547bcb91b675bf4702"
-SRCREV_qtdeviceutilities = "4f86edb2eb255397f849528f43f49a59d4973109"
-SRCREV_qtdoc = "42cd131492d531dc32660f79e81c6f85dbc56a12"
-SRCREV_qtgraphs = "c08c320fc36fa31b264ac3c8f0f62aa94ac41b30"
-SRCREV_qtgrpc = "2bccf14f841bca476a6f90242b30368742de4a66"
-SRCREV_qthttpserver = "648e8b021ee219c7034c357cd9a5424a3040dfad"
-SRCREV_qtimageformats = "cb96a5aa2e37e0a6d31df138d24c207c6951de3a"
-SRCREV_qtinterfaceframework = "1dfaeb1d7c2cb60b56d4c9e1ff6e622e03d86d97"
-SRCREV_qtlanguageserver = "8599dad24858f93876012bd2071d096a31dfda0a"
-SRCREV_qtlocation = "8d13de6bc6a2207eca4eded65741a28d95d433a3"
-SRCREV_qtlottie = "3a5ce6df4ba97e29e7d7dc16c2bb3e849885d8fb"
-SRCREV_qtmqtt = "4f6e8dd0f1c78926394335686cfa8537303b1a07"
-SRCREV_qtmultimedia = "074d188889891972cb456817510f62b158e9ca67"
-SRCREV_qtnetworkauth = "0b8d323ae151f3826d7b5a223d80e5293cd1ed06"
-SRCREV_qtopcua = "f4dd8c4011d4ba3d11fbaaede379de247fe09690"
-SRCREV_qtpositioning = "56ede83df68dcb1048564aa463f8b48985f5f99e"
-SRCREV_qtquick3d = "3468786a6e3320eca9d4cc6d5444636ba5d88c73"
-SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
-SRCREV_qtquick3dphysics = "9c860d931ef38751a1bc03ef813610dbd7793469"
-SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
-SRCREV_qtquicktimeline = "831a9978aee0e963b88f5cb122228ecb7b99b13d"
-SRCREV_qtremoteobjects = "6c1fe0e164815b540b996d3246634b5e43d3ccb9"
-SRCREV_qtscxml = "604aa8558028411a9b9ac3c4bd813231db2264d0"
-SRCREV_qtsensors = "8d6d925ae615a23c8b84b51ad3701dce78afc53c"
-SRCREV_qtserialbus = "c5d1600f1270a8e4953d1c074b9faed7d99fdd2d"
-SRCREV_qtserialport = "cc95fa549119370ef78587af749e8f17544c95cc"
-SRCREV_qtshadertools = "45ef193c92f93c7a0bf8de53163a9ca8886f8267"
-SRCREV_qtspeech = "63e490d12db7790b29fa61f0c6e0677cef7074e9"
-SRCREV_qtsvg = "7c65619dc929ebf52b63251e8601b47f2f2ee207"
-SRCREV_qttasktree = "93e1d91ac78e232c3ca6b1db0031a30d08b334dd"
-SRCREV_qttools = "369f8a1fa6ac7527227df7a99399b0428a16ba97"
-SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
+SRCREV_tqtc-qmlcompilerplus = "5f652f55a55db907d4b9aae0cdaaba6c4819debe"
+SRCREV_tqtc-qtinsighttracker = "5cf178f57b368f9c5d83c1a6804f97b28b50fa93"
+SRCREV_tqtc-qtvncserver = "11a109bb582a7a25f7ec1df4143b3c101b7aeb07"
+SRCREV_pyside-setup = "22c76b24f4c081156a6bf973d45982e9b62fef64"
+SRCREV_qt3d = "5de915bb4a0fa3a66655cba9d3ec51c05a13090b"
+SRCREV_qt3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
+SRCREV_qt5compat = "abd8782455a0d09c807a4a3d9ee02c1d4e253846"
+SRCREV_qtbase = "0db4321f2f13c6870283f3fcc0f1a462fd7cf663"
+SRCREV_qtapplicationmanager = "4173267f5735fa7d8ec211e4b54983fec465886a"
+SRCREV_qtcharts = "d52e0f499f590bfb7a363f39cec520377a6c3736"
+SRCREV_qtcoap = "469fc807cb23469936a6aecd8ccacc2d19b38e48"
+SRCREV_qtconnectivity = "c98e9bfee39f85914b7e7fb0ee991a2ac681f365"
+SRCREV_qtdatavis3d = "b83af9a7357b6441948c731017c2fd70cf95caf8"
+SRCREV_qtdeclarative = "b34fca34941ecdbf99819bbf58b45332ac9e6fa7"
+SRCREV_qtdeviceutilities = "bdf4c32a9b67f9cd679662068fa1b10ba8db850b"
+SRCREV_qtdoc = "4a1f0e06ee1dd61f30000a2b9ff011f347b3e0d6"
+SRCREV_qtgraphs = "bc6e150dbd5805526195a18d11aca8c590466755"
+SRCREV_qtgrpc = "48fa0dfe2a14a38906d67a4c8bd3347dd80f932d"
+SRCREV_qthttpserver = "5aaeb8606959bad655a07ce80c9cec824c0678b8"
+SRCREV_qtimageformats = "0d0f0a08bc3ae8caa670499c266c35f2e9c41894"
+SRCREV_qtinterfaceframework = "8b786ccbf3d3f9e21c2d00cbcaa44acac22fa44d"
+SRCREV_qtlanguageserver = "94f2eea60bcea5221e9a31211fbe4e99009d2558"
+SRCREV_qtlocation = "6883067b142b243184f27c161a499a6d39c2b328"
+SRCREV_qtlottie = "5b27990e3fd9921df68ce766e2b42adc386a8cac"
+SRCREV_qtmqtt = "cee3efbd5ffed22b6ff95f6373cd988c0690ba32"
+SRCREV_qtmultimedia = "66812f93da86ed395bda30101ac15fda4fa501dd"
+SRCREV_qtnetworkauth = "080372b087fe6c69d0be2fdb5f95600984f6aef6"
+SRCREV_qtopcua = "3a5490f43814c519edc35f8309e1be4968bd8d4e"
+SRCREV_qtpositioning = "9a8565dc6c94e7d7a977c0c2e8d3efd49879eca0"
+SRCREV_qtquick3d = "a2783e069e137aad2eb233757652388fc4e37757"
+SRCREV_qtquick3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
+SRCREV_qtquick3dphysics = "1f9bdff33896baf76cb5e3c007b96684ec86dd30"
+SRCREV_qtquickdesigner-components = "ccc06fbdfbc9938385a52d9b1571f4fe19beb8a2"
+SRCREV_qtquicktimeline = "2dbdc4d3bc3a012328b9a8c0fedab93c25aed745"
+SRCREV_qtremoteobjects = "30415838a514f53c29375500380f288e164a5fe0"
+SRCREV_qtscxml = "243adedab23bc37a3b156a10133878bf5a977a03"
+SRCREV_qtsensors = "6f4415ebe39c4311cbb567703055fcd595be1242"
+SRCREV_qtserialbus = "ce961f7bad9ea1bcc6dde6c88f9476ee4f0cdf50"
+SRCREV_qtserialport = "88467a588d7c312d0c24adc6edd2a96e199cf760"
+SRCREV_qtshadertools = "3057f2b17724e68afbda2f84441b1e63672c5595"
+SRCREV_qtspeech = "50b5a02d506bf700c2e8635a4a125cfa4c33ebee"
+SRCREV_qtsvg = "ab734c4e83b04acd62d7ba7d7db4d5d83ca58fa9"
+SRCREV_qttools = "b0d66c51cbda17b213bed73d379f0900c77f457c"
+SRCREV_qttools-qlitehtml = "4f737256c0a698ff3ba380cbaef1ba80a16fc3a8"
 SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
-SRCREV_qttranslations = "0a794041faf3e647ff9623d99754a8cfdaa68a47"
-SRCREV_qtvirtualkeyboard = "e9d1ea1624cf2c961ba4aa077090367d108b130a"
-SRCREV_qtwayland = "586e489ce426e833729c333499cb98a06fbae1b0"
-SRCREV_qtwebchannel = "227750ae26054f88c202c370930c1dccf529b7fc"
-SRCREV_qtwebengine = "152b67fa5b7862d2a63fd0574ebeb4759335b935"
-SRCREV_qtwebengine-chromium = "031a10673ee369c84b2db2669fc147adf175a3be"
-SRCREV_qtwebsockets = "f269b863b994977ae8f937620c99c60e811fcbf9"
-SRCREV_qtwebview = "374f9d6ebc7226b68b4e336a136e99e73fd42b44"
+SRCREV_qttranslations = "50f37ffa46535e330e2d223b5d41ea0ca7d86b48"
+SRCREV_qtvirtualkeyboard = "25654220ef909b1319ad50e1eec08e59d88808e7"
+SRCREV_qtwayland = "fb472225982100a8da56aeb5f8500e61012a1508"
+SRCREV_qtwebchannel = "211a053cc3f8776baad9e61b36778a76441a55ff"
+SRCREV_qtwebengine = "d2bc1e02bc4c9eeb58cecfdc64bc29f449733012"
+SRCREV_qtwebengine-chromium = "a7fd4fa29e0bd7cc44aa1c9dd3cf63b1144d1c74"
+SRCREV_qtwebsockets = "0ec0f302905b2154f8ccec4a761fdccf07692c66"
+SRCREV_qtwebview = "a8af1ebcb97acf6970dabb32fd95a0f5f00cc6d1"
--- a/recipes-qt/qt6/qt6-ptest.inc
+++ b/recipes-qt/qt6/qt6-ptest.inc
@ -29,11 +29,10 @@ EOF
        ${EXTRA_OECMAKE} \
        -DQT_BUILD_STANDALONE_TESTS=ON \
        -DQT_BUILD_EXAMPLES=OFF \
-        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${prefix} \
+        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${QT6_INSTALL_LIBDIR}/cmake \
        -DCMAKE_STAGING_PREFIX=${D}${prefix} \
        -DCMAKE_SKIP_RPATH=ON \
        -DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \
-        -DQT_FORCE_BUILTIN_TESTDATA=ON \
        ${S} \
        -Wno-dev
    ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
@ -49,16 +48,11 @@ EOF
                \) -exec sh -c '\
                    install -D "$1" "${D}${PTEST_PATH}${1#${B_PTEST}}" \
                ' _ {} \;
+
+            # tests may depend on files from sources
+            cp -r ${S}/tests/$tests ${D}${PTEST_PATH}/tests
        fi
    done
-
-    if [ -e "${B_PTEST}/${baselib}" ]; then
-        find ${B_PTEST}/${baselib} \
-            ! -type d -a \( -executable -o -name qmldir \) \
-            -exec sh -c '\
-                install -D "$1" "${D}${PTEST_PATH}${1#${B_PTEST}/${baselib}}" \
-            ' _ {} \;
-    fi
 }

 fakeroot python do_create_ptest_list() {
@ -99,7 +93,7 @@ INSANE_SKIP:${PN}-ptest += "file-rdeps"

 PACKAGESPLITFUNCS =+ "remove_ptest_debug"
 remove_ptest_debug() {
-    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest ]; then
-        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest -depth -type d -name .debug -exec rm -rf '{}' \;
+    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests ]; then
+        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests -depth -type d -name .debug -exec rm -rf '{}' \;
    fi
 }
--- a/recipes-qt/qt6/qt6.inc
+++ b/recipes-qt/qt6/qt6.inc
@ -1,5 +1,12 @@
 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,
 # because the (initial) qtbase configuration becomes part of Qt5/qmake
 python __anonymous() {
@ -23,9 +30,14 @@ 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"
+PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"

 ALLOW_EMPTY:${PN} = "1"
 ALLOW_EMPTY:${PN}-plugins = "1"
@ -73,9 +85,9 @@ FILES:${PN}-dev += " \
    ${QT6_INSTALL_LIBDIR}/*.prl \
    ${QT6_INSTALL_LIBDIR}/*.la \
    ${QT6_INSTALL_LIBDIR}/cmake \
-    ${QT6_INSTALL_ARCHDATADIR}/metatypes \
+    ${QT6_INSTALL_LIBDIR}/metatypes \
    ${QT6_INSTALL_LIBDIR}/pkgconfig \
-    ${QT6_INSTALL_ARCHDATADIR}/sbom \
+    ${QT6_INSTALL_LIBDIR}/sbom \
    ${QT6_INSTALL_MKSPECSDIR} \
    ${QT6_INSTALL_QMLDIR}/*.qmltypes \
    ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \
@ -108,3 +120,10 @@ FILES:${PN}-staticdev += " \
    ${QT6_INSTALL_QMLDIR}/*/*/*/objects*/ \
    ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \
 "
+
+# Note: INSTALL_EXAMPLESDIR is not used
+FILES:${PN}-examples = " \
+    ${QT6_INSTALL_EXAMPLESDIR} \
+    ${prefix}/examples \
+"
+RDEPENDS:${PN}-examples = "${PN}"
--- a/recipes-qt/qt6/qtapplicationmanager-examples_git.bb
+++ b/recipes-qt/qt6/qtapplicationmanager-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtapplicationmanager_git.bb
+++ b/recipes-qt/qt6/qtapplicationmanager_git.bb
@ -19,18 +19,17 @@ RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"

 EXTRA_OECMAKE += "-DQT_APPMAN_SKIP_EXCLUDE_TOOLS_FROM_DEFAULT_TARGET=ON"

-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process bubblewrap', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process', '', d)}"

 PACKAGECONFIG[tools-only] = "-DFEATURE_am_tools_only=ON, -DFEATURE_am_tools_only=OFF"
-PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON,-DFEATURE_am_multi_process=OFF,qtwayland"
-PACKAGECONFIG[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"
+PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON, -DFEATURE_am_multi_process=OFF, qtwayland qtwayland-native"

 PACKAGECONFIG:class-native ??= "tools-only"
 PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"

 FILES:${PN}-tools = "\
-    ${QT6_INSTALL_BINDIR}/appman-package-server* \
    ${QT6_INSTALL_BINDIR}/appman-packager* \
+    ${QT6_INSTALL_BINDIR}/appman-dumpqmltypes* \
    ${QT6_INSTALL_BINDIR}/appman-qmltestrunner* \
 "

--- a/recipes-qt/qt6/qtbase-examples_git.bb
+++ b/recipes-qt/qt6/qtbase-examples_git.bb
@ -1,14 +0,0 @@
-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"
--- a/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@ -1,4 +1,4 @@
-From 27896986b3c2930ccbbe062d3e7a0b7bcc08caf1 Mon Sep 17 00:00:00 2001
+From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@ -20,20 +20,20 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 4b116c54b2e..bfa21c997b4 100644
+index 92729b06f1..dac7857600 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -103,7 +103,12 @@ static std::unique_ptr<QSettings> findConfiguration()
+@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
     if (qtconfManualPath)
-         return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
+         return new QSettings(*qtconfManualPath, QSettings::IniFormat);
 
 -    QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
 +    QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
 +    QString qtconfig = QFile::decodeName(config);
 +    if (QFile::exists(qtconfig))
-+        return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
+        return new QSettings(qtconfig, QSettings::IniFormat);
 +
 +    qtconfig = QStringLiteral(":/qt/etc/qt.conf");
-     if (QResource(qtconfig, QLocale::c()).isValid())
-         return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
+     if (QFile::exists(qtconfig))
+         return new QSettings(qtconfig, QSettings::IniFormat);
 #ifdef Q_OS_DARWIN
--- a/recipes-qt/qt6/qtbase/0003-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/recipes-qt/qt6/qtbase/0003-Add-OE-specific-specs-for-clang-compiler.patch
@ -1,67 +0,0 @@
-From 9bf5632187b8f17cc0d626926df2784c38059875 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Sep 2017 09:11:44 -0700
-Subject: [PATCH] Add OE specific specs for clang compiler
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Inappropriate [OE Specific]
---
- mkspecs/linux-oe-clang/qmake.conf      | 40 ++++++++++++++++++++++++++
- mkspecs/linux-oe-clang/qplatformdefs.h |  1 +
- 2 files changed, 41 insertions(+)
- create mode 100644 mkspecs/linux-oe-clang/qmake.conf
- create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h
-
-diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
-new file mode 100644
-index 0000000000..c09b132ac8
--- /dev/null
-+++ b/mkspecs/linux-oe-clang/qmake.conf
-@@ -0,0 +1,40 @@
-+#
-+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
-+#
-+
-+MAKEFILE_GENERATOR = UNIX
-+CONFIG += incremental
-+QMAKE_INCREMENTAL_STYLE = sublib
-+
-+include(../common/linux.conf)
-+
-+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar, objcopy and strip
-+QMAKE_AR              = $$(OE_QMAKE_AR) cqs
-+QMAKE_OBJCOPY         = $$(OE_QMAKE_OBJCOPY)
-+QMAKE_STRIP           = $$(OE_QMAKE_STRIP)
-+
-+include(../common/gcc-base-unix.conf)
-+
-+# *FLAGS from gcc-base.conf
-+QMAKE_CFLAGS                += $$(OE_QMAKE_CFLAGS)
-+QMAKE_CXXFLAGS              += $$(OE_QMAKE_CXXFLAGS)
-+QMAKE_LFLAGS                += $$(OE_QMAKE_LDFLAGS)
-+
-+include(../common/clang.conf)
-+
-+# tc settings from g++-base.conf
-+QMAKE_CC       = $$(OE_QMAKE_CC)
-+QMAKE_CXX      = $$(OE_QMAKE_CXX)
-+
-+QMAKE_LINK         = $$(OE_QMAKE_LINK)
-+QMAKE_LINK_SHLIB   = $$(OE_QMAKE_LINK)
-+QMAKE_LINK_C       = $$(OE_QMAKE_LINK)
-+QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
-+QMAKE_CFLAGS_ISYSTEM =
-+# for the SDK
-+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
-+
-+include(../oe-device-extra.pri)
-+
-+load(device_config)
-+load(qt_config)
-diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
-new file mode 100644
-index 0000000000..880c927b21
--- /dev/null
-+++ b/mkspecs/linux-oe-clang/qplatformdefs.h
-@@ -0,0 +1 @@
-+#include "../linux-clang/qplatformdefs.h"
--- a/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch
+++ b/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch
@ -1,4 +1,4 @@
-From 9a8f4cadd4a90e0e5a347bb38210869a5fd28e0f Mon Sep 17 00:00:00 2001
+From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 22 Aug 2022 15:01:28 +0300
 Subject: [PATCH] testlib: don't track the build or source directories
@ -7,22 +7,23 @@ Build tests without location of the build and sources directories.

 Upstream-Status: Inappropriate [embedded specific]
 Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2
+
 ---
 src/testlib/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
-index 15c040a2e3c..913e233a524 100644
+index 6cdb8f3376..3007585e1c 100644
 --- a/src/testlib/CMakeLists.txt
 +++ b/src/testlib/CMakeLists.txt
-@@ -149,8 +149,8 @@ set(qt_tc_build_dir_def
- 
- string(JOIN "" testcase_dirs_genex
-     "$<$<NOT:$<BOOL:$<TARGET_PROPERTY:QT_SKIP_DEFAULT_TESTCASE_DIRS>>>:"
-        "QT_TESTCASE_BUILDDIR=\"${qt_tc_build_dir_def}\"$<SEMICOLON>"
-        "QT_TESTCASE_SOURCEDIR=\"$<TARGET_PROPERTY:SOURCE_DIR>\""
-+        "QT_TESTCASE_BUILDDIR=\"\"$<SEMICOLON>"
-+        "QT_TESTCASE_SOURCEDIR=\"\""
-     ">"
+@@ -121,8 +121,8 @@ set(qt_tc_build_dir_def
+     "$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>"
 )
 set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS
+-    QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}"
+-    QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>"
+    QT_TESTCASE_BUILDDIR=""
+    QT_TESTCASE_SOURCEDIR=""
+ )
+ 
+ qt_internal_add_docs(Test
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@ -1,5 +1,4 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) \
-    & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & LGPL-2.1-or-later & HPND & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
@ -7,28 +6,23 @@ LIC_FILES_CHKSUM = " \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSES/HPND.txt;md5=72f417bf093b8008321cb594117034ec \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

-inherit qt6-cmake verify-qt-version
+inherit qt6-cmake

 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

 SRC_URI += "\
    file://0001-Add-linux-oe-g-platform.patch \
-    file://0003-Add-OE-specific-specs-for-clang-compiler.patch \
+    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
    file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
    file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
-SRC_URI:append:class-native = "\
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-"

 DEPENDS += "\
    patchelf-native \
@ -43,12 +37,13 @@ RRECOMMENDS:${PN}-ptest:append = " tzdata"

 PACKAGECONFIG:class-native ?= "\
    gui widgets jpeg png dbus no-opengl openssl zlib zstd \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwaylandscanner', '', d)} \
 "
 PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
    ${PACKAGECONFIG_DEFAULT} \
    ${PACKAGECONFIG_GRAPHICS} \
+    ${PACKAGECONFIG_X11} \
+    ${PACKAGECONFIG_KDE} \
    ${PACKAGECONFIG_FONTS} \
    ${PACKAGECONFIG_SYSTEM} \
    ${PACKAGECONFIG_DISTRO} \
@ -58,19 +53,16 @@ PACKAGECONFIG_GRAPHICS ?= "\
    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-        bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms gbm gles2 eglfs', \
-            bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', \
-                'kms gbm gles2 eglfs', d), d), \
-        'no-opengl', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)} \
-    linuxfb \
+        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl linuxfb', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
 "
+PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
+PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm sql-sqlite', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
 PACKAGECONFIG_DEFAULT ?= "\
    accessibility \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'accessibility-atspi-bridge', '', d)} \
    dbus \
    fontconfig \
    glib \
@ -89,7 +81,6 @@ PACKAGECONFIG_DEFAULT ?= "\
    zlib \
    zstd \
    ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwaylandscanner', '', d)} \
 "

 PACKAGECONFIG:remove:mingw32 = "openssl"
@ -100,17 +91,16 @@ BUILD_TYPE ?= "Release"
 OPENSSL_LINKING_MODE ?= "runtime"

 # Default platform plugin
-QT_QPA_DEFAULT_PLATFORM ?= "\
-${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-egl', \
-    bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
-        bb.utils.contains('PACKAGECONFIG', 'eglfs', 'eglfs', \
-         'linuxfb', d), d), d)}\
-"
+QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
+    bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}"
+
+# at-spi bridge requires XCB currently
+ACCESSIBILITY_DEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "at-spi2-core", "", d)}"

 PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
 PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
-PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON -DQT_BUILD_TESTS=OFF -DWARNINGS_ARE_ERRORS=OFF,-DFEATURE_developer_build=OFF"
+PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_developer_build=OFF"
 PACKAGECONFIG[use-gold-linker] = "-DFEATURE_use_gold_linker=ON"
 PACKAGECONFIG[use-bfd-linker] = "-DFEATURE_use_bfd_linker=ON"
 PACKAGECONFIG[use-lld-linker] = "-DFEATURE_use_lld_linker=ON"
@ -130,18 +120,17 @@ PACKAGECONFIG[ctf] = "-DFEATURE_ctf=ON,-DFEATURE_ctf=OFF"

 # gui
 PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF"
-PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF"
-PACKAGECONFIG[accessibility-atspi-bridge] = "-DFEATURE_accessibility_atspi_bridge=ON,-DFEATURE_accessibility_atspi_bridge=OFF,at-spi2-core"
+PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,${ACCESSIBILITY_DEPENDS}"
 PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
 PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
 PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
 PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
 PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
-PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF,virtual/egl"
+PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF"
 PACKAGECONFIG[eglfs-egldevice] = "-DFEATURE_eglfs_egldevice=ON,-DFEATURE_eglfs_egldevice=OFF"
 PACKAGECONFIG[harfbuzz] = "-DFEATURE_harfbuzz=ON,-DFEATURE_harfbuzz=OFF,harfbuzz"
 PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
-PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm"
+PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm virtual/egl"
 PACKAGECONFIG[libinput] = "-DFEATURE_libinput=ON,-DFEATURE_libinput=OFF,libinput"
 PACKAGECONFIG[linuxfb] = "-DFEATURE_linuxfb=ON,-DFEATURE_linuxfb=OFF"
 PACKAGECONFIG[mtdev] = "-DFEATURE_mtdev=ON,-DFEATURE_mtdev=OFF,mtdev"
@ -150,7 +139,6 @@ PACKAGECONFIG[png] = "-DFEATURE_system_png=ON,-DFEATURE_png=OFF,libpng"
 PACKAGECONFIG[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib"
 PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers,vulkan-loader"
 PACKAGECONFIG[wayland] = "-DFEATURE_wayland=ON,-DFEATURE_wayland=OFF,wayland wayland-native"
-PACKAGECONFIG[qtwaylandscanner] = "-DFEATURE_qtwaylandscanner=ON,-DFEATURE_qtwaylandscanner=OFF,wayland wayland-native"
 PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-cursor"
 PACKAGECONFIG[xkbcommon] = "-DFEATURE_xkbcommon=ON,-DFEATURE_xkbcommon=OFF,libxkbcommon,xkeyboard-config"

@ -206,11 +194,6 @@ do_install:append() {
    rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/uikit/device_destinations.sh
    rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/data/mac/objc_namespace.sh

-    if [ -e ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py ]; then
-        sed -i ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py \
-            -e 's|/bin/env|/usr/bin/env|'
-    fi
-
    # remove unneeded files that contains reference to TMPDIR [buildpaths]
    rm -f ${D}${QT6_INSTALL_BINDIR}/host-*
    rm -f ${D}${QT6_INSTALL_BINDIR}/target_qt.conf
@ -224,10 +207,7 @@ EOF

    RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
    sed -i ${D}${QT6_INSTALL_BINDIR}/* \
-        -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
-        -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
-    RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_LIBEXECDIR'))}"
-    sed -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
+        -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
        -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
        -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"

@ -258,11 +238,6 @@ isEmpty(QMAKE_CC): {
 EOF
 }

-FILES:${PN}-dev += "\
-    ${datadir}/qt6/wayland \
-    ${datadir}/qt6/json_schema \
-"
-
 INSANE_SKIP:${PN}-ptest += "arch"
 INHIBIT_PACKAGE_STRIP_FILES = "\
    ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so \
--- a/recipes-qt/qt6/qtcanvaspainter-examples_git.bb
+++ b/recipes-qt/qt6/qtcanvaspainter-examples_git.bb
@ -1,21 +0,0 @@
-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 = "qtcanvaspainter"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS = "\
-    qtcanvaspainter \
-    qtcanvaspainter-native \
-    qtdeclarative \
-    qtdeclarative-native \
-    qtshadertools \
-    qtshadertools-native \
-"
--- a/recipes-qt/qt6/qtcanvaspainter_git.bb
+++ b/recipes-qt/qt6/qtcanvaspainter_git.bb
@ -1,25 +0,0 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Zlib"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
-    file://LICENSES/Zlib.txt;md5=370cf821bfe014e4427629dab445adcf \
-"
-
-inherit qt6-cmake
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
-
-DEPENDS = "\
-    qtbase \
-    qtcanvaspainter-native \
-    qtdeclarative \
-    qtdeclarative-native \
-    qtshadertools \
-    qtshadertools-native \
-"
-
-BBCLASSEXTEND = "native nativesdk"
--- a/recipes-qt/qt6/qtcharts-examples_git.bb
+++ b/recipes-qt/qt6/qtcharts-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtcharts_git.bb
+++ b/recipes-qt/qt6/qtcharts_git.bb
@ -15,3 +15,4 @@ DEPENDS += "qtbase"
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtcoap-examples_git.bb
+++ b/recipes-qt/qt6/qtcoap-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtcoap_git.bb
+++ b/recipes-qt/qt6/qtcoap_git.bb
@ -13,3 +13,6 @@ 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"
+
--- a/recipes-qt/qt6/qtconnectivity-examples_git.bb
+++ b/recipes-qt/qt6/qtconnectivity-examples_git.bb
@ -1,19 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtconnectivity_git.bb
+++ b/recipes-qt/qt6/qtconnectivity_git.bb
@ -14,7 +14,7 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

-DEPENDS += "qtbase"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
--- a/recipes-qt/qt6/qtdatavis3d-examples_git.bb
+++ b/recipes-qt/qt6/qtdatavis3d-examples_git.bb
@ -1,20 +0,0 @@
-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
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-QT_MODULE = "qtdatavis3d"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdatavis3d \
-    qtdeclarative-native \
-"
--- a/recipes-qt/qt6/qtdatavis3d_git.bb
+++ b/recipes-qt/qt6/qtdatavis3d_git.bb
@ -14,3 +14,5 @@ include recipes-qt/qt6/qt6.inc
 REQUIRED_DISTRO_FEATURES = "opengl"

 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtdeclarative-examples_git.bb
+++ b/recipes-qt/qt6/qtdeclarative-examples_git.bb
@ -1,21 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtdeviceutilities-examples_git.bb
+++ b/recipes-qt/qt6/qtdeviceutilities-examples_git.bb
@ -1,18 +0,0 @@
-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"
--- 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"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
 RDEPENDS:${PN} = "connman"

--- a/recipes-qt/qt6/qtdoc-examples_git.bb
+++ b/recipes-qt/qt6/qtdoc-examples_git.bb
@ -1,44 +0,0 @@
-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/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-examples.inc
-
-DEPENDS += "\
-    qtbase \
-    qtcharts \
-    qtdeclarative \
-    qtdeclarative-native \
-    qtdoc \
-    qtgraphs \
-    qtlocation \
-    qtmultimedia \
-    qtpositioning \
-    qtquick3d \
-    qtquick3d-native \
-    qtsensors \
-    qtshadertools-native \
-    qtsvg \
-    qttools \
-    qttools-native \
-    qtwebsockets \
-"
-DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
-DEPENDS:append:arm = " qtquick3dphysics"
-DEPENDS:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
-DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
-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"
-DEPENDS:remove:libc-musl = "qtpdf"
--- a/recipes-qt/qt6/qtdoc_git.bb
+++ b/recipes-qt/qt6/qtdoc_git.bb
@ -1,10 +1,12 @@
-LICENSE = "The-Qt-Company-Commercial | (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+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"
 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-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/ISC.txt;md5=2494cdbaca137fd93842fe9702e9bc4d \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \
 "

@ -13,11 +15,28 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

-DEPENDS = "\
+DEPENDS += "\
    qtbase \
-    qtdeclarative \
-    qtdeclarative-native \
-    qttasktree \
+    qtcharts \
+    qtdeclarative qtdeclarative-native \
+    qtgraphs \
+    qtlocation \
+    qtmultimedia \
+    qtpositioning \
+    qtquick3d qtquick3d-native \
+    qtsensors \
+    qtshadertools-native \
+    qtsvg \
+    qtwebsockets \
 "
+DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
+DEPENDS:append:arm = " qtquick3dphysics"
+DEPENDS:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
+DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
+DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
+DEPENDS:append:x86 = " qtquick3dphysics"
+DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
+
+PACKAGECONFIG ?= "examples"

 INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtgraphs-examples_git.bb
+++ b/recipes-qt/qt6/qtgraphs-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtgraphs_git.bb
+++ b/recipes-qt/qt6/qtgraphs_git.bb
@ -13,3 +13,5 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtquick3d qtquick3d-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtgrpc-examples_git.bb
+++ b/recipes-qt/qt6/qtgrpc-examples_git.bb
@ -1,22 +0,0 @@
-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"
--- a/recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch
+++ b/recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch
@ -0,0 +1,30 @@
+From 7e5ddd2e22c57fcd2eb7c8ae24150deb564a1b57 Mon Sep 17 00:00:00 2001
+From: Alexey Edelev <alexey.edelev@qt.io>
+Date: Wed, 16 Oct 2024 11:19:03 +0200
+Subject: [PATCH] Remove the export of QT_PROTO_INCLUDES property
+
+The export is not needed in recent version since the QT_PROTO_INCLUDES
+property is calculated according to the QtProtobufWellknownTypes
+install/staging/build prefixes.
+
+Pick-to: 6.8
+Fixes: QTBUG-130113
+Change-Id: I81ddc90334b4828ce5c73fe2ef0f12e3efe6b07c
+Upstream-Status: Submitted
+---
+ src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake b/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake
+index 50900553..49152702 100644
+--- a/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake
+++ b/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake
+@@ -121,8 +121,6 @@ function(qt_internal_add_protobuf_wellknown_types target)
+             EXPORT_NAME_PREFIX "${INSTALL_CMAKE_NAMESPACE}${target}"
+         )
+     endif()
+-
+-    set_property(TARGET ${target} APPEND PROPERTY EXPORT_PROPERTIES QT_PROTO_INCLUDES)
+ endfunction()
+ 
+ # The function generates the header 'alias_file' containing the include of the original
--- a/recipes-qt/qt6/qtgrpc_git.bb
+++ b/recipes-qt/qt6/qtgrpc_git.bb
@ -13,10 +13,11 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

+SRC_URI += "file://0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch"
+
 DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"

-PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[qml] = "-DFEATURE_grpcquick=ON,-DFEATURE_grpcquick=OFF,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"

 BBCLASSEXTEND = "native nativesdk"

--- a/recipes-qt/qt6/qthttpserver-examples_git.bb
+++ b/recipes-qt/qt6/qthttpserver-examples_git.bb
@ -1,14 +0,0 @@
-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"
--- a/recipes-qt/qt6/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@ -14,7 +14,7 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"

-PACKAGECONFIG ?= "jasper mng tiff webp"
+PACKAGECONFIG ?= "tiff webp"
 PACKAGECONFIG[jasper] = "-DFEATURE_jasper=ON,-DFEATURE_jasper=OFF,jasper"
 PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
 PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
--- a/recipes-qt/qt6/qtinsighttracker-examples_git.bb
+++ b/recipes-qt/qt6/qtinsighttracker-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtinterfaceframework-examples_git.bb
+++ b/recipes-qt/qt6/qtinterfaceframework-examples_git.bb
@ -1,21 +0,0 @@
-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"
--- a/recipes-qt/qt6/qtinterfaceframework_git.bb
+++ b/recipes-qt/qt6/qtinterfaceframework_git.bb
@ -28,3 +28,7 @@ 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"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtlanguageserver_git.bb
+++ b/recipes-qt/qt6/qtlanguageserver_git.bb
@ -1,10 +1,11 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only) & GFDL-1.3-no-invariants-only"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    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 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake
--- a/recipes-qt/qt6/qtlocation-examples_git.bb
+++ b/recipes-qt/qt6/qtlocation-examples_git.bb
@ -1,17 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtlottie_git.bb
+++ b/recipes-qt/qt6/qtlottie_git.bb
@ -10,11 +10,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

-DEPENDS += "\
-    qtbase \
-    qtdeclarative \
-    qtdeclarative-native \
-    qtlottie-native \
-"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

-BBCLASSEXTEND = "native nativesdk"
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtmqtt-examples_git.bb
+++ b/recipes-qt/qt6/qtmqtt-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtmqtt_git.bb
+++ b/recipes-qt/qt6/qtmqtt_git.bb
@ -1,9 +1,10 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake
@ -12,3 +13,6 @@ 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"
+
--- a/recipes-qt/qt6/qtmultimedia-examples_git.bb
+++ b/recipes-qt/qt6/qtmultimedia-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtmultimedia_git.bb
+++ b/recipes-qt/qt6/qtmultimedia_git.bb
@ -25,6 +25,7 @@ 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"
--- a/recipes-qt/qt6/qtnetworkauth-examples_git.bb
+++ b/recipes-qt/qt6/qtnetworkauth-examples_git.bb
@ -1,14 +0,0 @@
-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"
--- a/recipes-qt/qt6/qtnetworkauth_git.bb
+++ b/recipes-qt/qt6/qtnetworkauth_git.bb
@ -1,9 +1,10 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake
--- a/recipes-qt/qt6/qtopcua-examples_git.bb
+++ b/recipes-qt/qt6/qtopcua-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtopcua_git.bb
+++ b/recipes-qt/qt6/qtopcua_git.bb
@ -1,16 +1,12 @@
-LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & CC-BY-SA-4.0 & CC0-1.0 & MIT & MPL-2.0"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & CC-BY-SA-4.0 & CC0-1.0 & MIT & MPL-2.0"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
-    file://LICENSES/CC-BY-SA-4.0.txt;md5=bb082061306cc1dc0afcd128f972d344 \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    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 \
-    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
-    file://LICENSES/MPL-2.0.txt;md5=48a3fe23ed1353e0995dadfda05ffdb6 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
    file://src/3rdparty/open62541/BSD-3-CLAUSE;md5=8647c60c0b1892cb8f30c8efd60b318f \
    file://src/3rdparty/open62541/CC-BY-SA-4.0;md5=bb082061306cc1dc0afcd128f972d344 \
    file://src/3rdparty/open62541/LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@ -24,11 +20,8 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

-PACKAGECONFIG ?= "qml open62541"
-PACKAGECONFIG:class-native ?= ""
-PACKAGECONFIG:class-nativesdk ?= ""
+PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
-PACKAGECONFIG[open62541] = "-DFEATURE_open62541=ON,-DFEATURE_open62541=OFF,openssl"

 # src/3rdparty/open62541.pri adds -Wno-format, causing following error
 # because -Wformat-security cannot be used together with -Wno-format
@ -38,3 +31,5 @@ SECURITY_STRINGFORMAT = ""
 DEPENDS += "qtbase qtopcua-native"

 BBCLASSEXTEND = "native nativesdk"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtpdf-examples_git.bb
+++ b/recipes-qt/qt6/qtpdf-examples_git.bb
@ -1,29 +0,0 @@
-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
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:libc-musl = "(-)"
-COMPATIBLE_MACHINE:aarch64 = "(.*)"
-COMPATIBLE_MACHINE:armv6 = "(.*)"
-COMPATIBLE_MACHINE:armv7a = "(.*)"
-COMPATIBLE_MACHINE:armv7ve = "(.*)"
-COMPATIBLE_MACHINE:x86-64 = "(.*)"
-
-QT_MODULE = "qtwebengine"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtpdf \
-"
-
--- a/recipes-qt/qt6/qtpdf_git.bb
+++ b/recipes-qt/qt6/qtpdf_git.bb
@ -8,7 +8,7 @@ DEPENDS += " \
    bison-native \
    nss nss-native \
    qtbase qtdeclarative qtdeclarative-native \
-    qt-gn-native \
+    gn-native \
    libxkbcommon \
    python3-html5lib-native \
 "
@ -34,5 +34,6 @@ do_install:append() {
    # remove conflicting files with QtWebEngine
    rm -f ${D}${libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngineTestsConfig.cmake
    rm -f ${D}${libdir}/cmake/Qt6/Find*.cmake
-    rm -f ${D}${libdir}/sbom/qtwebengine*
+    # rename sbom
+    mv ${D}${libdir}/sbom/qtwebengine-${QT_VERSION}.spdx ${D}${libdir}/sbom/qtpdf-${QT_VERSION}.spdx
 }
--- a/recipes-qt/qt6/qtpositioning-examples_git.bb
+++ b/recipes-qt/qt6/qtpositioning-examples_git.bb
@ -1,19 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtpositioning_git.bb
+++ b/recipes-qt/qt6/qtpositioning_git.bb
@ -1,9 +1,10 @@
-LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only) & BSD-3-Clause & BSL-1.0 & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & BSL-1.0 & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
    file://src/3rdparty/clipper/LICENSE;md5=703fd70389dc10159a3da376b5480d52 \
    file://src/3rdparty/clip2tri/LICENSE;md5=20ada30cde771326c364b7987ff5585a \
    file://src/3rdparty/poly2tri/LICENSE;md5=ee547afd72a735d8f02ff92a09cfe403 \
@ -21,3 +22,5 @@ PACKAGECONFIG[geoclue] = ",,,geoclue"
 PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
 PACKAGECONFIG[nmea] = ",,qtserialport"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtquick3d-examples_git.bb
+++ b/recipes-qt/qt6/qtquick3d-examples_git.bb
@ -1,21 +0,0 @@
-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 \
-"
-
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@ -22,7 +22,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"

 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
    file://0001-Skip-embree-on-mingw.patch \
 "

--- a/recipes-qt/qt6/qtquick3dphysics-examples_git.bb
+++ b/recipes-qt/qt6/qtquick3dphysics-examples_git.bb
@ -1,24 +0,0 @@
-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
-
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:aarch64 = "(.*)"
-COMPATIBLE_MACHINE:arm = "(.*)"
-COMPATIBLE_MACHINE:x86 = "(.*)"
-COMPATIBLE_MACHINE:x86-64 = "(.*)"
-
-QT_MODULE = "qtquick3dphysics"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtquick3d-native \
-    qtquick3dphysics \
-"
--- a/recipes-qt/qt6/qtquick3dphysics_git.bb
+++ b/recipes-qt/qt6/qtquick3dphysics_git.bb
@ -22,3 +22,5 @@ COMPATIBLE_MACHINE:x86-64 = "(.*)"
 DEPENDS = "qtbase qtquick3d qtquick3d-native qtdeclarative-native"

 FILES:${PN}-tools = ""
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtremoteobjects-examples_git.bb
+++ b/recipes-qt/qt6/qtremoteobjects-examples_git.bb
@ -1,19 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtscxml-examples_git.bb
+++ b/recipes-qt/qt6/qtscxml-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtsensors-examples_git.bb
+++ b/recipes-qt/qt6/qtsensors-examples_git.bb
@ -1,18 +0,0 @@
-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 \
-"
--- a/recipes-qt/qt6/qtsensors_git.bb
+++ b/recipes-qt/qt6/qtsensors_git.bb
@ -16,3 +16,4 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtserialbus-examples_git.bb
+++ b/recipes-qt/qt6/qtserialbus-examples_git.bb
@ -1,14 +0,0 @@
-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"
--- a/recipes-qt/qt6/qtserialport-examples_git.bb
+++ b/recipes-qt/qt6/qtserialport-examples_git.bb
@ -1,14 +0,0 @@
-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"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1,2 @@`
				`RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"`